diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKechengbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKechengbiao.java index 151a8505..5b310ae6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKechengbiao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKechengbiao.java @@ -52,9 +52,9 @@ public class SyncKcKechengbiao extends BaseSync { try { //更新历史数据 - KcKechengbiao KcKechengbiaohis = new KcKechengbiao(); - KcKechengbiaohis.setTs(DateUtils.formatDate(new Date(),"yyyyMMddHHmmss")); - kcKechengbiaoService.saveHis(KcKechengbiaohis); +// KcKechengbiao KcKechengbiaohis = new KcKechengbiao(); +// KcKechengbiaohis.setTs(DateUtils.formatDate(new Date(),"yyyyMMddHHmmss")); +// kcKechengbiaoService.saveHis(KcKechengbiaohis); //保留历史数据但是删除当前学期的数据 // KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKetangbiao.java index 9c7f2a1b..11c68893 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKetangbiao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcKetangbiao.java @@ -48,9 +48,9 @@ public class SyncKcKetangbiao extends BaseSync { try { //更新历史数据 - KcKetangbiao kcKetangbiaohis = new KcKetangbiao(); - kcKetangbiaohis.setTs(DateUtils.formatDate(new Date(),"yyyyMMddHHmmss")); - kcKetangbiaoService.saveHis(kcKetangbiaohis); +// KcKetangbiao kcKetangbiaohis = new KcKetangbiao(); +// kcKetangbiaohis.setTs(DateUtils.formatDate(new Date(),"yyyyMMddHHmmss")); +// kcKetangbiaoService.saveHis(kcKetangbiaohis); KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); String bxqkssj = kcSysConfig.getBxqkssj(); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java index 543065c4..39b93dac 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKechengbiaoController.java @@ -78,7 +78,7 @@ public class KcKechengbiaoController extends JeecgController page = new Page(pageNo, pageSize); IPage pageList = kcKechengbiaoService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml index e703838f..da2321d0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/tktj/mapper/xml/KcTingkeMapper.xml @@ -754,7 +754,9 @@ FROM kc_ketangbiao k, kc_tingke t, kc_casusers c WHERE k.id = t.kechengbiaoid AND t.userid = c.USER ) tk - LEFT JOIN kc_assessuser sf ON tk.USER = sf.usercode + LEFT JOIN (SELECT usercode,username, GROUP_CONCAT(assess1) assess1 + FROM kc_assessuser + GROUP BY usercode) sf ON tk.USER = sf.usercode and sf.assesscode = #{tksf}