配置管理

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/RuleAttrController.java

@@ -111,7 +111,6 @@ public class RuleAttrController extends JeecgController<RuleAttr, IRuleAttrServi
 	 */
 	@AutoLog(value = "rule_attr-通过id删除")
 	@ApiOperation(value="rule_attr-通过id删除", notes="rule_attr-通过id删除")
-	@RequiresPermissions("medical:rule_attr:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		ruleAttrService.removeById(id);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/RuleFactorRelaController.java

@@ -108,11 +108,11 @@ public class RuleFactorRelaController extends JeecgController<RuleFactorRela, IR
     @ApiOperation(value = "配置规则批量添加", notes = "配置规则批量添加")
     @PostMapping(value = "/addList")
     public Result<String> addList(@RequestBody RuleFactorRela ruleFactorRela) {
-        if (ruleFactorRela.getMedicalInsRuleInfoId()!=null) {
+        if (ruleFactorRela.getMedicalInsRuleInfoId() != null) {
             Integer seqNum = ruleFactorRelaService.maxSeqNum(ruleFactorRela.getMedicalInsRuleInfoId());
             List<RuleFactorRela> list = new ArrayList<>();
             ruleFactorRela.getFactorEnhanceIdList().stream().forEach(it -> {
-                RuleFactorRela rale= new RuleFactorRela();
+                RuleFactorRela rale = new RuleFactorRela();
                 rale.setFactorEnhanceId(it);
                 rale.setMedicalInsRuleInfoId(ruleFactorRela.getMedicalInsRuleInfoId());
                 rale.setSeqNum(seqNum + 1);
@@ -133,7 +133,17 @@ public class RuleFactorRelaController extends JeecgController<RuleFactorRela, IR
     @ApiOperation(value = "配置规则批量排序", notes = "配置规则批量排序")
     @RequestMapping(value = "/editList", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> editList(@RequestBody List<RuleFactorRela> ruleFactorRela) {
-        ruleFactorRelaService.updateBatchById(ruleFactorRela);
+        int i = 0;
+        List<RuleFactorRela> relaList = new ArrayList<>();
+        for (RuleFactorRela r : ruleFactorRela) {
+            RuleFactorRela factorRela = new RuleFactorRela();
+            factorRela.setSeqNum(i);
+            factorRela.setId(r.getId());
+            i++;
+            relaList.add(factorRela);
+        }
+
+        ruleFactorRelaService.updateBatchById(relaList);
         return Result.OK("编辑成功!");
     }
 
@@ -146,8 +156,10 @@ public class RuleFactorRelaController extends JeecgController<RuleFactorRela, IR
     @AutoLog(value = "rule_factor_rela-通过id删除")
     @ApiOperation(value = "rule_factor_rela-通过id删除", notes = "rule_factor_rela-通过id删除")
     @DeleteMapping(value = "/delete")
-    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
-        ruleFactorRelaService.removeById(id);
+    public Result<String> delete(@RequestParam(name = "id", required = true) int id) {
+//        ruleFactorRelaService.removeById(id);
+//        RuleFactorRela byId = ruleFactorRelaService.getById(id);
+        ruleFactorRelaService.delete(id);
         return Result.OK("删除成功!");
     }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/RuleFactorRelaMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.medical.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.medical.entity.RuleFactorRela;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -15,4 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface RuleFactorRelaMapper extends BaseMapper<RuleFactorRela> {
     List<RuleFactorRela> list(@Param("medicalInsRuleInfoId") Integer medicalInsRuleInfoId);
     Integer maxSeqNum(@Param("medicalInsRuleInfoId") Integer medicalInsRuleInfoId);
+
+    @Select("delete from rule_factor_rela where id = #{id}")
+    public void deleteOneById(@Param("id") int id);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IRuleFactorRelaService.java

@@ -17,4 +17,5 @@ public interface IRuleFactorRelaService extends IService<RuleFactorRela> {
 
     Integer maxSeqNum(Integer medicalInsRuleInfoId);
 
+    void delete(int id);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/RuleFactorRelaServiceImpl.java

@@ -27,4 +27,9 @@ public class RuleFactorRelaServiceImpl extends ServiceImpl<RuleFactorRelaMapper,
     public Integer maxSeqNum(Integer medicalInsRuleInfoId) {
         return baseMapper.maxSeqNum(medicalInsRuleInfoId);
     }
+
+    @Override
+    public void delete(int id) {
+         baseMapper.deleteOneById(id);
+    }
 }