瀏覽代碼

审核查询条件为多选

lihong 2 年之前
父節點
當前提交
2392c2f547

+ 1 - 1
src/main/java/thyyxxk/webserver/entity/querydata/JieSuanDanChaXun.java

@@ -72,7 +72,7 @@ public class JieSuanDanChaXun {
     /**
      * 审核类型
      */
-    private Integer auditFlag;
+    private List<Integer> auditFlag;
 
     /**
      * 支付方式

+ 12 - 4
src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

@@ -1235,11 +1235,19 @@ public class SetlListUpldService {
         } else if (param.getFlag() == UPLOADED) {
             qw.isNotNull("a.setl_list_id");
         }
-        if (param.getAuditFlag() != All) {
-            if(param.getAuditFlag() == 5){
-                qw.isNull("c.audit_flag");
+        if (ListUtil.notBlank(param.getAuditFlag()) && !param.getAuditFlag().contains(All)) {
+            List<Integer> auditFlags = param.getAuditFlag();
+            if(auditFlags.stream().anyMatch(o->o==5)){
+                if(auditFlags.stream().allMatch(o->o==5)){
+                    qw.isNull("c.audit_flag");
+                }else {
+                    StringBuilder auditFlagSql = new StringBuilder();
+                    List<Integer> neqFive = auditFlags.stream().filter(obj -> obj != 5).collect(Collectors.toList());
+                    auditFlagSql.append(" (c.audit_flag is null or c.audit_flag in ("+CollUtil.join(neqFive,",")+") ) ");
+                    qw.apply(auditFlagSql.toString());
+                }
             }else {
-                qw.eq("c.audit_flag", param.getAuditFlag());
+                qw.in("c.audit_flag",auditFlags);
             }
         }