diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java index f8834b4b..f30fdae6 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java @@ -386,7 +386,7 @@ public class SyncTFwdtBkjxtkpj extends BaseSync { Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); // xxhbsynclog.setTablename("附加定时任务,清洗服务大厅数据"); - xxhbsynclog.setOratabname("T_ZZB_LDXX");//oracle表名 + xxhbsynclog.setOratabname("T_FWDT_BKJXTKPJ");//oracle表名 xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 xxhbsynclog.setSyncnum(outDataList.size());//本次同步数据量 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java index 1de39120..650ed40b 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtShryxx.java @@ -99,7 +99,7 @@ public class SyncTFwdtShryxx extends BaseSync { int mysqlnum=xxhbshryxx.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); - xxhbsynclog.setOratabname("t_fwdt_shryxx");//oracle表名 + xxhbsynclog.setOratabname("T_FWDT_SHRYXX");//oracle表名 xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJsjbxxb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJsjbxxb.java index 0a892dde..44c6931f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJsjbxxb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJsjbxxb.java @@ -63,7 +63,7 @@ public class SyncTJwJsjbxxb extends BaseSync { int mysqlnum=Xxhbjsjbxx.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); - xxhbsynclog.setOratabname("TJwJsjbxx");//oracle表名 + xxhbsynclog.setOratabname("T_JW_JSJBXX");//oracle表名 xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJxljbxxb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJxljbxxb.java index 145c70b9..86d75840 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJxljbxxb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwJxljbxxb.java @@ -62,7 +62,7 @@ public class SyncTJwJxljbxxb extends BaseSync { int mysqlnum=Xxhbjxljbxx.getMysqlnum(); Xxhbsynclog xxhbsynclog = new Xxhbsynclog(); xxhbsynclog.setSyncRowNum(String.valueOf(outDataList.size())); - xxhbsynclog.setOratabname("TJwJxljbxx");//oracle表名 + xxhbsynclog.setOratabname("T_JW_JXLJBXX");//oracle表名 xxhbsynclog.setOratabnum(inDataList.size());//oracle表数量 xxhbsynclog.setTablenum(mysqlnum);//mysql表数量 xxhbsynclog.setSyncnum(syncnum);//本次同步数据量 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 f023be18..b1eb0146 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 @@ -257,13 +257,45 @@ public class SyncZwdtEvaluation extends BaseSync { //main.setMinkcid(x.get);????好像得多条件查询 tkkcmc QueryWrapper qwKeTang = new QueryWrapper<>(); - qwKeTang.eq("kcbh",x.getKbbh()); -// qwKeTang.eq("kcmc",x.getTkkcmc()); + //qwKeTang.eq("kcbh",x.getKbbh()); + qwKeTang.eq("kcmc",x.getTkkcmc()); // qwKeTang.eq("kkdw",x.getKkdw()); // qwKeTang.eq("",x.getJgh()); -// qwKeTang.eq("skjs",x.getRkjs()); + qwKeTang.eq("skjs",x.getRkjs()); + qwKeTang.eq("skrq",DateUtil.format(main.getUpDate(), DatePattern.NORM_DATE_FORMAT)); // qwKeTang.eq("sksj",x.getSksj()); -// qwKeTang.eq("hh",x.getHh()); + String hh = x.getKcjc(); + switch (hh){ + case "第1节": + case "第2节": + hh = "01、02"; + break; + case "第3节": + case "第4节": + hh = "03、04"; + break; + case "第5节": + case "第6节": + hh = "05、06"; + break; + case "第7节": + case "第8节": + hh = "07、08"; + break; + case "第9节": + case "第10节": + hh = "09、10"; + break; + case "第11节": + case "第12节": + hh = "11、12"; + break; + default: + hh = ""; + break; + } + + qwKeTang.eq("hh",hh); // qwKeTang.eq("skdd",x.getTkjs()); // qwKeTang.eq("",x.getTkjgh()); // qwKeTang.eq("",x.getTkjs()); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java index bdeb1df7..e7834f18 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java @@ -357,9 +357,20 @@ public class KcEvaluationController extends JeecgController pjlblxMap = Maps.newHashMap(); + //0:门户添加,1:老系统,2:政务大厅,3后台导入 +// sourceDictMap.put(0,"课程中心"); +// sourceDictMap.put(1,"老系统"); + pjlblxMap.put("2","线上课堂评价表"); + pjlblxMap.put("3","听课记录表"); + pjlblxMap.put("4","同行评价表"); + + //更改字典项 exportList.forEach(x -> { x.setSourceName(sourceDictMap.get(x.getSource())); + x.setPjlblx(pjlblxMap.get(x.getEvaluationver())); }); // Step.3 AutoPoi 导出Excel diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationPkmx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationPkmx.java index aa2be227..3c9f76e0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationPkmx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluationPkmx.java @@ -63,10 +63,21 @@ public class KcEvaluationPkmx implements Serializable { private String startTime; private String endTime; + private String evaluationver; + /**数据来源(0:门户添加,1:老系统,2:政务大厅,3后台导入)*/ private java.lang.Integer source; @Excel(name = "评价来源", width = 15) private String sourceName; + @Excel(name = "听课评价结果(5分制)", width = 15) + @TableField(exist = false) + private String tkpjjg; + + @Excel(name = "评价量表类型", width = 15) + @TableField(exist = false) + private String pjlblx; + + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml index 8a81e42a..01281d2d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/xml/KcEvaluationMapper.xml @@ -302,12 +302,14 @@