From 64ff79bd4322c2c176384be656bd40c0217f35a7 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Sat, 19 Aug 2023 00:24:01 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B48=E6=9C=8819=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=9C=8D=E5=8A=A1=E5=A4=A7=E5=8E=85=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=92=8C=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E5=8A=A0=E8=B5=B7=E6=9D=A5=E4=B8=8D=E7=AD=89=E4=BA=8E=E5=8E=9F?=
 =?UTF-8?q?=E5=A7=8B=E8=A1=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SyncZwdtEvaluation.java                   | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java
index 13d8fa5e..e1dc0b43 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZwdtEvaluation.java
@@ -235,7 +235,7 @@ public class SyncZwdtEvaluation extends BaseSync {
         QueryWrapper<Xxhbbkjxtkpj> inQw = new QueryWrapper<>();
         inQw.eq(!isAll,"timestamps",nowStr);
         //筛选符合条件的答案
-        inQw.like("tksjxq","(");
+        //inQw.like("tksjxq","(");
         inQw.notLike("tksjxq","()");
         inQw.in("jspg1","A", "B", "C", "D", "E");
         inQw.in("jspg2","A", "B", "C", "D", "E");
@@ -425,22 +425,33 @@ public class SyncZwdtEvaluation extends BaseSync {
         QueryWrapper<Xxhbbkjxtkpj> bedSaveQw = new QueryWrapper<>();
         bedSaveQw.eq(!isAll,"timestamps",nowStr);
 
+        bedSaveQw.apply("bh not in (select bh from xxhbbkjxtkpj " +
+        "where (tksjxq not like '%()%'         " +
+        "and jspg1  in('A','B','C','D','E')     " +
+        "and jspg2  in('A','B','C','D','E')     " +
+        "and jspg3  in('A','B','C','D','E')     " +
+        "and jspg4  in('A','B','C','D','E')     " +
+        "and jspg5  in('A','B','C','D','E')     " +
+        "and xspg1  in('A','B','C','D','E')     " +
+        "and xspg2  in('A','B','C','D','E')     " +
+        "and xspg3  in('A','B','C','D','E')     " +
+        "and ztpj   in('A','B','C','D','E')))   ");
         //筛选符合条件的答案
-        inQw.and(x ->
-            x.notLike("tksjxq","(").or()
-            .like("tksjxq","()").or()
-            .notIn("jspg1","A", "B", "C", "D", "E").or()
-            .notIn("jspg2","A", "B", "C", "D", "E").or()
-            .notIn("jspg3","A", "B", "C", "D", "E").or()
-            .notIn("jspg4","A", "B", "C", "D", "E").or()
-            .notIn("jspg5","A", "B", "C", "D", "E").or()
-
-            .notIn("xspg1","A", "B", "C", "D", "E").or()
-            .notIn("xspg2","A", "B", "C", "D", "E").or()
-            .notIn("xspg3","A", "B", "C", "D", "E").or()
-            .notIn("ztpj", "A", "B", "C", "D", "E")
-
-        );
+//        bedSaveQw.and(x ->
+//            //x.notLike("tksjxq","(").or()
+//            x.like("tksjxq","()").or()
+//            .notIn("jspg1","A", "B", "C", "D", "E").or() jspg1 is null or jspg1 = ''
+//            .notIn("jspg2","A", "B", "C", "D", "E").or()
+//            .notIn("jspg3","A", "B", "C", "D", "E").or()
+//            .notIn("jspg4","A", "B", "C", "D", "E").or()
+//            .notIn("jspg5","A", "B", "C", "D", "E").or()
+//
+//            .notIn("xspg1","A", "B", "C", "D", "E").or()
+//            .notIn("xspg2","A", "B", "C", "D", "E").or()
+//            .notIn("xspg3","A", "B", "C", "D", "E").or()
+//            .notIn("ztpj", "A", "B", "C", "D", "E")
+//
+//        );
         List<Xxhbbkjxtkpj> bedList = xxhbbkjxtkpjService.list(bedSaveQw);
 
         if(bedList != null){