2023年6月2日 修复清洗问答模块,功能
This commit is contained in:
parent
3ecbf71bee
commit
32e701dd5c
|
@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.compress.utils.Lists;
|
import org.apache.commons.compress.utils.Lists;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
|
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
|
||||||
|
import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj;
|
||||||
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
|
import org.jeecg.modules.kc.grab.imports.entity.Xxhbsynclog;
|
||||||
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
|
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
|
||||||
import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
|
import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
|
||||||
|
@ -117,7 +118,6 @@ public class SyncOldEvaluation extends BaseSync {
|
||||||
queOptionMap.put("8","30");//上课认真听讲、积极思考,主动与老师交流互动
|
queOptionMap.put("8","30");//上课认真听讲、积极思考,主动与老师交流互动
|
||||||
queOptionMap.put("9","31");//课堂教学总体印象评价
|
queOptionMap.put("9","31");//课堂教学总体印象评价
|
||||||
queOptionMap.put("10","32");//对课堂内容以及其他方面的具体意见或建议
|
queOptionMap.put("10","32");//对课堂内容以及其他方面的具体意见或建议
|
||||||
//queOptionMap.put("32", "");//对课堂内容以及其他方面的具体意见或建议
|
|
||||||
|
|
||||||
//问题ID-答案代号,答案ID
|
//问题ID-答案代号,答案ID
|
||||||
ansOptionMap.put("23-A", "176");
|
ansOptionMap.put("23-A", "176");
|
||||||
|
@ -182,7 +182,18 @@ public class SyncOldEvaluation extends BaseSync {
|
||||||
kcEvaluationsService.remove(kcEvaluations);
|
kcEvaluationsService.remove(kcEvaluations);
|
||||||
|
|
||||||
//查询数据
|
//查询数据
|
||||||
List<KcOldEvaluationans> inDataList = kcOldEvaluationansService.list();
|
//筛选符合条件的答案
|
||||||
|
QueryWrapper<KcOldEvaluationans> inQw = new QueryWrapper<>();
|
||||||
|
inQw.in("ans1","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("ans2","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("ans3","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("ans4","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("ans5","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("ans6","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("ans7","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("ans8","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("ans9","A", "B", "C", "D", "E");
|
||||||
|
List<KcOldEvaluationans> inDataList = kcOldEvaluationansService.list(inQw);
|
||||||
List<KcEvaluation> saveMainList = Lists.newArrayList();
|
List<KcEvaluation> saveMainList = Lists.newArrayList();
|
||||||
|
|
||||||
List<KcEvaluations> saveChildList = Lists.newArrayList();
|
List<KcEvaluations> saveChildList = Lists.newArrayList();
|
||||||
|
@ -193,17 +204,20 @@ public class SyncOldEvaluation extends BaseSync {
|
||||||
// main.setUpTime(DateUtil.parse(x.getPksj(),NORM_TIME_PATTERN));//数据中没有时间,
|
// main.setUpTime(DateUtil.parse(x.getPksj(),NORM_TIME_PATTERN));//数据中没有时间,
|
||||||
main.setUpTimestamp(x.getPksj());
|
main.setUpTimestamp(x.getPksj());
|
||||||
main.setUpuser(x.getTkjs());
|
main.setUpuser(x.getTkjs());
|
||||||
main.setUserid(x.getTkjgh());
|
// main.setUserid(x.getTkjgh());
|
||||||
|
if(StringUtils.isNotBlank(x.getTkjgh())){
|
||||||
|
main.setUpuserid(Integer.parseInt(x.getTkjgh()));
|
||||||
|
}
|
||||||
|
|
||||||
//main.setMinkcid(x.get);????好像得多条件查询 kcmc kkdw jgh skjs sksj hh skdd tkjgh tkjs
|
//main.setMinkcid(x.get);????好像得多条件查询 kcmc kkdw jgh skjs sksj hh skdd tkjgh tkjs
|
||||||
|
|
||||||
QueryWrapper<KcKetangbiao> qwKeTang = new QueryWrapper<>();
|
QueryWrapper<KcKetangbiao> qwKeTang = new QueryWrapper<>();
|
||||||
qwKeTang.eq("kcmc",x.getKcmc());
|
qwKeTang.eq("kcmc",x.getKcmc());
|
||||||
qwKeTang.eq("kkdw",x.getKkdw());
|
// qwKeTang.eq("kkdw",x.getKkdw());
|
||||||
// qwKeTang.eq("",x.getJgh());
|
// qwKeTang.eq("",x.getJgh());
|
||||||
qwKeTang.eq("skjs",x.getSkjs());
|
qwKeTang.eq("skjs",x.getSkjs());
|
||||||
qwKeTang.eq("sksj",x.getSksj());
|
qwKeTang.eq("skrq",x.getSksj());
|
||||||
qwKeTang.eq("hh",x.getHh());
|
// qwKeTang.eq("hh",x.getHh());
|
||||||
qwKeTang.eq("skdd",x.getSkdd());
|
qwKeTang.eq("skdd",x.getSkdd());
|
||||||
// qwKeTang.eq("",x.getTkjgh());
|
// qwKeTang.eq("",x.getTkjgh());
|
||||||
// qwKeTang.eq("",x.getTkjs());
|
// qwKeTang.eq("",x.getTkjs());
|
||||||
|
@ -226,7 +240,7 @@ public class SyncOldEvaluation extends BaseSync {
|
||||||
main.setAnswer9(x.getAns9());
|
main.setAnswer9(x.getAns9());
|
||||||
main.setAnswer10(x.getAns10());
|
main.setAnswer10(x.getAns10());
|
||||||
|
|
||||||
main.setEvaluationver(-1);//题版本
|
main.setEvaluationver(3);//题版本
|
||||||
main.setSource(source);//老版本
|
main.setSource(source);//老版本
|
||||||
saveMainList.add(main);
|
saveMainList.add(main);
|
||||||
//子数据
|
//子数据
|
||||||
|
@ -241,8 +255,9 @@ public class SyncOldEvaluation extends BaseSync {
|
||||||
// String optionId8 = queOptionMap.get(main.getAnswer9());
|
// String optionId8 = queOptionMap.get(main.getAnswer9());
|
||||||
// String optionId9 = queOptionMap.get(main.getAnswer10());
|
// String optionId9 = queOptionMap.get(main.getAnswer10());
|
||||||
|
|
||||||
|
kcEvaluationService.save(main);
|
||||||
|
|
||||||
for (int i = 1; 9 >= i; i++){
|
for (int i = 1; 10 >= i; i++){
|
||||||
String optionId = "";
|
String optionId = "";
|
||||||
String ansKey = "";
|
String ansKey = "";
|
||||||
switch (i) {
|
switch (i) {
|
||||||
|
@ -255,6 +270,7 @@ public class SyncOldEvaluation extends BaseSync {
|
||||||
case 7: optionId = queOptionMap.get("7"); ansKey = main.getAnswer7(); break;
|
case 7: optionId = queOptionMap.get("7"); ansKey = main.getAnswer7(); break;
|
||||||
case 8: optionId = queOptionMap.get("8"); ansKey = main.getAnswer8(); break;
|
case 8: optionId = queOptionMap.get("8"); ansKey = main.getAnswer8(); break;
|
||||||
case 9: optionId = queOptionMap.get("9"); ansKey = main.getAnswer9(); break;
|
case 9: optionId = queOptionMap.get("9"); ansKey = main.getAnswer9(); break;
|
||||||
|
case 10: optionId = queOptionMap.get("10"); ansKey = main.getAnswer10(); break;
|
||||||
}
|
}
|
||||||
KcEvaluations child = new KcEvaluations();
|
KcEvaluations child = new KcEvaluations();
|
||||||
child.setUpDate(DateUtil.parse(x.getPksj(),NORM_DATE_PATTERN));
|
child.setUpDate(DateUtil.parse(x.getPksj(),NORM_DATE_PATTERN));
|
||||||
|
@ -266,15 +282,17 @@ public class SyncOldEvaluation extends BaseSync {
|
||||||
|
|
||||||
child.setQueid(Integer.parseInt(optionId));//问题ID
|
child.setQueid(Integer.parseInt(optionId));//问题ID
|
||||||
|
|
||||||
String ansId = ansOptionMap.get(optionId+"-"+ansKey);
|
if(i == 10){
|
||||||
if(StringUtils.equalsAny(ansId,"A","B","C","D","E")){
|
child.setAnsid(0);
|
||||||
child.setAnsid(Integer.parseInt(ansId));//答案ID
|
child.setTextanscontent(ansKey);//多行文本型答案内容
|
||||||
|
}else {
|
||||||
|
String ansId = ansOptionMap.get(optionId+"-"+ansKey);
|
||||||
|
if(StringUtils.isNotBlank(ansId)){
|
||||||
|
child.setAnsid(Integer.parseInt(ansId));//答案ID
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
//child.setEvaluationid("3");
|
||||||
// if(i == 10){
|
child.setEvaluationid(main.getId());
|
||||||
// child.setTextanscontent();//多行文本型答案内容
|
|
||||||
// }
|
|
||||||
|
|
||||||
child.setSource(source);//老版本
|
child.setSource(source);//老版本
|
||||||
saveChildList.add(child);
|
saveChildList.add(child);
|
||||||
|
|
||||||
|
@ -283,7 +301,7 @@ public class SyncOldEvaluation extends BaseSync {
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
kcEvaluationService.saveBatch(saveMainList);
|
//kcEvaluationService.saveBatch(saveMainList);
|
||||||
kcEvaluationsService.saveBatch(saveChildList);
|
kcEvaluationsService.saveBatch(saveChildList);
|
||||||
|
|
||||||
// List<KcEvaluationque> saveList = Lists.newArrayList();
|
// List<KcEvaluationque> saveList = Lists.newArrayList();
|
||||||
|
|
|
@ -164,21 +164,33 @@ public class SyncZwdtEvaluation extends BaseSync {
|
||||||
ansOptionMap.put("30-C", "213");
|
ansOptionMap.put("30-C", "213");
|
||||||
ansOptionMap.put("30-D", "214");
|
ansOptionMap.put("30-D", "214");
|
||||||
ansOptionMap.put("30-E", "215");
|
ansOptionMap.put("30-E", "215");
|
||||||
ansOptionMap.put("31-5分", "296");
|
ansOptionMap.put("31-A", "296");
|
||||||
ansOptionMap.put("31-4分", "297");
|
ansOptionMap.put("31-B", "297");
|
||||||
ansOptionMap.put("31-3分", "298");
|
ansOptionMap.put("31-C", "298");
|
||||||
ansOptionMap.put("31-2分", "299");
|
ansOptionMap.put("31-D", "299");
|
||||||
ansOptionMap.put("31-1分", "300");
|
ansOptionMap.put("31-E", "300");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void washOldData(Map<String, Object> param) {
|
public void washOldData(Map<String, Object> param) {
|
||||||
|
|
||||||
DateTime now = DateUtil.date();
|
DateTime now = DateUtil.date();
|
||||||
|
|
||||||
|
boolean isAll = true;
|
||||||
if(param != null){
|
if(param != null){
|
||||||
if(StringUtils.isNotBlank((String)param.get("nowDay"))){
|
if(param.containsKey("isAll")){
|
||||||
now = DateUtil.parse((String)param.get("nowDay"), "yyyy-MM-dd");
|
String isAllStr = (String)param.get("isAll");
|
||||||
|
if(StringUtils.isNotBlank(isAllStr)){
|
||||||
|
isAll = Boolean.parseBoolean(isAllStr);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
if(param.containsKey("nowDay")){
|
||||||
|
String nowDayStr = (String)param.get("nowDay");
|
||||||
|
if(StringUtils.isNotBlank(nowDayStr)){
|
||||||
|
now = DateUtil.parse(nowDayStr, "yyyy-MM-dd");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int source = 2;
|
int source = 2;
|
||||||
|
@ -186,17 +198,33 @@ public class SyncZwdtEvaluation extends BaseSync {
|
||||||
//删除旧数据
|
//删除旧数据
|
||||||
QueryWrapper<KcEvaluation> kcEvaluation = new QueryWrapper<>();
|
QueryWrapper<KcEvaluation> kcEvaluation = new QueryWrapper<>();
|
||||||
kcEvaluation.eq("source",source);
|
kcEvaluation.eq("source",source);
|
||||||
kcEvaluation.eq("up_timestamp",now);
|
if(isAll){
|
||||||
|
kcEvaluation.eq("up_timestamp",now);
|
||||||
|
}
|
||||||
kcEvaluationService.remove(kcEvaluation);
|
kcEvaluationService.remove(kcEvaluation);
|
||||||
QueryWrapper<KcEvaluations> kcEvaluations = new QueryWrapper<>();
|
QueryWrapper<KcEvaluations> kcEvaluations = new QueryWrapper<>();
|
||||||
kcEvaluations.eq("source",source);
|
kcEvaluations.eq("source",source);
|
||||||
kcEvaluations.eq("up_timestamp",now);
|
if(isAll) {
|
||||||
|
kcEvaluations.eq("up_timestamp", now);
|
||||||
|
}
|
||||||
kcEvaluationsService.remove(kcEvaluations);
|
kcEvaluationsService.remove(kcEvaluations);
|
||||||
|
|
||||||
|
|
||||||
//查询数据
|
//查询数据
|
||||||
QueryWrapper inQw = new QueryWrapper<>();
|
QueryWrapper<Xxhbbkjxtkpj> inQw = new QueryWrapper<>();
|
||||||
inQw.eq("timestamps",now);
|
inQw.eq("timestamps",now);
|
||||||
|
//筛选符合条件的答案
|
||||||
|
inQw.in("jspg1","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("jspg2","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("jspg3","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("jspg4","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("jspg5","A", "B", "C", "D", "E");
|
||||||
|
|
||||||
|
inQw.in("xspg1","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("xspg2","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("xspg3","A", "B", "C", "D", "E");
|
||||||
|
inQw.in("ztpj", "A", "B", "C", "D", "E");
|
||||||
|
|
||||||
List<Xxhbbkjxtkpj> inDataList = xxhbbkjxtkpjService.list(inQw);
|
List<Xxhbbkjxtkpj> inDataList = xxhbbkjxtkpjService.list(inQw);
|
||||||
List<KcEvaluation> saveMainList = Lists.newArrayList();
|
List<KcEvaluation> saveMainList = Lists.newArrayList();
|
||||||
|
|
||||||
|
@ -208,7 +236,10 @@ public class SyncZwdtEvaluation extends BaseSync {
|
||||||
main.setUpTime(x.getTimestamps());
|
main.setUpTime(x.getTimestamps());
|
||||||
main.setUpTimestamp(DateUtil.format(x.getTimestamps(),NORM_DATETIME_FORMAT));
|
main.setUpTimestamp(DateUtil.format(x.getTimestamps(),NORM_DATETIME_FORMAT));
|
||||||
main.setUpuser(x.getTkrxm());
|
main.setUpuser(x.getTkrxm());
|
||||||
main.setUserid(x.getTkrgh());
|
// main.setUserid(x.getTkrgh());
|
||||||
|
if(StringUtils.isNotBlank(x.getTkrgh())){
|
||||||
|
main.setUpuserid(Integer.parseInt(x.getTkrgh()));
|
||||||
|
}
|
||||||
|
|
||||||
//main.setMinkcid(x.get);????好像得多条件查询 tkkcmc
|
//main.setMinkcid(x.get);????好像得多条件查询 tkkcmc
|
||||||
QueryWrapper<KcKetangbiao> qwKeTang = new QueryWrapper<>();
|
QueryWrapper<KcKetangbiao> qwKeTang = new QueryWrapper<>();
|
||||||
|
@ -258,7 +289,9 @@ public class SyncZwdtEvaluation extends BaseSync {
|
||||||
// String optionId10 = queOptionMap.get(main.getAnswer10());
|
// String optionId10 = queOptionMap.get(main.getAnswer10());
|
||||||
|
|
||||||
|
|
||||||
for (int i = 1; 9 >= i; i++){
|
kcEvaluationService.save(main);
|
||||||
|
|
||||||
|
for (int i = 1; 10 >= i; i++){
|
||||||
String optionId = "";
|
String optionId = "";
|
||||||
String ansKey = "";
|
String ansKey = "";
|
||||||
switch (i) {
|
switch (i) {
|
||||||
|
@ -271,7 +304,7 @@ public class SyncZwdtEvaluation extends BaseSync {
|
||||||
case 7: optionId = queOptionMap.get("7"); ansKey = main.getAnswer7(); break;
|
case 7: optionId = queOptionMap.get("7"); ansKey = main.getAnswer7(); break;
|
||||||
case 8: optionId = queOptionMap.get("8"); ansKey = main.getAnswer8(); break;
|
case 8: optionId = queOptionMap.get("8"); ansKey = main.getAnswer8(); break;
|
||||||
case 9: optionId = queOptionMap.get("9"); ansKey = main.getAnswer9(); break;
|
case 9: optionId = queOptionMap.get("9"); ansKey = main.getAnswer9(); break;
|
||||||
// case 10: optionId = optionId10; ansKey = main.getAnswer10(); break;
|
case 10: optionId = queOptionMap.get("10"); ansKey = main.getAnswer10(); break;
|
||||||
}
|
}
|
||||||
KcEvaluations child = new KcEvaluations();
|
KcEvaluations child = new KcEvaluations();
|
||||||
child.setUpDate(x.getTimestamps());
|
child.setUpDate(x.getTimestamps());
|
||||||
|
@ -283,24 +316,25 @@ public class SyncZwdtEvaluation extends BaseSync {
|
||||||
|
|
||||||
child.setQueid(Integer.parseInt(optionId));//问题ID
|
child.setQueid(Integer.parseInt(optionId));//问题ID
|
||||||
|
|
||||||
String ansId = ansOptionMap.get(optionId+"-"+ansKey);
|
if(i == 10){
|
||||||
if(StringUtils.equalsAny(ansId,"A","B","C","D","E")){
|
child.setAnsid(0);
|
||||||
child.setAnsid(Integer.parseInt(ansId));//答案ID
|
child.setTextanscontent(ansKey);//多行文本型答案内容
|
||||||
|
}else {
|
||||||
|
String ansId = ansOptionMap.get(optionId+"-"+ansKey);
|
||||||
|
if(StringUtils.isNotBlank(ansId)){
|
||||||
|
child.setAnsid(Integer.parseInt(ansId));//答案ID
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if(i == 10){
|
child.setEvaluationid(main.getId());
|
||||||
// child.setTextanscontent();//多行文本型答案内容
|
|
||||||
// }
|
|
||||||
|
|
||||||
child.setSource(source);//老版本
|
child.setSource(source);//老版本
|
||||||
saveChildList.add(child);
|
saveChildList.add(child);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
kcEvaluationService.saveBatch(saveMainList);
|
//kcEvaluationService.saveBatch(saveMainList);
|
||||||
kcEvaluationsService.saveBatch(saveChildList);
|
kcEvaluationsService.saveBatch(saveChildList);
|
||||||
// List<KcEvaluationque> saveList = Lists.newArrayList();
|
// List<KcEvaluationque> saveList = Lists.newArrayList();
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in New Issue