From cd15cb29e88704445e1b86b4b58e7fa9a068565b Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Fri, 25 Aug 2023 17:28:51 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B48=E6=9C=8825=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=80=81=E7=B3=BB=E7=BB=9F=E5=90=8C=E6=AD=A5=E6=96=B9?= =?UTF-8?q?=E6=A1=88=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1=E5=A4=A7?= =?UTF-8?q?=E5=8E=85=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=BD=A2=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SyncOldEvaluation.java | 30 ++++++++++++------- .../SyncZwdtEvaluation.java | 11 +++++++ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncOldEvaluation.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncOldEvaluation.java index 77c45650..c421aaba 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncOldEvaluation.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncOldEvaluation.java @@ -344,16 +344,26 @@ public class SyncOldEvaluation extends BaseSync { //查出答案不对劲的数据 QueryWrapper bedSaveQw = new QueryWrapper<>(); - bedSaveQw - .notIn("ans1","A", "B", "C", "D", "E").or() - .notIn("ans2","A", "B", "C", "D", "E").or() - .notIn("ans3","A", "B", "C", "D", "E").or() - .notIn("ans4","A", "B", "C", "D", "E").or() - .notIn("ans5","A", "B", "C", "D", "E").or() - .notIn("ans6","A", "B", "C", "D", "E").or() - .notIn("ans7","A", "B", "C", "D", "E").or() - .notIn("ans8","A", "B", "C", "D", "E").or() - .notIn("ans9","A", "B", "C", "D", "E"); + + bedSaveQw.apply("(ans1 not in('A','B','C','D','E') or ans1 is null or ans1 = '')" + + "or (ans2 not in('A','B','C','D','E') or ans2 is null or ans2 = '')" + + "or (ans3 not in('A','B','C','D','E') or ans3 is null or ans3 = '')" + + "or (ans4 not in('A','B','C','D','E') or ans4 is null or ans4 = '')" + + "or (ans5 not in('A','B','C','D','E') or ans5 is null or ans5 = '')" + + "or (ans6 not in('A','B','C','D','E') or ans6 is null or ans6 = '')" + + "or (ans7 not in('A','B','C','D','E') or ans7 is null or ans7 = '')" + + "or (ans8 not in('A','B','C','D','E') or ans8 is null or ans8 = '')" + + "or (ans9 not in('A','B','C','D','E') or ans9 is null or ans9 = '')"); +// bedSaveQw +// .notIn("ans1","A", "B", "C", "D", "E").or() +// .notIn("ans2","A", "B", "C", "D", "E").or() +// .notIn("ans3","A", "B", "C", "D", "E").or() +// .notIn("ans4","A", "B", "C", "D", "E").or() +// .notIn("ans5","A", "B", "C", "D", "E").or() +// .notIn("ans6","A", "B", "C", "D", "E").or() +// .notIn("ans7","A", "B", "C", "D", "E").or() +// .notIn("ans8","A", "B", "C", "D", "E").or() +// .notIn("ans9","A", "B", "C", "D", "E"); List bedList = kcOldEvaluationansService.list(bedSaveQw); if(bedList != null){ 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 e1dc0b43..5645457a 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 @@ -324,6 +324,17 @@ public class SyncZwdtEvaluation extends BaseSync { qwKeTang.last("limit 1"); KcKetangbiao ketangbiao = kcKetangbiaoService.getOne(qwKeTang); if(ketangbiao == null) { + //再查一遍，去除hh + QueryWrapper qwKeTang2 = new QueryWrapper<>(); + qwKeTang2.eq("kcmc",x.getTkkcmc()); + qwKeTang2.eq("skjs",x.getRkjs()); + qwKeTang2.eq("skrq",DateUtil.format(main.getUpDate(), DatePattern.NORM_DATE_FORMAT)); + qwKeTang2.last("limit 1"); + ketangbiao = kcKetangbiaoService.getOne(qwKeTang2); + } + + if(ketangbiao == null) { + //还是为空，，就记录吧， ketangbiao = new KcKetangbiao(); log.error("错误的课题"); //存新表里面