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 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 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 bedList = xxhbbkjxtkpjService.list(bedSaveQw); if(bedList != null){