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 be0d8719..77c45650 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 @@ -356,10 +356,16 @@ public class SyncOldEvaluation extends BaseSync { .notIn("ans9","A", "B", "C", "D", "E"); List bedList = kcOldEvaluationansService.list(bedSaveQw); - bedList.forEach(x -> saveBedList.add(BeanUtil.toBean(x, KcOldEvaluationansBad.class))); - kcOldEvaluationansBadService.saveBatch(saveBedList); + if(bedList != null){ + bedList.forEach(x -> saveBedList.add(BeanUtil.toBean(x, KcOldEvaluationansBad.class))); + } + if(saveBedList != null){ + kcOldEvaluationansBadService.saveBatch(saveBedList); + } - kcOldEvaluationansGoodService.saveBatch(saveGoodList); + if(saveGoodList != null){ + kcOldEvaluationansGoodService.saveBatch(saveGoodList); + } changeTingKeTongJi.changeTingKeTongji(); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java index bfc7676c..1b2a1d64 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJzgXskc.java @@ -23,6 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; import java.util.Map; +/** + * 同步用户 + */ @Slf4j public class SyncTJzgXskc extends BaseSync { @@ -107,7 +110,9 @@ public class SyncTJzgXskc extends BaseSync { xxhbuserService.remove(xuQw); //保存 - xxhbuserService.saveBatch(outUserDataList); + if(outUserDataList != null){ + xxhbuserService.saveBatch(outUserDataList); + } //再同步清洗到kc_export_config_tpkwcqkjzglx表 //筛选 @@ -130,7 +135,24 @@ public class SyncTJzgXskc extends BaseSync { } }); - exportConfigTpkwcqkjzglxService.updateBatchById(updateList); + if(updateList != null){ + try { + exportConfigTpkwcqkjzglxService.updateBatchById(updateList); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbsynclog updateLog = new Xxhbsynclog(); + updateLog.setSyncRowNum(String.valueOf(outDataList.size())); + updateLog.setOratabname("T_JZG_XSKC-清洗至kc_export_config_tpkwcqkjzglx,升级数据");//oracle表名 + updateLog.setOratabnum(inDataList.size());//oracle表数量 + updateLog.setTablenum(0);//mysql表数量 + updateLog.setSyncnum(updateList.size());//本次同步数据量 + updateLog.setSynctype("0");//同步类型 0全量 1增量 + updateLog.setErrormessage(errorMessage); + saveLog(xxhbsynclog,Xxhbxskc.class); + + } outUserDataList.forEach(x -> { if(!saveMap.containsKey(x.getGh())){ @@ -138,7 +160,25 @@ public class SyncTJzgXskc extends BaseSync { } }); - exportConfigTpkwcqkjzglxService.saveBatch(saveList); + if(saveList != null){ + + try { + exportConfigTpkwcqkjzglxService.saveBatch(saveList); + }catch (Exception e){ + e.printStackTrace(); + errorMessage = e.getMessage(); + } + Xxhbsynclog updateLog = new Xxhbsynclog(); + updateLog.setSyncRowNum(String.valueOf(outDataList.size())); + updateLog.setOratabname("T_JZG_XSKC-清洗至kc_export_config_tpkwcqkjzglx,新增数据");//oracle表名 + updateLog.setOratabnum(inDataList.size());//oracle表数量 + updateLog.setTablenum(0);//mysql表数量 + updateLog.setSyncnum(saveList.size());//本次同步数据量 + updateLog.setSynctype("0");//同步类型 0全量 1增量 + updateLog.setErrormessage(errorMessage); + saveLog(xxhbsynclog,Xxhbxskc.class); + + } } 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 8c8f432a..13d8fa5e 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 @@ -443,14 +443,21 @@ public class SyncZwdtEvaluation extends BaseSync { ); List bedList = xxhbbkjxtkpjService.list(bedSaveQw); - bedList.forEach(x -> saveXxhbbkjxtkpjBadLogList.add(BeanUtil.toBean(x, XxhbbkjxtkpjBadLog.class))); + if(bedList != null){ + bedList.forEach(x -> saveXxhbbkjxtkpjBadLogList.add(BeanUtil.toBean(x, XxhbbkjxtkpjBadLog.class))); + } + if(saveXxhbbkjxtkpjBadLogList != null){ + xxhbbkjxtkpjBadLogService.saveBatch(saveXxhbbkjxtkpjBadLogList); + } - xxhbbkjxtkpjBadLogService.saveBatch(saveXxhbbkjxtkpjBadLogList); - - xxhbbkjxtkpjGoodLogService.saveBatch(saveXxhbbkjxtkpjGoodLogList); + if(saveXxhbbkjxtkpjGoodLogList != null){ + xxhbbkjxtkpjGoodLogService.saveBatch(saveXxhbbkjxtkpjGoodLogList); + } //kcEvaluationService.saveBatch(saveMainList); - kcEvaluationsService.saveBatch(saveChildList); + if(saveChildList != null){ + kcEvaluationsService.saveBatch(saveChildList); + } // List saveList = Lists.newArrayList(); changeTingKeTongJi.changeTingKeTongji(); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java index 78ffa855..84a44751 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java @@ -89,20 +89,20 @@ public class TingKeStatisticsController { //查询当前用户的学院 if(evaluation.isFindByPkdwmc() || evaluation.isFindByBeiTkkdwmc()){ - QueryWrapper uqw = new QueryWrapper<>(); + QueryWrapper uqw = new QueryWrapper<>(); //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); uqw.eq("gh",evaluation.getFindGh()); uqw.last("limit 1"); - KcExportConfigTpkwcqkjzglx exportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(uqw); - if(exportConfigTpkwcqkjzglx == null) { + Xxhbuser xxhbUser = xxhbuserService.getOne(uqw); + if(xxhbUser == null) { return new Page<>(); } //queryWrapper.eq() if(evaluation.isFindByPkdwmc()){ - queryWrapper.eq("xu.DWMC",exportConfigTpkwcqkjzglx.getDwmc()); + queryWrapper.eq("xu.DWMC",xxhbUser.getDwmc()); } if(evaluation.isFindByBeiTkkdwmc()){ - queryWrapper.eq("kt.kkdw ",exportConfigTpkwcqkjzglx.getDwmc()); + queryWrapper.eq("kt.kkdw ",xxhbUser.getDwmc()); } } @@ -274,20 +274,20 @@ public class TingKeStatisticsController { public IPage loadPageData2(KcEvaluationVo2 evaluation,QueryWrapper queryWrapper,Page page){ //查询当前用户的学院 if(evaluation.isFindByPkdwmc() || evaluation.isFindByBeiTkkdwmc()){ - QueryWrapper uqw = new QueryWrapper<>(); + QueryWrapper uqw = new QueryWrapper<>(); //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); uqw.eq("gh",evaluation.getFindGh()); uqw.last("limit 1"); - KcExportConfigTpkwcqkjzglx exportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(uqw); - if(exportConfigTpkwcqkjzglx == null) { + Xxhbuser xxhbUser = xxhbuserService.getOne(uqw); + if(xxhbUser == null) { return new Page<>(); } //queryWrapper.eq() if(evaluation.isFindByPkdwmc()){ - queryWrapper.eq("xu.DWMC",exportConfigTpkwcqkjzglx.getDwmc()); + queryWrapper.eq("xu.DWMC",xxhbUser.getDwmc()); } if(evaluation.isFindByBeiTkkdwmc()){ - queryWrapper.eq("kt.kkdw ",exportConfigTpkwcqkjzglx.getDwmc()); + queryWrapper.eq("kt.kkdw ",xxhbUser.getDwmc()); } }