动态渲染

jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java

@@ -182,7 +182,7 @@ public class QueryGenerator {
 					// add -begin 添加判断为字符串时设为全模糊查询
 					//if( (rule==null || QueryRuleEnum.EQ.equals(rule)) && "class java.lang.String".equals(type)) {
 						// 可以设置左右模糊或全模糊，因人而异
-						//rule = QueryRuleEnum.LIKE;
+						rule = QueryRuleEnum.LIKE;
 					//}
 					// add -end 添加判断为字符串时设为全模糊查询
 					addEasyQuery(queryWrapper, column, rule, value);

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

@@ -286,7 +286,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
         Page<FactorEnchance> page = new Page<FactorEnchance>(pageNo, pageSize);
         queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
         queryWrapper.in("factor_catalog", medicalInsRuleInfoId, shareRulesId);
-        //包括自身规则 -
+        //过滤自身规则
         if (list.size() > 0) {
             queryWrapper.notIn("id", list.stream().map(RuleFactorRela::getFactorEnhanceId).collect(Collectors.toList()));
         }
@@ -300,6 +300,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
     @ApiOperation(value = "配置规则类别对应数据", notes = "配置规则类别对应数据")
     @GetMapping(value = "/relaChildrenList")
     public Result<List<CommonResponse>> relaChildrenList(@RequestParam(name = "medicalInsRuleInfoId") Integer medicalInsRuleInfoId, HttpServletRequest req) {
+
         List<RuleFactorRela> list = ruleFactorRelaService.list(medicalInsRuleInfoId);
         List<CommonResponse> responses = new ArrayList<>();
         if (list.size() > 0) {

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

@@ -157,9 +157,9 @@ public class RuleFactorRelaController extends JeecgController<RuleFactorRela, IR
     @ApiOperation(value = "rule_factor_rela-通过id删除", notes = "rule_factor_rela-通过id删除")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) int id) {
-//        ruleFactorRelaService.removeById(id);
+        ruleFactorRelaService.removeById(id);
 //        RuleFactorRela byId = ruleFactorRelaService.getById(id);
-        ruleFactorRelaService.delete(id);
+//        ruleFactorRelaService.delete(id);
         return Result.OK("删除成功!");
     }
 

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

@@ -3,11 +3,14 @@
 <mapper namespace="org.jeecg.modules.medical.mapper.RuleFactorRelaMapper">
 
     <select id="list" resultType="org.jeecg.modules.medical.entity.RuleFactorRela">
-        select r.id,r.factor_enhance_id,e.rule_enchance_name From rule_factor_rela r LEFT JOIN factor_enchance e on r.factor_enhance_id=e.id
-                                                        where r.medical_ins_rule_info_id=#{medicalInsRuleInfoId} order by r.seq_num
+        select r.id, r.factor_enhance_id, e.rule_enchance_name
+        From rule_factor_rela r
+                 LEFT JOIN factor_enchance e on r.factor_enhance_id = e.id
+        where r.medical_ins_rule_info_id = #{medicalInsRuleInfoId} and r.del_flag=0
+        order by r.seq_num
 
     </select>
     <select id="maxSeqNum" resultType="java.lang.Integer">
-        select IFNULL(max(seq_num),0) from rule_factor_rela where medical_ins_rule_info_id=#{medicalInsRuleInfoId}
+        select IFNULL(max(seq_num),0) from rule_factor_rela where medical_ins_rule_info_id=#{medicalInsRuleInfoId} and del_flag=0
     </select>
 </mapper>