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("错误的课题"); //存新表里面