diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java index b9db6acc..9bd8304b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncKcktStat.java @@ -71,98 +71,98 @@ public class SyncKcktStat extends BaseSync { //-----------------修改课程表数据------------------------ - KcKechengbiao kcKechengbiao = new KcKechengbiao(); - kcKechengbiao.setXqxn(kcSysConfig.getFlag1()); - List kckblist = kcKechengbiaoService.getKechengbiaoList(kcKechengbiao); - for(KcKechengbiao KcKechengbiaoPar:kckblist){ - QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); - kcKechengbiaoQueryWrapper.eq("kcbh",KcKechengbiaoPar.getKcbh()); - kcKechengbiaoQueryWrapper.eq("kcmc",KcKechengbiaoPar.getKcmc()); - kcKechengbiaoQueryWrapper.eq("jgh",KcKechengbiaoPar.getJgh()); - kcKechengbiaoQueryWrapper.eq("skjs",KcKechengbiaoPar.getSkjs()); - kcKechengbiaoQueryWrapper.eq("zc",KcKechengbiaoPar.getZc()); - kcKechengbiaoQueryWrapper.eq("rwbh",KcKechengbiaoPar.getRwbh()); - kcKechengbiaoQueryWrapper.eq("kkdwid",KcKechengbiaoPar.getKkdwid()); - kcKechengbiaoQueryWrapper.eq("kcxz",KcKechengbiaoPar.getKcxz()); - kcKechengbiaoQueryWrapper.eq("jsbh",KcKechengbiaoPar.getJsbh()); - kcKechengbiaoQueryWrapper.eq("skdd",KcKechengbiaoPar.getSkdd()); - kcKechengbiaoQueryWrapper.eq("sksj",KcKechengbiaoPar.getSksj()); - kcKechengbiaoQueryWrapper.eq("jkzc",KcKechengbiaoPar.getJkzc()); - kcKechengbiaoQueryWrapper.eq("xf",KcKechengbiaoPar.getXf()); - kcKechengbiaoQueryWrapper.eq("xnxq",KcKechengbiaoPar.getXnxq()); - kcKechengbiaoQueryWrapper.eq("kcdl",KcKechengbiaoPar.getKcdl()); - - List KcKechengbiaoInsList = kcKechengbiaoService.list(kcKechengbiaoQueryWrapper); - if(KcKechengbiaoInsList!=null&&KcKechengbiaoInsList.size()>0){ - for(KcKechengbiao KcKechengbiao : KcKechengbiaoInsList){ - BeanUtils.copyProperties(KcKechengbiaoPar,KcKechengbiao); - kcKechengbiaoService.updateById(KcKechengbiao); - } - }else{ - kcKechengbiaoService.saveOne(KcKechengbiaoPar); - } - } - //-----------------初始化数据------------------------ - - //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- - QueryWrapper KcKetangbiaoQueryWrapper = new QueryWrapper<>(); - KcKetangbiaoQueryWrapper.eq("xnxq",kcSysConfig.getFlag1()); - KcKetangbiaoQueryWrapper.ge("skrq",DateUtils.formatDate(dateNow,"yyyy-MM-dd")); - kcKetangbiaoService.remove(KcKetangbiaoQueryWrapper); - //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- - - String bxqkssj = kcSysConfig.getBxqkssj(); - //插入数据 - KcKetangbiao kcKetangbiao = new KcKetangbiao(); - kcKetangbiao.setXnxq(kcSysConfig.getFlag1()); - List list = kcKetangbiaoService.selectSyncList(kcKetangbiao); - List arrayList = new ArrayList<>(); - for(int i=0;i=DateUtils.parseDate(dasj,"yyyy-MM-dd").getTime()){ - kcKetangbiaoAddNew.setSkrq(skrq); - kcKetangbiaoAddNew.setDijizhou(djz); - kcKetangbiaoAddNew.setXnxq(kcSysConfig.getFlag1()); - arrayList.add(kcKetangbiaoAddNew); - } - } - }catch (Exception e){ - e.printStackTrace(); - } - } - kcKetangbiaoService.saveBatch(arrayList); - - //修改智慧教室关联的课堂表id-- 清洗智慧教室数据 - kcKetangbiaoService.updateJsbh(); - - //修改智慧教室关联的课堂表id-- 清洗智慧教室数据 - KcKetangbiao kcKetangbiaoup = new KcKetangbiao(); - kcKetangbiaoup.setSkxs(1); - kcKetangbiaoup.setXnxq(kcSysConfig.getFlag1()); - kcKetangbiaoService.updateSkxs(kcKetangbiaoup); +// KcKechengbiao kcKechengbiao = new KcKechengbiao(); +// kcKechengbiao.setXqxn(kcSysConfig.getFlag1()); +// List kckblist = kcKechengbiaoService.getKechengbiaoList(kcKechengbiao); +// for(KcKechengbiao KcKechengbiaoPar:kckblist){ +// QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); +// kcKechengbiaoQueryWrapper.eq("kcbh",KcKechengbiaoPar.getKcbh()); +// kcKechengbiaoQueryWrapper.eq("kcmc",KcKechengbiaoPar.getKcmc()); +// kcKechengbiaoQueryWrapper.eq("jgh",KcKechengbiaoPar.getJgh()); +// kcKechengbiaoQueryWrapper.eq("skjs",KcKechengbiaoPar.getSkjs()); +// kcKechengbiaoQueryWrapper.eq("zc",KcKechengbiaoPar.getZc()); +// kcKechengbiaoQueryWrapper.eq("rwbh",KcKechengbiaoPar.getRwbh()); +// kcKechengbiaoQueryWrapper.eq("kkdwid",KcKechengbiaoPar.getKkdwid()); +// kcKechengbiaoQueryWrapper.eq("kcxz",KcKechengbiaoPar.getKcxz()); +// kcKechengbiaoQueryWrapper.eq("jsbh",KcKechengbiaoPar.getJsbh()); +// kcKechengbiaoQueryWrapper.eq("skdd",KcKechengbiaoPar.getSkdd()); +// kcKechengbiaoQueryWrapper.eq("sksj",KcKechengbiaoPar.getSksj()); +// kcKechengbiaoQueryWrapper.eq("jkzc",KcKechengbiaoPar.getJkzc()); +// kcKechengbiaoQueryWrapper.eq("xf",KcKechengbiaoPar.getXf()); +// kcKechengbiaoQueryWrapper.eq("xnxq",KcKechengbiaoPar.getXnxq()); +// kcKechengbiaoQueryWrapper.eq("kcdl",KcKechengbiaoPar.getKcdl()); +// +// List KcKechengbiaoInsList = kcKechengbiaoService.list(kcKechengbiaoQueryWrapper); +// if(KcKechengbiaoInsList!=null&&KcKechengbiaoInsList.size()>0){ +// for(KcKechengbiao KcKechengbiao : KcKechengbiaoInsList){ +// BeanUtils.copyProperties(KcKechengbiaoPar,KcKechengbiao); +// kcKechengbiaoService.updateById(KcKechengbiao); +// } +// }else{ +// kcKechengbiaoService.saveOne(KcKechengbiaoPar); +// } +// } +// //-----------------初始化数据------------------------ +// +// //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- +// QueryWrapper KcKetangbiaoQueryWrapper = new QueryWrapper<>(); +// KcKetangbiaoQueryWrapper.eq("xnxq",kcSysConfig.getFlag1()); +// KcKetangbiaoQueryWrapper.ge("skrq",DateUtils.formatDate(dateNow,"yyyy-MM-dd")); +// kcKetangbiaoService.remove(KcKetangbiaoQueryWrapper); +// //-------------------删除本年的课程数据冰倩是当天及以后的---------------------- +// +// String bxqkssj = kcSysConfig.getBxqkssj(); +// //插入数据 +// KcKetangbiao kcKetangbiao = new KcKetangbiao(); +// kcKetangbiao.setXnxq(kcSysConfig.getFlag1()); +// List list = kcKetangbiaoService.selectSyncList(kcKetangbiao); +// List arrayList = new ArrayList<>(); +// for(int i=0;i=DateUtils.parseDate(dasj,"yyyy-MM-dd").getTime()){ +// kcKetangbiaoAddNew.setSkrq(skrq); +// kcKetangbiaoAddNew.setDijizhou(djz); +// kcKetangbiaoAddNew.setXnxq(kcSysConfig.getFlag1()); +// arrayList.add(kcKetangbiaoAddNew); +// } +// } +// }catch (Exception e){ +// e.printStackTrace(); +// } +// } +// kcKetangbiaoService.saveBatch(arrayList); +// +// //修改智慧教室关联的课堂表id-- 清洗智慧教室数据 +// kcKetangbiaoService.updateJsbh(); +// +// //修改智慧教室关联的课堂表id-- 清洗智慧教室数据 +// KcKetangbiao kcKetangbiaoup = new KcKetangbiao(); +// kcKetangbiaoup.setSkxs(1); +// kcKetangbiaoup.setXnxq(kcSysConfig.getFlag1()); +// kcKetangbiaoService.updateSkxs(kcKetangbiaoup); //修改调停课时间 String dasj = DateUtils.formatDate(dateNow,"yyyy-MM-dd"); QueryWrapper kcKetangbiaoSkrqLogQueryWrapper = new QueryWrapper<>(); - kcKetangbiaoSkrqLogQueryWrapper.ge("tzrq",dasj); + kcKetangbiaoSkrqLogQueryWrapper.ge("jsrq",dasj); List list1 = kcKetangbiaoSkrqLogService.list(kcKetangbiaoSkrqLogQueryWrapper); for(KcKetangbiaoSkrqLog KcKetangbiaoSkrqLog:list1){ UpdateWrapper KcKetangbiaoUpdateWrapper = new UpdateWrapper<>(); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml index ce747017..18976087 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/mapper/xml/KcEvaluationsStatMapper.xml @@ -277,10 +277,11 @@ AND KT.SKRQ <= XQXN.END_TIME LEFT JOIN XXHBXSKC XSKC ON XSKC.GH = EVS.UPUSERID - LEFT JOIN (SELECT A.GH, A.DWMC, A.XM, B.ITEM_VALUE, B.ITEM_TEXT + LEFT JOIN (SELECT A.GH, A.DWMC, A.XM, B.ITEM_VALUE, GROUP_CONCAT(distinct B.ITEM_TEXT) as ITEM_TEXT FROM KC_EXPORT_CONFIG_TPKWCQKJZGLX A, SYS_DICT_ITEM B WHERE A.TKLX = B.ITEM_VALUE - AND B.DICT_ID = '1682386362753224705') TKSF + AND B.DICT_ID = '1682386362753224705' + GROUP BY a.gh) TKSF ON TKSF.GH = EVS.UPUSERID LEFT JOIN KC_EVALUATIONQUE QUE ON EVS.QUEID = QUE.ID) YBTK @@ -567,10 +568,11 @@ AND KT.SKRQ <= XQXN.END_TIME LEFT JOIN XXHBXSKC XSKC ON XSKC.GH = EVS.UPUSERID - LEFT JOIN (SELECT A.GH, A.DWMC, A.XM, B.ITEM_VALUE, B.ITEM_TEXT + LEFT JOIN (SELECT A.GH, A.DWMC, A.XM, B.ITEM_VALUE, GROUP_CONCAT(distinct B.ITEM_TEXT) as ITEM_TEXT FROM KC_EXPORT_CONFIG_TPKWCQKJZGLX A, SYS_DICT_ITEM B WHERE A.TKLX = B.ITEM_VALUE - AND B.DICT_ID = '1682386362753224705') TKSF + AND B.DICT_ID = '1682386362753224705' + GROUP BY a.gh) TKSF ON TKSF.GH = EVS.UPUSERID LEFT JOIN KC_EVALUATIONQUE QUE ON EVS.QUEID = QUE.ID) XSTK @@ -829,10 +831,11 @@ AND KT.SKRQ <= XQXN.END_TIME LEFT JOIN XXHBXSKC XSKC ON XSKC.GH = EVS.UPUSERID - LEFT JOIN (SELECT A.GH, A.DWMC, A.XM, B.ITEM_VALUE, B.ITEM_TEXT + LEFT JOIN (SELECT A.GH, A.DWMC, A.XM, B.ITEM_VALUE, GROUP_CONCAT(distinct B.ITEM_TEXT) as ITEM_TEXT FROM KC_EXPORT_CONFIG_TPKWCQKJZGLX A, SYS_DICT_ITEM B WHERE A.TKLX = B.ITEM_VALUE - AND B.DICT_ID = '1682386362753224705') TKSF + AND B.DICT_ID = '1682386362753224705' + GROUP BY a.gh) TKSF ON TKSF.GH = EVS.UPUSERID LEFT JOIN KC_EVALUATIONQUE QUE ON EVS.QUEID = QUE.ID) THPJ diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/entity/KcKetangbiaoSkrqLog.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/entity/KcKetangbiaoSkrqLog.java index 6bf3e26e..939b7183 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/entity/KcKetangbiaoSkrqLog.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcKetangbiaoSkrqLog/entity/KcKetangbiaoSkrqLog.java @@ -34,6 +34,7 @@ public class KcKetangbiaoSkrqLog implements Serializable { private String skrq; private String tzrq; + private String jsrq; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java index e8cd9197..7887a0ea 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java @@ -117,7 +117,7 @@ public class KcEvaluation implements Serializable { @Excel(name = "评课要求", width = 15) @TableField(exist = false) private java.lang.String tkyq; - @Excel(name = "实际听课数", width = 15) + @Excel(name = "实际评课数", width = 15) @TableField(exist = false) private java.lang.String sjtksl; @Excel(name = "其中马列教研室课程数", width = 15)