2023年8月19日 修复服务大厅导入成功和导入失败加起来不等于原始表的问题

This commit is contained in:
bai 2023-08-19 00:24:01 +08:00
parent bd61c13ac0
commit 64ff79bd43
1 changed files with 27 additions and 16 deletions

View File

@ -235,7 +235,7 @@ public class SyncZwdtEvaluation extends BaseSync {
QueryWrapper<Xxhbbkjxtkpj> inQw = new QueryWrapper<>(); QueryWrapper<Xxhbbkjxtkpj> inQw = new QueryWrapper<>();
inQw.eq(!isAll,"timestamps",nowStr); inQw.eq(!isAll,"timestamps",nowStr);
//筛选符合条件的答案 //筛选符合条件的答案
inQw.like("tksjxq","("); //inQw.like("tksjxq","(");
inQw.notLike("tksjxq","()"); inQw.notLike("tksjxq","()");
inQw.in("jspg1","A", "B", "C", "D", "E"); inQw.in("jspg1","A", "B", "C", "D", "E");
inQw.in("jspg2","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<>(); QueryWrapper<Xxhbbkjxtkpj> bedSaveQw = new QueryWrapper<>();
bedSaveQw.eq(!isAll,"timestamps",nowStr); 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 -> // bedSaveQw.and(x ->
x.notLike("tksjxq","(").or() // //x.notLike("tksjxq","(").or()
.like("tksjxq","()").or() // x.like("tksjxq","()").or()
.notIn("jspg1","A", "B", "C", "D", "E").or() // .notIn("jspg1","A", "B", "C", "D", "E").or() jspg1 is null or jspg1 = ''
.notIn("jspg2","A", "B", "C", "D", "E").or() // .notIn("jspg2","A", "B", "C", "D", "E").or()
.notIn("jspg3","A", "B", "C", "D", "E").or() // .notIn("jspg3","A", "B", "C", "D", "E").or()
.notIn("jspg4","A", "B", "C", "D", "E").or() // .notIn("jspg4","A", "B", "C", "D", "E").or()
.notIn("jspg5","A", "B", "C", "D", "E").or() // .notIn("jspg5","A", "B", "C", "D", "E").or()
//
.notIn("xspg1","A", "B", "C", "D", "E").or() // .notIn("xspg1","A", "B", "C", "D", "E").or()
.notIn("xspg2","A", "B", "C", "D", "E").or() // .notIn("xspg2","A", "B", "C", "D", "E").or()
.notIn("xspg3","A", "B", "C", "D", "E").or() // .notIn("xspg3","A", "B", "C", "D", "E").or()
.notIn("ztpj", "A", "B", "C", "D", "E") // .notIn("ztpj", "A", "B", "C", "D", "E")
//
); // );
List<Xxhbbkjxtkpj> bedList = xxhbbkjxtkpjService.list(bedSaveQw); List<Xxhbbkjxtkpj> bedList = xxhbbkjxtkpjService.list(bedSaveQw);
if(bedList != null){ if(bedList != null){