添加新功能
This commit is contained in:
parent
754055ae2b
commit
62d002fa38
|
@ -0,0 +1,153 @@
|
|||
package org.jeecg.modules.kc.grab.SynchronizationService;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync;
|
||||
import org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat;
|
||||
import org.jeecg.modules.kc.kcEvaluationsStat.service.IKcEvaluationsStatService;
|
||||
import org.jeecg.modules.kc.kcSysConfig.entity.KcSysConfig;
|
||||
import org.jeecg.modules.kc.kcSysConfig.service.IKcSysConfigService;
|
||||
import org.quartz.JobExecutionContext;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Slf4j
|
||||
public class SyncEvaluationsSzkcStat extends BaseSync {
|
||||
|
||||
@Autowired
|
||||
private IKcEvaluationsStatService kcEvaluationsStatService;
|
||||
|
||||
@Autowired
|
||||
private IKcSysConfigService kcSysConfigService;
|
||||
|
||||
/**
|
||||
* 若参数变量名修改 QuartzJobController中也需对应修改
|
||||
*/
|
||||
|
||||
@Override
|
||||
public void execute(JobExecutionContext jobExecutionContext) {
|
||||
start();
|
||||
run(getParamMap());
|
||||
end();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 有参定时任务实现
|
||||
* @param param
|
||||
*/
|
||||
public void run(Map<String, Object> param){
|
||||
List<KcEvaluationsStat> thpjblist = kcEvaluationsStatService.getSzkcpjbSyncList();
|
||||
|
||||
|
||||
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
|
||||
|
||||
for(KcEvaluationsStat KcEvaluationsStat:thpjblist){
|
||||
KcEvaluationsStat.setXqxn(kcSysConfig.getFlag1());
|
||||
List<KcEvaluationsStat> entityList = kcEvaluationsStatService.getSzkcJxsjSyncList(KcEvaluationsStat);
|
||||
if(entityList!=null && entityList.size()>0){
|
||||
KcEvaluationsStat entity = entityList.get(0);
|
||||
String col2745 = entity.getCol6176();
|
||||
if(col2745.length()>0){
|
||||
System.out.println("thpjb----"+entity.getCol00());
|
||||
String arr[] = col2745.split("@");
|
||||
try {
|
||||
entity.setCol62(arr[1]);
|
||||
}catch (Exception e){
|
||||
entity.setCol62("");
|
||||
}
|
||||
try {
|
||||
entity.setCol63(arr[2]);
|
||||
}catch (Exception e){
|
||||
entity.setCol63("");
|
||||
}
|
||||
try {
|
||||
entity.setCol64(arr[3]);
|
||||
}catch (Exception e){
|
||||
entity.setCol64("");
|
||||
}
|
||||
try {
|
||||
entity.setCol65(arr[4]);
|
||||
}catch (Exception e){
|
||||
entity.setCol65("");
|
||||
}
|
||||
try {
|
||||
entity.setCol66(arr[5]);
|
||||
}catch (Exception e){
|
||||
entity.setCol66("");
|
||||
}
|
||||
try {
|
||||
entity.setCol67(arr[6]);
|
||||
}catch (Exception e){
|
||||
entity.setCol67("");
|
||||
}
|
||||
try {
|
||||
entity.setCol68(arr[7]);
|
||||
}catch (Exception e){
|
||||
entity.setCol68("");
|
||||
}
|
||||
try {
|
||||
entity.setCol69(arr[8]);
|
||||
}catch (Exception e){
|
||||
entity.setCol69("");
|
||||
}
|
||||
try {
|
||||
entity.setCol70(arr[9]);
|
||||
}catch (Exception e){
|
||||
entity.setCol70("");
|
||||
}
|
||||
try {
|
||||
entity.setCol71(arr[10]);
|
||||
}catch (Exception e){
|
||||
entity.setCol71("");
|
||||
}
|
||||
try {
|
||||
entity.setCol72(arr[11]);
|
||||
}catch (Exception e){
|
||||
entity.setCol72("");
|
||||
}
|
||||
try {
|
||||
entity.setCol73(arr[12]);
|
||||
}catch (Exception e){
|
||||
entity.setCol73("");
|
||||
}
|
||||
try {
|
||||
entity.setCol74(arr[13]);
|
||||
}catch (Exception e){
|
||||
entity.setCol74("");
|
||||
}
|
||||
try {
|
||||
entity.setCol75(arr[14]);
|
||||
}catch (Exception e){
|
||||
entity.setCol75("");
|
||||
}
|
||||
try {
|
||||
entity.setCol76(arr[15]);
|
||||
}catch (Exception e){
|
||||
entity.setCol76("");
|
||||
}
|
||||
|
||||
try {
|
||||
entity.setCol6176(arr[0]);
|
||||
}catch (Exception e){
|
||||
entity.setCol6176("");
|
||||
}
|
||||
kcEvaluationsStatService.save(entity);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//最后的保存
|
||||
// kcEvaluationsStatService.saveBatch(inslist);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 无参定时任务实现
|
||||
*/
|
||||
public void run(){
|
||||
run(null);
|
||||
}
|
||||
|
||||
}
|
|
@ -130,7 +130,7 @@ public class ChangeTingKeTongJi {
|
|||
// });
|
||||
|
||||
QueryWrapper<KcTingke> evaQw = new QueryWrapper<>();
|
||||
evaQw.select("count(userid) as pkNum,userid");
|
||||
evaQw.select("count(userid) as pkNum,userid,tingketime");
|
||||
|
||||
evaQw.apply("(tingketime,kechengbiaoid,userid) in ( select max(tingketime) as tingketime,kechengbiaoid,userid from kc_tingke where true "+
|
||||
"and tingketime >= STR_TO_DATE( '"+ startSj +"', '%Y-%m-%d' ) "+
|
||||
|
@ -145,7 +145,7 @@ public class ChangeTingKeTongJi {
|
|||
// evaQw.apply("tingketime >= STR_TO_DATE('"+ startSj +"', '%Y-%m-%d') ");
|
||||
// evaQw.apply("tingketime <= STR_TO_DATE('"+ endSj +"', '%Y-%m-%d') ");
|
||||
//evaQw.isNotNull("kechengbiaoid");
|
||||
evaQw.groupBy("userid");
|
||||
evaQw.groupBy("userid,tingketime");
|
||||
evaQw.orderByAsc("tingketime");
|
||||
|
||||
List<KcTingke> countTjList = kcTingkeService.list(evaQw);
|
||||
|
|
|
@ -260,6 +260,43 @@ public class KcEvaluationsStat implements Serializable {
|
|||
private java.lang.String col59;
|
||||
private java.lang.String col60;
|
||||
|
||||
|
||||
@Excel(name = "1.仪表整洁、举止得体、精神饱满", width = 15)
|
||||
private java.lang.String col6176;//1.仪表整洁、举止得体、精神饱满
|
||||
@Excel(name = "2.遵守教学纪律,严格课堂管理", width = 15)
|
||||
private java.lang.String col62;//2.遵守教学纪律,严格课堂管理
|
||||
@Excel(name = "3.备课充分,精心设计教学(有课件、教案等教学素材),教学投入", width = 15)
|
||||
private java.lang.String col63;//3.备课充分,精心设计教学(有课件、教案等教学素材),教学投入
|
||||
@Excel(name = "4.坚持马克思主义立场观点方法,具有较为扎实的马克思主义理论功底,教学目标明确", width = 15)
|
||||
private java.lang.String col64;//4.坚持马克思主义立场观点方法,具有较为扎实的马克思主义理论功底,教学目标明确
|
||||
@Excel(name = "5.有效使用统编教材配套课件、参考讲义、辅导用书,教学内容科学完整,基本理论阐释清楚,基本事实讲述准确,重点、难点比较突出", width = 15)
|
||||
private java.lang.String col65;//5.有效使用统编教材配套课件、参考讲义、辅导用书,教学内容科学完整,基本理论阐释清楚,基本事实讲述准确,重点、难点比较突出
|
||||
@Excel(name = "6.理论联系实际,熟悉党史、新中国史、改革开放史、社会主义发展史、中华民族发展史,注重史论结合,教学素材多样,案例鲜活生动,及时将新时代中国特色社会主义的生动实践转化为课堂教学资源", width = 15)
|
||||
private java.lang.String col66;//6.理论联系实际,熟悉党史、新中国史、改革开放史、社会主义发展史、中华民族发展史,注重史论结合,教学素材多样,案例鲜活生动,及时将新时代中国特色社会主义的生动实践转化为课堂教学资源
|
||||
@Excel(name = "7.贴近学生实际,善于发掘身边人身边事蕴含的育人元素,有效回应学生关心问题和思想困惑", width = 15)
|
||||
private java.lang.String col67;//7.贴近学生实际,善于发掘身边人身边事蕴含的育人元素,有效回应学生关心问题和思想困惑
|
||||
@Excel(name = "8.熟悉教学法基本原理,注重教学逻辑与学术逻辑的辩证统一,教学设计符合学生认知规律、关注学生差异性", width = 15)
|
||||
private java.lang.String col68;//8.熟悉教学法基本原理,注重教学逻辑与学术逻辑的辩证统一,教学设计符合学生认知规律、关注学生差异性
|
||||
@Excel(name = "9.熟练运用启发式、案例式等教学法,注重课堂互动,不照本宣科,善于调动学生积极性,启发学生思考", width = 15)
|
||||
private java.lang.String col69;//9.熟练运用启发式、案例式等教学法,注重课堂互动,不照本宣科,善于调动学生积极性,启发学生思考
|
||||
@Excel(name = "10.综合运用现代信息技术手段,增强课堂教学的生动性、吸引力,帮助学生理解领会教学内容", width = 15)
|
||||
private java.lang.String col70;//10.综合运用现代信息技术手段,增强课堂教学的生动性、吸引力,帮助学生理解领会教学内容
|
||||
@Excel(name = "11.注重思想性和理论性,具有亲和力和感染力,能够把道理讲深、讲透、讲活,学生学习积极性高,愿意与教师交流反馈", width = 15)
|
||||
private java.lang.String col71;//11.注重思想性和理论性,具有亲和力和感染力,能够把道理讲深、讲透、讲活,学生学习积极性高,愿意与教师交流反馈
|
||||
@Excel(name = "12.注重价值引领,增进对党的创新理论的政治认同、思想认同、理论认同、情感认同,坚定“四个自信”", width = 15)
|
||||
private java.lang.String col72;//12.注重价值引领,增进对党的创新理论的政治认同、思想认同、理论认同、情感认同,坚定“四个自信”
|
||||
@Excel(name = "13.完成教学计划,课堂秩序良好", width = 15)
|
||||
private java.lang.String col73;//13.完成教学计划,课堂秩序良好
|
||||
@Excel(name = "14.总体评价", width = 15)
|
||||
private java.lang.String col74;//14.总体评价
|
||||
@Excel(name = "15.课堂诊断", width = 15)
|
||||
private java.lang.String col75;//15.课堂诊断
|
||||
@Excel(name = "16.指导建议", width = 15)
|
||||
private java.lang.String col76;//16.指导建议
|
||||
|
||||
|
||||
|
||||
|
||||
@TableField(exist = false)
|
||||
private java.lang.String xqxn;
|
||||
@TableField(exist = false)
|
||||
|
|
|
@ -33,4 +33,8 @@ public interface KcEvaluationsStatMapper extends BaseMapper<KcEvaluationsStat> {
|
|||
List<KcEvaluationsStat> getLbpjbJxsjSyncList(KcEvaluationsStat kcEvaluationsStat);
|
||||
|
||||
List<KcEvaluationsStat> getYbtkbTwoSyncList();
|
||||
|
||||
List<KcEvaluationsStat> getSzkcpjbSyncList();
|
||||
|
||||
List<KcEvaluationsStat> getSzkcJxsjSyncList(KcEvaluationsStat kcEvaluationsStat);
|
||||
}
|
||||
|
|
|
@ -49,6 +49,14 @@
|
|||
</select>
|
||||
|
||||
|
||||
<select id="getSzkcpjbSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
|
||||
SELECT DISTINCT ev.id as col00
|
||||
FROM kc_evaluation EV, KC_EVALUATIONS EVS
|
||||
WHERE ev.id = evs.evaluationid
|
||||
AND ev.evaluationver = '5'
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<select id="getYbtkbJxsjSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
|
||||
|
||||
|
@ -1146,6 +1154,323 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x
|
|||
where LBPJ.COL00 not in (select col00 from kc_evaluations_stat)
|
||||
</select>
|
||||
|
||||
<select id="getSzkcJxsjSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
|
||||
SELECT SZK.COL00,
|
||||
SZK.COL01,
|
||||
SZK.COL02,
|
||||
SZK.COL03,
|
||||
SZK.COL04,
|
||||
SZK.COL05,
|
||||
SZK.COL06,
|
||||
SZK.COL07,
|
||||
SZK.COL08,
|
||||
SZK.COL09,
|
||||
SZK.COL10,
|
||||
SZK.COL11,
|
||||
SZK.COL12,
|
||||
SZK.COL13,
|
||||
SZK.COL14,
|
||||
SZK.COL15,
|
||||
SZK.COL16,
|
||||
SZK.COL1726,
|
||||
SZK.COL18,
|
||||
SZK.COL19,
|
||||
SZK.COL20,
|
||||
SZK.COL21,
|
||||
SZK.COL22,
|
||||
SZK.COL23,
|
||||
SZK.COL24,
|
||||
SZK.COL25,
|
||||
SZK.COL26,
|
||||
SZK.COL2745,
|
||||
SZK.COL28,
|
||||
SZK.COL29,
|
||||
SZK.COL30,
|
||||
SZK.COL31,
|
||||
SZK.COL32,
|
||||
SZK.COL33,
|
||||
SZK.COL34,
|
||||
SZK.COL35,
|
||||
SZK.COL36,
|
||||
SZK.COL37,
|
||||
SZK.COL38,
|
||||
SZK.COL39,
|
||||
SZK.COL40,
|
||||
SZK.COL41,
|
||||
SZK.COL42,
|
||||
SZK.COL43,
|
||||
SZK.COL44,
|
||||
SZK.COL45,
|
||||
SZK.COL4655,
|
||||
SZK.COL47,
|
||||
SZK.COL48,
|
||||
SZK.COL49,
|
||||
SZK.COL50,
|
||||
SZK.COL51,
|
||||
SZK.COL52,
|
||||
SZK.COL53,
|
||||
SZK.COL54,
|
||||
SZK.COL55,
|
||||
SZK.COL56,
|
||||
SZK.COL57,
|
||||
SZK.COL58,
|
||||
SZK.COL59,
|
||||
SZK.COL60,
|
||||
SZK.COL6176,
|
||||
SZK.COL62,
|
||||
SZK.COL63,
|
||||
SZK.COL64,
|
||||
SZK.COL65,
|
||||
SZK.COL66,
|
||||
SZK.COL67,
|
||||
SZK.COL68,
|
||||
SZK.COL69,
|
||||
SZK.COL70,
|
||||
SZK.COL71,
|
||||
SZK.COL72,
|
||||
SZK.COL73,
|
||||
SZK.COL74,
|
||||
SZK.COL75,
|
||||
SZK.COL76
|
||||
FROM (SELECT EVS.EVALUATIONID AS COL00,
|
||||
XQXN.TITLE AS COL01, -- 思政课(5)
|
||||
KT.KCMC AS COL02,
|
||||
KT.KKDW AS COL03,
|
||||
KT.SKJS AS COL04,
|
||||
KT.JGH AS COL05,
|
||||
KT.SKRQ AS COL06,
|
||||
KT.SKSJ AS COL07,
|
||||
KT.HH AS COL08,
|
||||
KT.SKDD AS COL09,
|
||||
XSKC.DWMC AS COL10,
|
||||
EVS.UPUSERID AS COL11,
|
||||
EVS.UPUSER AS COL12,
|
||||
TKSF.ITEM_TEXT AS COL13,
|
||||
(SELECT CONTENT
|
||||
FROM kc_evaluation EV,
|
||||
KC_EVALUATIONS EVS,
|
||||
KC_EVALUATIONANS ANS
|
||||
WHERE TRUE
|
||||
AND EV.ID = EVS.evaluationid
|
||||
AND EVS.ANSID = ANS.ID
|
||||
AND EV.evaluationver = '5'
|
||||
AND EVS.EVALUATIONID = #{col00}
|
||||
AND EVS.QUEID = '31') AS COL14,
|
||||
CASE EV.EVALUATIONVER
|
||||
WHEN '2' THEN
|
||||
'线上听课表'
|
||||
WHEN '3' THEN
|
||||
'一般听课表'
|
||||
WHEN '4' THEN
|
||||
'同行评价表'
|
||||
ELSE
|
||||
'异常评价表'
|
||||
END AS COL15,
|
||||
CASE EV.SOURCE
|
||||
WHEN '0' THEN
|
||||
'课程中心'
|
||||
WHEN '1' THEN
|
||||
'老系统'
|
||||
WHEN '2' THEN
|
||||
'服务大厅'
|
||||
WHEN '3' THEN
|
||||
'后台导入'
|
||||
ELSE
|
||||
'未知数据源'
|
||||
END AS COL16,
|
||||
'' AS COL1726,
|
||||
'' AS COL18,
|
||||
'' AS COL19,
|
||||
'' AS COL20,
|
||||
'' AS COL21,
|
||||
'' AS COL22,
|
||||
'' AS COL23,
|
||||
'' AS COL24,
|
||||
'' AS COL25,
|
||||
'' AS COL26,
|
||||
'' AS COL2745,
|
||||
'' AS COL28,
|
||||
'' AS COL29,
|
||||
'' AS COL30,
|
||||
'' AS COL31,
|
||||
'' AS COL32,
|
||||
'' AS COL33,
|
||||
'' AS COL34,
|
||||
'' AS COL35,
|
||||
'' AS COL36,
|
||||
'' AS COL37,
|
||||
'' AS COL38,
|
||||
'' AS COL39,
|
||||
'' AS COL40,
|
||||
'' AS COL41,
|
||||
'' AS COL42,
|
||||
'' AS COL43,
|
||||
'' AS COL44,
|
||||
'' AS COL45,
|
||||
'' AS COL4655,
|
||||
'' AS COL47,
|
||||
'' AS COL48,
|
||||
'' AS COL49,
|
||||
'' AS COL50,
|
||||
'' AS COL51,
|
||||
'' AS COL52,
|
||||
'' AS COL53,
|
||||
'' AS COL54,
|
||||
'' AS COL55,
|
||||
rjzy.rjzy as col56,
|
||||
ev.rjzy as col57,
|
||||
KT.ID AS COL58,
|
||||
CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59,
|
||||
EVS.UP_DATE AS COL60,
|
||||
GROUP_CONCAT(EVS.DETANSWER SEPARATOR '@') AS COL6176,
|
||||
'' AS COL62,
|
||||
'' AS COL63,
|
||||
'' AS COL64,
|
||||
'' AS COL65,
|
||||
'' AS COL66,
|
||||
'' AS COL67,
|
||||
'' AS COL68,
|
||||
'' AS COL69,
|
||||
'' AS COL70,
|
||||
'' AS COL71,
|
||||
'' AS COL72,
|
||||
'' AS COL73,
|
||||
'' AS COL74,
|
||||
'' AS COL75,
|
||||
'' AS COL76,
|
||||
'' AS COL77
|
||||
FROM (SELECT UPUSER,
|
||||
UPUSERID,
|
||||
KETANGBIAOID,
|
||||
QUEID,
|
||||
ANSID,
|
||||
EVALUATIONID,
|
||||
DETANSWER,
|
||||
EVSTMP.UP_DATE
|
||||
FROM (SELECT EVS.UPUSER,
|
||||
EVS.UPUSERID,
|
||||
EV.MINKCID AS KETANGBIAOID,
|
||||
EVS.QUEID,
|
||||
EVS.EVALUATIONID,
|
||||
EVS.ANSID,
|
||||
GROUP_CONCAT(CASE ANS.ORDERNUM
|
||||
WHEN '1' THEN
|
||||
'A'
|
||||
WHEN '2' THEN
|
||||
'B'
|
||||
WHEN '3' THEN
|
||||
'C'
|
||||
WHEN '4' THEN
|
||||
'D'
|
||||
WHEN '5' THEN
|
||||
'E'
|
||||
WHEN '6' THEN
|
||||
'F'
|
||||
WHEN '7' THEN
|
||||
'G'
|
||||
WHEN '8' THEN
|
||||
'H'
|
||||
WHEN '9' THEN
|
||||
'I'
|
||||
WHEN '10' THEN
|
||||
'J'
|
||||
WHEN '11' THEN
|
||||
'K'
|
||||
ELSE
|
||||
''
|
||||
END) AS DETANSWER,
|
||||
EVS.UP_DATE
|
||||
FROM kc_evaluation EV,
|
||||
KC_EVALUATIONS EVS,
|
||||
KC_EVALUATIONANS ANS,
|
||||
KC_EVALUATIONQUE QUE
|
||||
WHERE TRUE
|
||||
AND EV.ID = EVS.evaluationid
|
||||
AND QUE.ID = ANS.QUEID
|
||||
AND EVS.ANSID = ANS.ID
|
||||
AND EVS.EVALUATIONID = #{col00}
|
||||
AND EV.evaluationver = '5'
|
||||
AND QUE.QUETYPE = '2'
|
||||
UNION
|
||||
SELECT EVS.UPUSER,
|
||||
EVS.UPUSERID,
|
||||
EV.MINKCID AS KETANGBIAOID,
|
||||
EVS.QUEID,
|
||||
EVS.EVALUATIONID,
|
||||
EVS.ANSID,
|
||||
CASE ANS.SCORE
|
||||
WHEN '5' THEN
|
||||
'A'
|
||||
WHEN '4' THEN
|
||||
'B'
|
||||
WHEN '3' THEN
|
||||
'C'
|
||||
WHEN '2' THEN
|
||||
'D'
|
||||
WHEN '1' THEN
|
||||
'E'
|
||||
ELSE
|
||||
'F'
|
||||
END AS DETANSWER,
|
||||
EVS.UP_DATE
|
||||
FROM kc_evaluation EV,
|
||||
KC_EVALUATIONS EVS,
|
||||
KC_EVALUATIONANS ANS,
|
||||
KC_EVALUATIONQUE QUE
|
||||
WHERE TRUE
|
||||
AND EV.ID = EVS.evaluationid
|
||||
AND QUE.ID = ANS.QUEID
|
||||
AND EVS.ANSID = ANS.ID
|
||||
AND EV.evaluationver = '5'
|
||||
AND EVS.EVALUATIONID = #{col00}
|
||||
AND QUE.QUETYPE = '1'
|
||||
UNION
|
||||
SELECT EVS.UPUSER,
|
||||
EVS.UPUSERID,
|
||||
EV.MINKCID AS KETANGBIAOID,
|
||||
EVS.QUEID,
|
||||
EVS.EVALUATIONID,
|
||||
EVS.ANSID,
|
||||
EVS.TEXTANSCONTENT AS DETANSWER,
|
||||
EVS.UP_DATE
|
||||
FROM kc_evaluation EV,
|
||||
KC_EVALUATIONS EVS,
|
||||
KC_EVALUATIONQUE QUE
|
||||
WHERE TRUE
|
||||
AND EV.ID = EVS.evaluationid
|
||||
AND EVS.QUEID = QUE.ID
|
||||
AND EVS.EVALUATIONID = #{col00}
|
||||
AND EV.evaluationver = '5'
|
||||
AND QUE.QUETYPE = '3') EVSTMP
|
||||
ORDER BY QUEID) EVS
|
||||
LEFT JOIN (select * from KC_EVALUATION ev left join (select distinct gh,dwmc,xm,sf,zt,rjzy,xqxn from kc_export_config_tpkwcqkjzglx where xqxn = #{xqxn}) rjzy on ev.upuserid = rjzy.gh) EV
|
||||
ON EVS.EVALUATIONID = EV.ID
|
||||
LEFT JOIN KC_KETANGBIAO KT
|
||||
ON EVS.KETANGBIAOID = KT.ID
|
||||
LEFT JOIN KC_KECHENGBIAO KC
|
||||
ON KT.kechengbiaoid = KC.ID
|
||||
left join (select * from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{xqxn} and id in (select id from (
|
||||
select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{xqxn} GROUP BY gh,xqxn)b )) rjzy on kt.jgh = rjzy.gh
|
||||
LEFT JOIN KC_XQXN_HISTORY XQXN
|
||||
ON KT.SKRQ >= XQXN.START_TIME
|
||||
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, 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'
|
||||
and a.xqxn = #{xqxn}
|
||||
GROUP BY a.gh) TKSF
|
||||
ON TKSF.GH = EVS.UPUSERID
|
||||
LEFT JOIN KC_EVALUATIONQUE QUE
|
||||
ON EVS.QUEID = QUE.ID) SZK
|
||||
where SZK.COL00 not in (select col00 from kc_evaluations_stat)
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
|
||||
<update id="updateHuanhang">
|
||||
update kc_evaluations set textanscontent = REPLACE(textanscontent, '\n', ' ')
|
||||
</update>
|
||||
|
|
|
@ -32,4 +32,8 @@ public interface IKcEvaluationsStatService extends IService<KcEvaluationsStat> {
|
|||
List<KcEvaluationsStat> getLbpjbJxsjSyncList(KcEvaluationsStat kcEvaluationsStat);
|
||||
|
||||
List<KcEvaluationsStat> getYbtkbTwoSyncList();
|
||||
|
||||
List<KcEvaluationsStat> getSzkcpjbSyncList();
|
||||
|
||||
List<KcEvaluationsStat> getSzkcJxsjSyncList(KcEvaluationsStat kcEvaluationsStat);
|
||||
}
|
||||
|
|
|
@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
|
|||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
|
@ -67,4 +68,14 @@ public class KcEvaluationsStatServiceImpl extends ServiceImpl<KcEvaluationsStatM
|
|||
public List<KcEvaluationsStat> getYbtkbTwoSyncList() {
|
||||
return baseMapper.getYbtkbTwoSyncList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<KcEvaluationsStat> getSzkcpjbSyncList() {
|
||||
return baseMapper.getSzkcpjbSyncList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<KcEvaluationsStat> getSzkcJxsjSyncList(KcEvaluationsStat kcEvaluationsStat) {
|
||||
return baseMapper.getSzkcJxsjSyncList(kcEvaluationsStat);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,729 @@
|
|||
package org.jeecg.modules.kc.kcZzSzkc.controller;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLDecoder;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.jeecg.common.api.vo.Result;
|
||||
import org.jeecg.common.system.query.QueryGenerator;
|
||||
import org.jeecg.common.system.vo.LoginUser;
|
||||
import org.jeecg.common.util.oConvertUtils;
|
||||
import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
|
||||
import org.jeecg.modules.kc.kcAssessuser.entity.KcAssessuser;
|
||||
import org.jeecg.modules.kc.kcAssessuser.service.IKcAssessuserService;
|
||||
import org.jeecg.modules.kc.kcZzSzkc.entity.KcZzSzkc;
|
||||
import org.jeecg.modules.kc.kcZzSzkc.service.IKcZzSzkcService;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
|
||||
import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
|
||||
import org.jeecg.modules.kc.qa.entity.KcEvaluation;
|
||||
import org.jeecg.modules.kc.qa.entity.KcEvaluationans;
|
||||
import org.jeecg.modules.kc.qa.entity.KcEvaluations;
|
||||
import org.jeecg.modules.kc.qa.service.IKcEvaluationService;
|
||||
import org.jeecg.modules.kc.qa.service.IKcEvaluationansService;
|
||||
import org.jeecg.modules.kc.qa.service.IKcEvaluationsService;
|
||||
import org.jeecg.modules.kc.tktj.entity.KcTingke;
|
||||
import org.jeecg.modules.kc.tktj.service.IKcTingkeService;
|
||||
import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
import org.jeecgframework.poi.excel.entity.ImportParams;
|
||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
||||
import org.jeecg.common.system.base.controller.JeecgController;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.jeecg.common.aspect.annotation.AutoLog;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
|
||||
/**
|
||||
* @Description: 思政课程评价记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2024-09-25
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="思政课程评价记录")
|
||||
@RestController
|
||||
@RequestMapping("/kcZzSzkc/kcZzSzkc")
|
||||
@Slf4j
|
||||
public class KcZzSzkcController extends JeecgController<KcZzSzkc, IKcZzSzkcService> {
|
||||
@Autowired
|
||||
private IKcZzSzkcService kcZzSzkcService;
|
||||
@Autowired
|
||||
private IKcKetangbiaoService kcKetangbiaoService;
|
||||
@Autowired
|
||||
private IKcEvaluationService kcEvaluationService;
|
||||
@Autowired
|
||||
private IKcEvaluationsService kcEvaluationsService;
|
||||
@Autowired
|
||||
private IKcEvaluationansService kcEvaluationansService;
|
||||
@Autowired
|
||||
private ChangeTingKeTongJi changeTingKeTongJi;
|
||||
@Autowired
|
||||
private IKcAssessuserService kcAssessuserService;
|
||||
@Autowired
|
||||
private IKcTingkeService kcTingkeService;
|
||||
@Autowired
|
||||
private SysBaseApiImpl sysBaseApi;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param kcZzSzkc
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "思政课程评价记录-分页列表查询")
|
||||
@ApiOperation(value="思政课程评价记录-分页列表查询", notes="思政课程评价记录-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<IPage<KcZzSzkc>> queryPageList(KcZzSzkc kcZzSzkc,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
|
||||
QueryWrapper<KcZzSzkc> queryWrapper = QueryGenerator.initQueryWrapper("a",kcZzSzkc, req.getParameterMap());
|
||||
queryWrapper.eq(StringUtils.isNotBlank(kcZzSzkc.getXqxn()),"b.title",kcZzSzkc.getXqxn());
|
||||
//-------------获取当前登陆人是否是管理员角色,如果不是都按照教务秘书处理---------------------------
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
List<String> roleList = sysBaseApi.getRolesByUsername(sysUser.getUsername());
|
||||
String adminRole = "1";//0 admin
|
||||
for(String role :roleList){
|
||||
if(StringUtils.equals("admin",role)){
|
||||
adminRole = "0";
|
||||
break;
|
||||
}
|
||||
}
|
||||
if(StringUtils.equals("1",adminRole)){
|
||||
queryWrapper.eq("a.create_by",sysUser.getUsername());
|
||||
}
|
||||
//-------------获取当前登陆人是否是管理员角色,如果不是都按照教务秘书处理---------------------------
|
||||
|
||||
// QueryWrapper<KcZzSzkc> queryWrapper = QueryGenerator.initQueryWrapper(kcZzSzkc, req.getParameterMap());
|
||||
Page<KcZzSzkc> page = new Page<KcZzSzkc>(pageNo, pageSize);
|
||||
IPage<KcZzSzkc> pageList = kcZzSzkcService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param kcZzSzkc
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "思政课程评价记录-添加")
|
||||
@ApiOperation(value="思政课程评价记录-添加", notes="思政课程评价记录-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<String> add(@RequestBody KcZzSzkc kcZzSzkc) {
|
||||
|
||||
|
||||
KcZzSzkc KcZzSzkcPar =kcZzSzkc;
|
||||
QueryWrapper<KcZzSzkc> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("kcmc",KcZzSzkcPar.getKcmc());
|
||||
queryWrapper.eq("skjs",KcZzSzkcPar.getSkjs());
|
||||
queryWrapper.eq("skdd",KcZzSzkcPar.getSkdd());
|
||||
queryWrapper.eq("skrq",KcZzSzkcPar.getSkrq());
|
||||
queryWrapper.eq("tkjsbh",KcZzSzkcPar.getTkjsbh());
|
||||
queryWrapper.eq("tkjsxm",KcZzSzkcPar.getTkjsxm());
|
||||
queryWrapper.like("pksj", DateUtil.format(KcZzSzkcPar.getPksj(),"yyyy-MM-dd"));
|
||||
List<KcZzSzkc> listPar = kcZzSzkcService.list(queryWrapper);
|
||||
if(listPar!=null&&listPar.size()>0){
|
||||
return Result.error("数据重复了,已经有评价数据");
|
||||
}else{
|
||||
QueryWrapper<KcKetangbiao> kcKetangbiaoQueryWrapper = new QueryWrapper<>();
|
||||
kcKetangbiaoQueryWrapper.eq("kcmc",KcZzSzkcPar.getKcmc());
|
||||
kcKetangbiaoQueryWrapper.eq("skdd",KcZzSzkcPar.getSkdd());
|
||||
kcKetangbiaoQueryWrapper.eq("skrq",DateUtil.format(KcZzSzkcPar.getSkrq(),"yyyy-MM-dd"));
|
||||
kcKetangbiaoQueryWrapper.eq("skjs",KcZzSzkcPar.getSkjs());
|
||||
List<KcKetangbiao> kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper);
|
||||
if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){
|
||||
KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0);
|
||||
KcZzSzkcPar.setKcbh(KcKetangbiao.getKcbh());
|
||||
|
||||
KcTingke kcTingke = new KcTingke();
|
||||
kcTingke.setTingketime(DateUtil.format(KcZzSzkcPar.getSkrq(),"yyyy-MM-dd"));
|
||||
kcTingke.setKechengbiaoid(KcKetangbiao.getId());
|
||||
kcTingke.setUserid(KcZzSzkcPar.getTkjsbh());
|
||||
kcTingke.setUsername(KcZzSzkcPar.getTkjsxm());
|
||||
kcTingkeService.save(kcTingke);
|
||||
|
||||
String ans1 = KcZzSzkcPar.getAns1();//25
|
||||
String ans2 = KcZzSzkcPar.getAns2();//26
|
||||
String ans3 = KcZzSzkcPar.getAns3();//27
|
||||
String ans4 = KcZzSzkcPar.getAns4();//23
|
||||
String ans5 = KcZzSzkcPar.getAns5();//24
|
||||
String ans6 = KcZzSzkcPar.getAns6();//28
|
||||
String ans7 = KcZzSzkcPar.getAns7();//29
|
||||
String ans8 = KcZzSzkcPar.getAns8();//
|
||||
String ans9 = KcZzSzkcPar.getAns9();//
|
||||
String ans10 = KcZzSzkcPar.getAns10();//
|
||||
String ans11 = KcZzSzkcPar.getAns11();//
|
||||
String ans12 = KcZzSzkcPar.getAns12();//
|
||||
String ans13 = KcZzSzkcPar.getAns13();//
|
||||
String ans14 = KcZzSzkcPar.getAns14();//
|
||||
String ans15 = KcZzSzkcPar.getAns15();//
|
||||
String ans16 = KcZzSzkcPar.getAns16();//
|
||||
int upuserid = 0;
|
||||
if(StringUtils.isNotBlank(KcZzSzkcPar.getTkjsbh())){
|
||||
upuserid = Integer.parseInt(KcZzSzkcPar.getTkjsbh());
|
||||
}
|
||||
String upuser = KcZzSzkcPar.getTkjsxm();
|
||||
Date tkrq = KcZzSzkcPar.getPksj();
|
||||
int evaluationver = 5;
|
||||
String kcid = KcKetangbiao.getId();
|
||||
KcEvaluation kcEvaluation = new KcEvaluation();
|
||||
kcEvaluation.setUpuserid(upuserid);
|
||||
kcEvaluation.setUpuser(upuser);
|
||||
kcEvaluation.setEvaluationver(evaluationver);
|
||||
kcEvaluation.setUpTimestamp(DateUtil.format(tkrq,"yyyy-MM-dd HH:mm:ss"));
|
||||
kcEvaluation.setMinkcid(kcid);
|
||||
kcEvaluation.setUpDate(tkrq);
|
||||
kcEvaluation.setSource(3);
|
||||
kcEvaluationService.save(kcEvaluation);
|
||||
|
||||
KcEvaluations kcEvaluations = new KcEvaluations();
|
||||
kcEvaluations.setKetangbiaoid(kcid+"");
|
||||
kcEvaluations.setUpuser(upuser);
|
||||
kcEvaluations.setUpuserid(upuserid+"");
|
||||
kcEvaluations.setEvaluationid(kcEvaluation.getId());
|
||||
kcEvaluations.setUpTimestamp(DateUtil.format(tkrq,"yyyy-MM-dd HH:mm:ss"));
|
||||
kcEvaluations.setUpDate(tkrq);
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper1 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper1.eq("queid","61");
|
||||
kcEvaluationansQueryWrapper1.eq("ordernum",ans1);
|
||||
List<KcEvaluationans> kcEvaluationansList1 = kcEvaluationansService.list(kcEvaluationansQueryWrapper1);
|
||||
if(kcEvaluationansList1!=null && kcEvaluationansList1.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList1.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList1.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper2 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper2.eq("queid","62");
|
||||
kcEvaluationansQueryWrapper2.eq("ordernum",ans2);
|
||||
List<KcEvaluationans> kcEvaluationansList2 = kcEvaluationansService.list(kcEvaluationansQueryWrapper2);
|
||||
if(kcEvaluationansList2!=null && kcEvaluationansList2.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList2.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList2.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper3 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper3.eq("queid","63");
|
||||
kcEvaluationansQueryWrapper3.eq("ordernum",ans3);
|
||||
List<KcEvaluationans> kcEvaluationansList3 = kcEvaluationansService.list(kcEvaluationansQueryWrapper3);
|
||||
if(kcEvaluationansList3!=null && kcEvaluationansList3.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList3.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList3.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper4 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper4.eq("queid","64");
|
||||
kcEvaluationansQueryWrapper4.eq("ordernum",ans4);
|
||||
List<KcEvaluationans> kcEvaluationansList4 = kcEvaluationansService.list(kcEvaluationansQueryWrapper4);
|
||||
if(kcEvaluationansList4!=null && kcEvaluationansList4.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList4.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList4.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper5 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper5.eq("queid","65");
|
||||
kcEvaluationansQueryWrapper5.eq("ordernum",ans5);
|
||||
List<KcEvaluationans> kcEvaluationansList5 = kcEvaluationansService.list(kcEvaluationansQueryWrapper5);
|
||||
if(kcEvaluationansList5!=null && kcEvaluationansList5.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList5.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList5.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper6 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper6.eq("queid","66");
|
||||
kcEvaluationansQueryWrapper6.eq("ordernum",ans6);
|
||||
List<KcEvaluationans> kcEvaluationansList6 = kcEvaluationansService.list(kcEvaluationansQueryWrapper6);
|
||||
if(kcEvaluationansList6!=null && kcEvaluationansList6.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList6.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList6.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper7 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper7.eq("queid","67");
|
||||
kcEvaluationansQueryWrapper7.eq("ordernum",ans7);
|
||||
List<KcEvaluationans> kcEvaluationansList7 = kcEvaluationansService.list(kcEvaluationansQueryWrapper7);
|
||||
if(kcEvaluationansList7!=null && kcEvaluationansList7.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList7.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList7.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper8 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper8.eq("queid","68");
|
||||
kcEvaluationansQueryWrapper8.eq("ordernum",ans8);
|
||||
List<KcEvaluationans> kcEvaluationansList8 = kcEvaluationansService.list(kcEvaluationansQueryWrapper8);
|
||||
if(kcEvaluationansList8!=null && kcEvaluationansList8.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList8.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList8.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper9 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper9.eq("queid","69");
|
||||
kcEvaluationansQueryWrapper9.eq("ordernum",ans9);
|
||||
List<KcEvaluationans> kcEvaluationansList9 = kcEvaluationansService.list(kcEvaluationansQueryWrapper9);
|
||||
if(kcEvaluationansList9!=null && kcEvaluationansList9.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList9.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList9.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper10 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper10.eq("queid","70");
|
||||
kcEvaluationansQueryWrapper10.eq("ordernum",ans10);
|
||||
List<KcEvaluationans> kcEvaluationansList10 = kcEvaluationansService.list(kcEvaluationansQueryWrapper10);
|
||||
if(kcEvaluationansList10!=null && kcEvaluationansList10.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList10.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList10.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper11 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper11.eq("queid","71");
|
||||
kcEvaluationansQueryWrapper11.eq("ordernum",ans11);
|
||||
List<KcEvaluationans> kcEvaluationansList11 = kcEvaluationansService.list(kcEvaluationansQueryWrapper11);
|
||||
if(kcEvaluationansList11!=null && kcEvaluationansList11.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList11.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList11.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper12 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper12.eq("queid","72");
|
||||
kcEvaluationansQueryWrapper12.eq("ordernum",ans12);
|
||||
List<KcEvaluationans> kcEvaluationansList12 = kcEvaluationansService.list(kcEvaluationansQueryWrapper12);
|
||||
if(kcEvaluationansList12!=null && kcEvaluationansList12.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList12.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList12.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper13 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper13.eq("queid","73");
|
||||
kcEvaluationansQueryWrapper13.eq("ordernum",ans13);
|
||||
List<KcEvaluationans> kcEvaluationansList13 = kcEvaluationansService.list(kcEvaluationansQueryWrapper13);
|
||||
if(kcEvaluationansList13!=null && kcEvaluationansList13.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList13.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList13.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
if(StringUtils.isNotBlank(ans14)){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(74);
|
||||
kcEvaluations.setAnsid(0);
|
||||
kcEvaluations.setTextanscontent(ans14);
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper15 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper15.eq("queid","75");
|
||||
kcEvaluationansQueryWrapper15.eq("ordernum",ans15);
|
||||
List<KcEvaluationans> kcEvaluationansList15 = kcEvaluationansService.list(kcEvaluationansQueryWrapper15);
|
||||
if(kcEvaluationansList6!=null && kcEvaluationansList6.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList6.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList6.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
if(StringUtils.isNotBlank(ans16)){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(76);
|
||||
kcEvaluations.setAnsid(0);
|
||||
kcEvaluations.setTextanscontent(ans16);
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
kcZzSzkcService.save(kcZzSzkc);
|
||||
}else{
|
||||
return Result.error("课堂表数据错误,未查出对应数据");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param kcZzSzkc
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "思政课程评价记录-编辑")
|
||||
@ApiOperation(value="思政课程评价记录-编辑", notes="思政课程评价记录-编辑")
|
||||
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
|
||||
public Result<String> edit(@RequestBody KcZzSzkc kcZzSzkc) {
|
||||
kcZzSzkcService.updateById(kcZzSzkc);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "思政课程评价记录-通过id删除")
|
||||
@ApiOperation(value="思政课程评价记录-通过id删除", notes="思政课程评价记录-通过id删除")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
|
||||
kcZzSzkcService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "思政课程评价记录-批量删除")
|
||||
@ApiOperation(value="思政课程评价记录-批量删除", notes="思政课程评价记录-批量删除")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
this.kcZzSzkcService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
//@AutoLog(value = "思政课程评价记录-通过id查询")
|
||||
@ApiOperation(value="思政课程评价记录-通过id查询", notes="思政课程评价记录-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<KcZzSzkc> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
KcZzSzkc kcZzSzkc = kcZzSzkcService.getById(id);
|
||||
if(kcZzSzkc==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(kcZzSzkc);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param kcZzSzkc
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, KcZzSzkc kcZzSzkc) {
|
||||
return super.exportXls(request, kcZzSzkc, KcZzSzkc.class, "思政课程评价记录");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
|
||||
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
|
||||
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
|
||||
// 获取上传文件对象
|
||||
MultipartFile file = entity.getValue();
|
||||
ImportParams params = new ImportParams();
|
||||
params.setTitleRows(2);
|
||||
params.setHeadRows(1);
|
||||
params.setNeedSave(true);
|
||||
try {
|
||||
List<KcZzSzkc> list = ExcelImportUtil.importExcel(file.getInputStream(), KcZzSzkc.class, params);
|
||||
String rest = "";
|
||||
String errorRest = "";
|
||||
for(KcZzSzkc KcZzSzkcPar : list){
|
||||
if(StringUtils.isBlank(KcZzSzkcPar.getTkjsbh())){
|
||||
QueryWrapper<KcAssessuser> queryWrapper1 = new QueryWrapper<>();
|
||||
String upuser = KcZzSzkcPar.getTkjsxm();
|
||||
queryWrapper1.eq("username",upuser);
|
||||
queryWrapper1.last("limit 1");
|
||||
KcAssessuser KcCasusers = kcAssessuserService.getOne(queryWrapper1);
|
||||
if(KcCasusers!=null){
|
||||
KcZzSzkcPar.setTkjsbh(KcCasusers.getUsercode()+"");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
List<KcZzSzkc> newList = new ArrayList<>();
|
||||
int errNum = 0;
|
||||
for(int i=0;i<list.size();i++){
|
||||
KcZzSzkc KcZzSzkcPar = list.get(i);
|
||||
QueryWrapper<KcZzSzkc> queryWrapper = new QueryWrapper<>();
|
||||
// queryWrapper.eq("kcbh",KcZzSzkcPar.getKcbh());
|
||||
queryWrapper.eq("kcmc",KcZzSzkcPar.getKcmc());
|
||||
queryWrapper.eq("skjs",KcZzSzkcPar.getSkjs());
|
||||
queryWrapper.eq("skdd",KcZzSzkcPar.getSkdd());
|
||||
queryWrapper.eq("skrq",KcZzSzkcPar.getSkrq());
|
||||
queryWrapper.eq("tkjsbh",KcZzSzkcPar.getTkjsbh());
|
||||
queryWrapper.eq("tkjsxm",KcZzSzkcPar.getTkjsxm());
|
||||
queryWrapper.like("pksj",DateUtil.format(KcZzSzkcPar.getPksj(),"yyyy-MM-dd"));
|
||||
List<KcZzSzkc> listPar = kcZzSzkcService.list(queryWrapper);
|
||||
if(listPar!=null&&listPar.size()>0){
|
||||
errNum++;
|
||||
errorRest += "已经导入(重复数据):"+KcZzSzkcPar.getKcmc()+"-"+KcZzSzkcPar.getSkjs()+"-"+KcZzSzkcPar.getSkdd()+"-"+KcZzSzkcPar.getTkjsbh()+"-"+KcZzSzkcPar.getTkjsxm()+"<br/>";
|
||||
}else{
|
||||
QueryWrapper<KcKetangbiao> kcKetangbiaoQueryWrapper = new QueryWrapper<>();
|
||||
// kcKetangbiaoQueryWrapper.eq("kcbh",KcZzSzkcPar.getKcbh());
|
||||
kcKetangbiaoQueryWrapper.eq("kcmc",KcZzSzkcPar.getKcmc());
|
||||
kcKetangbiaoQueryWrapper.eq("skdd",KcZzSzkcPar.getSkdd());
|
||||
kcKetangbiaoQueryWrapper.eq("skrq",DateUtil.format(KcZzSzkcPar.getSkrq(),"yyyy-MM-dd"));
|
||||
kcKetangbiaoQueryWrapper.eq("skjs",KcZzSzkcPar.getSkjs());
|
||||
List<KcKetangbiao> kcKetangBiaoList = kcKetangbiaoService.list(kcKetangbiaoQueryWrapper);
|
||||
if(kcKetangBiaoList!=null && kcKetangBiaoList.size()>0){
|
||||
KcKetangbiao KcKetangbiao = kcKetangBiaoList.get(0);
|
||||
KcZzSzkcPar.setKcbh(KcKetangbiao.getKcbh());
|
||||
newList.add(KcZzSzkcPar);
|
||||
|
||||
KcTingke kcTingke = new KcTingke();
|
||||
kcTingke.setTingketime(DateUtil.format(KcZzSzkcPar.getSkrq(),"yyyy-MM-dd"));
|
||||
kcTingke.setKechengbiaoid(KcKetangbiao.getId());
|
||||
kcTingke.setUserid(KcZzSzkcPar.getTkjsbh());
|
||||
kcTingke.setUsername(KcZzSzkcPar.getTkjsxm());
|
||||
kcTingkeService.save(kcTingke);
|
||||
|
||||
String ans1 = KcZzSzkcPar.getAns1();//25 授课有启发性,能给予学生思考、联想、创造的启迪
|
||||
String ans2 = KcZzSzkcPar.getAns2();//26 能有效利用各种教学媒体,课件或板书使用效果好
|
||||
String ans3 = KcZzSzkcPar.getAns3();//27 仪表得体,按时上下课,严格要求学生
|
||||
String ans4 = KcZzSzkcPar.getAns4();//23 讲课有热情,精神饱满,能调动学生情绪,课堂气氛活跃
|
||||
String ans5 = KcZzSzkcPar.getAns5();//24 教学目标明确,内容丰富,重点突出,语言表达清楚
|
||||
String ans6 = KcZzSzkcPar.getAns6();//28 无迟到、早退、旷课现象
|
||||
String ans7 = KcZzSzkcPar.getAns7();//29 课堂教学秩序好,无喧闹、打瞌睡、发短信、玩手机等现象
|
||||
int upuserid = 0;
|
||||
if(StringUtils.isNotBlank(KcZzSzkcPar.getTkjsbh())){
|
||||
upuserid = Integer.parseInt(KcZzSzkcPar.getTkjsbh());
|
||||
}
|
||||
String upuser = KcZzSzkcPar.getTkjsxm();
|
||||
Date tkrq = KcZzSzkcPar.getPksj();
|
||||
int evaluationver = 5;
|
||||
String kcid = KcKetangbiao.getId();
|
||||
KcEvaluation kcEvaluation = new KcEvaluation();
|
||||
kcEvaluation.setUpuserid(upuserid);
|
||||
kcEvaluation.setUpuser(upuser);
|
||||
kcEvaluation.setEvaluationver(evaluationver);
|
||||
kcEvaluation.setUpTimestamp(DateUtil.format(tkrq,"yyyy-MM-dd HH:mm:ss"));
|
||||
kcEvaluation.setMinkcid(kcid);
|
||||
kcEvaluation.setUpDate(tkrq);
|
||||
kcEvaluation.setSource(3);
|
||||
kcEvaluationService.save(kcEvaluation);
|
||||
|
||||
KcEvaluations kcEvaluations = new KcEvaluations();
|
||||
kcEvaluations.setKetangbiaoid(kcid+"");
|
||||
kcEvaluations.setUpuser(upuser);
|
||||
kcEvaluations.setUpuserid(upuserid+"");
|
||||
kcEvaluations.setEvaluationid(kcEvaluation.getId());
|
||||
kcEvaluations.setUpTimestamp(DateUtil.format(tkrq,"yyyy-MM-dd HH:mm:ss"));
|
||||
kcEvaluations.setUpDate(tkrq);
|
||||
|
||||
|
||||
if("A".equals(ans1)){ans1 = "5";}
|
||||
else if("B".equals(ans1)){ans1 = "4";}
|
||||
else if("C".equals(ans1)){ans1 = "3";}
|
||||
else if("D".equals(ans1)){ans1 = "2";}
|
||||
else if("E".equals(ans1)){ans1 = "1";}
|
||||
|
||||
if("A".equals(ans2)){ans2 = "5";}
|
||||
else if("B".equals(ans2)){ans2 = "4";}
|
||||
else if("C".equals(ans2)){ans2 = "3";}
|
||||
else if("D".equals(ans2)){ans2 = "2";}
|
||||
else if("E".equals(ans2)){ans2 = "1";}
|
||||
|
||||
if("A".equals(ans3)){ans3 = "5";}
|
||||
else if("B".equals(ans3)){ans3 = "4";}
|
||||
else if("C".equals(ans3)){ans3 = "3";}
|
||||
else if("D".equals(ans3)){ans3 = "2";}
|
||||
else if("E".equals(ans3)){ans3 = "1";}
|
||||
|
||||
if("A".equals(ans4)){ans4 = "5";}
|
||||
else if("B".equals(ans4)){ans4 = "4";}
|
||||
else if("C".equals(ans4)){ans4 = "3";}
|
||||
else if("D".equals(ans4)){ans4 = "2";}
|
||||
else if("E".equals(ans4)){ans4 = "1";}
|
||||
|
||||
if("A".equals(ans5)){ans5 = "5";}
|
||||
else if("B".equals(ans5)){ans5 = "4";}
|
||||
else if("C".equals(ans5)){ans5 = "3";}
|
||||
else if("D".equals(ans5)){ans5 = "2";}
|
||||
else if("E".equals(ans5)){ans5 = "1";}
|
||||
|
||||
if("A".equals(ans6)){ans6 = "5";}
|
||||
else if("B".equals(ans6)){ans6 = "4";}
|
||||
else if("C".equals(ans6)){ans6 = "3";}
|
||||
else if("D".equals(ans6)){ans6 = "2";}
|
||||
else if("E".equals(ans6)){ans6 = "1";}
|
||||
|
||||
if("A".equals(ans7)){ans7 = "5";}
|
||||
else if("B".equals(ans7)){ans7 = "4";}
|
||||
else if("C".equals(ans7)){ans7 = "3";}
|
||||
else if("D".equals(ans7)){ans7 = "2";}
|
||||
else if("E".equals(ans7)){ans7 = "1";}
|
||||
|
||||
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper1 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper1.eq("queid","61");
|
||||
kcEvaluationansQueryWrapper1.eq("ordernum",ans1);
|
||||
List<KcEvaluationans> kcEvaluationansList1 = kcEvaluationansService.list(kcEvaluationansQueryWrapper1);
|
||||
if(kcEvaluationansList1!=null && kcEvaluationansList1.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList1.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList1.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper2 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper2.eq("queid","62");
|
||||
kcEvaluationansQueryWrapper2.eq("ordernum",ans2);
|
||||
List<KcEvaluationans> kcEvaluationansList2 = kcEvaluationansService.list(kcEvaluationansQueryWrapper2);
|
||||
if(kcEvaluationansList2!=null && kcEvaluationansList2.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList2.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList2.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper3 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper3.eq("queid","63");
|
||||
kcEvaluationansQueryWrapper3.eq("ordernum",ans3);
|
||||
List<KcEvaluationans> kcEvaluationansList3 = kcEvaluationansService.list(kcEvaluationansQueryWrapper3);
|
||||
if(kcEvaluationansList3!=null && kcEvaluationansList3.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList3.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList3.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper4 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper4.eq("queid","64");
|
||||
kcEvaluationansQueryWrapper4.eq("ordernum",ans4);
|
||||
List<KcEvaluationans> kcEvaluationansList4 = kcEvaluationansService.list(kcEvaluationansQueryWrapper4);
|
||||
if(kcEvaluationansList4!=null && kcEvaluationansList4.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList4.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList4.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
if(StringUtils.isNotBlank(ans5)){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(65);
|
||||
kcEvaluations.setAnsid(0);
|
||||
kcEvaluations.setTextanscontent(ans5);
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper6 = new QueryWrapper<>();
|
||||
kcEvaluationansQueryWrapper6.eq("queid","66");
|
||||
kcEvaluationansQueryWrapper6.eq("ordernum",ans6);
|
||||
List<KcEvaluationans> kcEvaluationansList6 = kcEvaluationansService.list(kcEvaluationansQueryWrapper6);
|
||||
if(kcEvaluationansList6!=null && kcEvaluationansList6.size()>0){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(kcEvaluationansList6.get(0).getQueid());
|
||||
kcEvaluations.setAnsid(kcEvaluationansList6.get(0).getId());
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
if(StringUtils.isNotBlank(ans7)){
|
||||
kcEvaluations.setId(null);
|
||||
kcEvaluations.setQueid(67);
|
||||
kcEvaluations.setAnsid(0);
|
||||
kcEvaluations.setTextanscontent(ans7);
|
||||
kcEvaluationsService.save(kcEvaluations);
|
||||
}
|
||||
|
||||
|
||||
}else{
|
||||
errNum++;
|
||||
newList.remove(KcZzSzkcPar);
|
||||
errorRest += "未查到匹配课堂:"+KcZzSzkcPar.getKcmc()+"-"+KcZzSzkcPar.getSkjs()+"-"+KcZzSzkcPar.getSkdd()+"-"+KcZzSzkcPar.getTkjsbh()+"-"+KcZzSzkcPar.getTkjsxm()+"<br/>";
|
||||
}
|
||||
}
|
||||
}
|
||||
//update-begin-author:taoyan date:20190528 for:批量插入数据
|
||||
long start = System.currentTimeMillis();
|
||||
service.saveBatch(newList);
|
||||
//400条 saveBatch消耗时间1592毫秒 循环插入消耗时间1947毫秒
|
||||
//1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
|
||||
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
|
||||
//update-end-author:taoyan date:20190528 for:批量插入数据
|
||||
// rest = "文件导入成功!数据行数:" + newList.size();
|
||||
if(newList.size()>0){
|
||||
rest = "文件导入成功!数据行数:" + newList.size();
|
||||
}
|
||||
if(StringUtils.isNotBlank(errorRest)){
|
||||
errorRest = "<br/>共错误:"+errNum+"行;错误数据如下:<br/>"+errorRest;
|
||||
}
|
||||
//刷新统计
|
||||
changeTingKeTongJi.changeTingKeTongji();
|
||||
return Result.ok(rest+errorRest);
|
||||
} catch (Exception e) {
|
||||
//update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
|
||||
String msg = e.getMessage();
|
||||
log.error(msg, e);
|
||||
if(msg!=null && msg.indexOf("Duplicate entry")>=0){
|
||||
return Result.error("文件导入失败:有重复数据!");
|
||||
}else{
|
||||
return Result.error("文件导入失败:" + e.getMessage());
|
||||
}
|
||||
//update-end-author:taoyan date:20211124 for: 导入数据重复增加提示
|
||||
} finally {
|
||||
try {
|
||||
file.getInputStream().close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
return Result.error("文件导入失败!");
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,145 @@
|
|||
package org.jeecg.modules.kc.kcZzSzkc.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.Date;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.jeecg.common.aspect.annotation.Dict;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: 思政课程评价记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2024-09-25
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("kc_zz_szkc")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="kc_zz_szkc对象", description="思政课程评价记录")
|
||||
public class KcZzSzkc implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private java.lang.String id;
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private java.lang.String createBy;
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private java.util.Date createTime;
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private java.lang.String updateBy;
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private java.util.Date updateTime;
|
||||
/**所属部门*/
|
||||
@ApiModelProperty(value = "所属部门")
|
||||
private java.lang.String sysOrgCode;
|
||||
/**课程编号*/
|
||||
@Excel(name = "课程编号", width = 15)
|
||||
@ApiModelProperty(value = "课程编号")
|
||||
private java.lang.String kcbh;
|
||||
/**课程名称*/
|
||||
@Excel(name = "课程名称", width = 15)
|
||||
@ApiModelProperty(value = "课程名称")
|
||||
private java.lang.String kcmc;
|
||||
/**授课教师*/
|
||||
@Excel(name = "授课教师", width = 15)
|
||||
@ApiModelProperty(value = "授课教师")
|
||||
private java.lang.String skjs;
|
||||
/**授课时间*/
|
||||
@Excel(name = "授课时间", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "授课时间")
|
||||
private java.util.Date skrq;
|
||||
/**上课地点*/
|
||||
@Excel(name = "上课地点", width = 15)
|
||||
@ApiModelProperty(value = "上课地点")
|
||||
private java.lang.String skdd;
|
||||
/**听课教师编号*/
|
||||
@Excel(name = "听课教师编号", width = 15)
|
||||
@ApiModelProperty(value = "听课教师编号")
|
||||
private java.lang.String tkjsbh;
|
||||
/**听课教师姓名*/
|
||||
@Excel(name = "听课教师姓名", width = 15)
|
||||
@ApiModelProperty(value = "听课教师姓名")
|
||||
private java.lang.String tkjsxm;
|
||||
/**评课时间*/
|
||||
@Excel(name = "评课时间", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "评课时间")
|
||||
private java.util.Date pksj;
|
||||
/**教学态度*/
|
||||
@Excel(name = "教学态度", width = 15)
|
||||
@ApiModelProperty(value = "教学态度")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans1;
|
||||
/**教学内容*/
|
||||
@Excel(name = "教学内容", width = 15)
|
||||
@ApiModelProperty(value = "教学内容")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans2;
|
||||
/**教学方法*/
|
||||
@Excel(name = "教学方法", width = 15)
|
||||
@ApiModelProperty(value = "教学方法")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans3;
|
||||
/**教学效果*/
|
||||
@Excel(name = "教学效果", width = 15)
|
||||
@ApiModelProperty(value = "教学效果")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans4;
|
||||
/**课堂诊断*/
|
||||
@Excel(name = "课堂诊断", width = 15)
|
||||
@ApiModelProperty(value = "课堂诊断")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans5;
|
||||
/**总体评价*/
|
||||
@Excel(name = "总体评价", width = 15)
|
||||
@ApiModelProperty(value = "总体评价")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans6;
|
||||
/**指导建议*/
|
||||
@Excel(name = "指导建议", width = 15)
|
||||
@ApiModelProperty(value = "指导建议")
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans7;
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans8;
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans9;
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans10;
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans11;
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans12;
|
||||
@Dict(dicCode = "five_dict")
|
||||
private java.lang.String ans13;
|
||||
private java.lang.String ans14;
|
||||
private java.lang.String ans15;
|
||||
private java.lang.String ans16;
|
||||
|
||||
@TableField(exist = false)
|
||||
private String xqxn;
|
||||
}
|
|
@ -0,0 +1,17 @@
|
|||
package org.jeecg.modules.kc.kcZzSzkc.mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.jeecg.modules.kc.kcZzSzkc.entity.KcZzSzkc;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 思政课程评价记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2024-09-25
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface KcZzSzkcMapper extends BaseMapper<KcZzSzkc> {
|
||||
|
||||
}
|
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.kc.kcZzSzkc.mapper.KcZzSzkcMapper">
|
||||
|
||||
<select id="selectPage" resultType="org.jeecg.modules.kc.kcZzSzkc.entity.KcZzSzkc">
|
||||
select distinct a.*,b.title as xqxn from kc_zz_szkc a
|
||||
LEFT JOIN kc_xqxn_history b on a.SKRQ >= b.start_time + '' and a.SKRQ <= b.end_time +''
|
||||
left join xxhbuser c on a.tkjsbh = c.gh
|
||||
left join xxhbuser d on d.dwh = c.dwh
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
</mapper>
|
|
@ -0,0 +1,14 @@
|
|||
package org.jeecg.modules.kc.kcZzSzkc.service;
|
||||
|
||||
import org.jeecg.modules.kc.kcZzSzkc.entity.KcZzSzkc;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
* @Description: 思政课程评价记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2024-09-25
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IKcZzSzkcService extends IService<KcZzSzkc> {
|
||||
|
||||
}
|
|
@ -0,0 +1,19 @@
|
|||
package org.jeecg.modules.kc.kcZzSzkc.service.impl;
|
||||
|
||||
import org.jeecg.modules.kc.kcZzSzkc.entity.KcZzSzkc;
|
||||
import org.jeecg.modules.kc.kcZzSzkc.mapper.KcZzSzkcMapper;
|
||||
import org.jeecg.modules.kc.kcZzSzkc.service.IKcZzSzkcService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
/**
|
||||
* @Description: 思政课程评价记录
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2024-09-25
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class KcZzSzkcServiceImpl extends ServiceImpl<KcZzSzkcMapper, KcZzSzkc> implements IKcZzSzkcService {
|
||||
|
||||
}
|
|
@ -34,14 +34,15 @@
|
|||
<if test="kcEvaluation.username != null and kcEvaluation.username != ''">
|
||||
and (cu.xm like concat('%',#{kcEvaluation.username},'%') or cu.gh like concat('%',#{kcEvaluation.username},'%'))
|
||||
</if>
|
||||
GROUP BY ev.upuserid, cu.dwh
|
||||
GROUP BY ev.upuserid, cu.dwh,
|
||||
cu.xm,kt.skrq ,cu.dwmc
|
||||
) tk left join
|
||||
(
|
||||
select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as tksf1 ,
|
||||
max( ytkcs-0 ) AS tkyq , tklx AS tklx from kc_export_config_tpkwcqkjzglx a
|
||||
LEFT JOIN sys_dict_item b on a.tklx = b.item_value and dict_id = '1682386362753224705'
|
||||
and a.xqxn = (select flag1 from kc_sys_config where id = 1)
|
||||
GROUP BY gh,xm
|
||||
GROUP BY gh,xm,a.tklx
|
||||
) au
|
||||
on tk.upuserid = au.usercode
|
||||
<where>
|
||||
|
|
|
@ -499,12 +499,12 @@
|
|||
left join (
|
||||
SELECT
|
||||
id, user_id, ketangbiao_id, notes
|
||||
FROM ( SELECT distinct id, user_id, ketangbiao_id, notes, create_time FROM kc_ketang_suibi WHERE
|
||||
FROM ( SELECT id, user_id, ketangbiao_id, notes FROM kc_ketang_suibi WHERE
|
||||
<if test="userid != null and userid != ''">
|
||||
user_id = #{userid}
|
||||
</if>
|
||||
ORDER BY create_time DESC ) a
|
||||
GROUP BY user_id, ketangbiao_id
|
||||
GROUP BY id, user_id, ketangbiao_id, notes
|
||||
) suibi on suibi.ketangbiao_id = tk.ketangbiaoid
|
||||
LEFT JOIN xxhbbkjxtkpj tkpj on tk.kcbh = tkpj.kbbh
|
||||
|
||||
|
|
|
@ -112,7 +112,14 @@ public class WjxDjxxServiceImpl extends ServiceImpl<WjxDjxxMapper, WjxDjxx> impl
|
|||
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
map.put("vid",Integer.valueOf(vid));
|
||||
map.put("inputcosttime",ChronoUnit.SECONDS.between(openTime.toInstant(),date.toInstant()));
|
||||
Long djys = ChronoUnit.SECONDS.between(wds.getOpenTime().toInstant(),wds.getCommitTime().toInstant());
|
||||
if(djys<3){
|
||||
djys = 10L;
|
||||
}
|
||||
System.out.println("--------------------------------------------------");
|
||||
System.out.println("---------------djys--"+djys+"---------------------------");
|
||||
System.out.println("--------------------------------------------------");
|
||||
map.put("inputcosttime", djys);
|
||||
map.put("submitdata",submitData);
|
||||
map.put("sojumpparm",user.getUsername());//自定义链接参数,用来透传用户ID
|
||||
//调用接口,提交
|
||||
|
|
|
@ -128,12 +128,13 @@ public class WjxWjxxTmlbController extends JeecgController<WjxWjxxTmlb, IWjxWjxx
|
|||
public Result<String> add(@RequestBody List<WjxWjxxTmlbPage> list) {
|
||||
if(list.size()>0){
|
||||
String mainId = list.get(0).getMainId();
|
||||
|
||||
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<WjxWjxxTmlb>();
|
||||
wjxWjxxTmlbQueryWrapper.eq("main_id",mainId);
|
||||
List<WjxWjxxTmlb> list2 = wjxWjxxTmlbService.list(wjxWjxxTmlbQueryWrapper);
|
||||
for(WjxWjxxTmlb WjxWjxxTmlb:list2){
|
||||
wjxWjxxTmlbService.removeByMainId(WjxWjxxTmlb.getId());
|
||||
if(StringUtils.isNotBlank(mainId)){
|
||||
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<WjxWjxxTmlb>();
|
||||
wjxWjxxTmlbQueryWrapper.eq("main_id",mainId);
|
||||
List<WjxWjxxTmlb> list2 = wjxWjxxTmlbService.list(wjxWjxxTmlbQueryWrapper);
|
||||
for(WjxWjxxTmlb WjxWjxxTmlb:list2){
|
||||
wjxWjxxTmlbService.removeByMainId(WjxWjxxTmlb.getId());
|
||||
}
|
||||
}
|
||||
|
||||
for(WjxWjxxTmlbPage wjxWjxxTmlbPage:list){
|
||||
|
@ -408,4 +409,13 @@ public class WjxWjxxTmlbController extends JeecgController<WjxWjxxTmlb, IWjxWjxx
|
|||
return mv;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ApiOperation(value="根据tmlbid获取题目信息", notes="根据tmlbid获取题目信息")
|
||||
@GetMapping(value = "/getTmxxByTmlbid")
|
||||
public Result<List<WjxWjxxTmlb>> getTmxxByTmlbid(@RequestParam(name="id",required=true) String id) {
|
||||
List<WjxWjxxTmlb> WjxWjxxTmlbList = wjxWjxxTmlbService.getTmxxByTmlbid(id);
|
||||
return Result.OK(WjxWjxxTmlbList);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -57,4 +57,6 @@ public interface IWjxWjxxTmlbService extends IService<WjxWjxxTmlb> {
|
|||
IPage<WjxWjxxTmlb> distinctList(Page<WjxWjxxTmlb> page, QueryWrapper<WjxWjxxTmlb> queryWrapper);
|
||||
|
||||
List<WjxWjxxTmlb> getTmxxPeop(String id);
|
||||
|
||||
List<WjxWjxxTmlb> getTmxxByTmlbid(String id);
|
||||
}
|
||||
|
|
|
@ -53,14 +53,14 @@ public class WjxWjxxTmlbServiceImpl extends ServiceImpl<WjxWjxxTmlbMapper, WjxWj
|
|||
//外键设置
|
||||
entity.setMainId(wjxWjxxTmlb.getId());
|
||||
entity.setWjIndex(wjxWjxxTmlb.getWjIndex());
|
||||
// String itemSelected[] = wjxWjxxTmlb.getItemSelected().split(",");
|
||||
// String sfxz = wjxWjxxTmlb.getItemSelected();
|
||||
// for(String par:itemSelected){
|
||||
// if(StringUtils.equals(par, entity.getItemIndex().toString())){
|
||||
// sfxz = "true";
|
||||
// }
|
||||
// }
|
||||
// entity.setItemSelected(sfxz);
|
||||
String itemSelected[] = wjxWjxxTmlb.getItemSelected().split(",");
|
||||
String sfxz = wjxWjxxTmlb.getItemSelected();
|
||||
for(String par:itemSelected){
|
||||
if(StringUtils.equals(par, entity.getItemIndex().toString())){
|
||||
sfxz = "true";
|
||||
}
|
||||
}
|
||||
entity.setItemSelected(sfxz);
|
||||
wjxWjxxTmxxMapper.insert(entity);
|
||||
}
|
||||
}
|
||||
|
@ -187,4 +187,26 @@ public class WjxWjxxTmlbServiceImpl extends ServiceImpl<WjxWjxxTmlbMapper, WjxWj
|
|||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<WjxWjxxTmlb> getTmxxByTmlbid(String id) {
|
||||
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<WjxWjxxTmlb>();
|
||||
wjxWjxxTmlbQueryWrapper.eq("id",id);
|
||||
List<WjxWjxxTmlb> list = wjxWjxxTmlbMapper.selectList(wjxWjxxTmlbQueryWrapper);
|
||||
for(WjxWjxxTmlb WjxWjxxTmlb:list){
|
||||
List<WjxWjxxTmxx> list2= wjxWjxxTmxxMapper.selectByMainId(WjxWjxxTmlb.getId());
|
||||
String itemSelected = "";
|
||||
for(WjxWjxxTmxx WjxWjxxTmxx:list2){
|
||||
if(StringUtils.equals(WjxWjxxTmxx.getItemSelected(),"true")){
|
||||
itemSelected = itemSelected+WjxWjxxTmxx.getItemIndex()+",";
|
||||
}
|
||||
}
|
||||
if(StringUtils.isNotBlank(itemSelected)){
|
||||
itemSelected = itemSelected.substring(0, itemSelected.length()-1);
|
||||
}
|
||||
WjxWjxxTmlb.setItemSelected(itemSelected);
|
||||
WjxWjxxTmlb.setWjxWjxxTmxxList(list2);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -175,12 +175,20 @@ public class ZyInfoController extends JeecgController<ZyInfo, IZyInfoService> {
|
|||
queryWrapper.eq(StringUtils.isNotBlank(zyInfo.getTeano()),"a.create_by",zyInfo.getTeano());
|
||||
queryWrapper.orderByAsc("a.sort - 0");
|
||||
IPage<ZyInfo> pageList = zyInfoService.page(page, queryWrapper);
|
||||
pageList.getRecords().forEach(zyInfo1 -> {
|
||||
String xkrs = kcKechengbiao.getXkrs();
|
||||
zyInfo1.setXkxs(xkrs);
|
||||
int wtj = Integer.parseInt(xkrs)-Integer.parseInt(zyInfo1.getDpynum())-Integer.parseInt(zyInfo1.getYpynum());
|
||||
zyInfo1.setWtjnum(wtj+"");
|
||||
});
|
||||
try{
|
||||
if(kcKechengbiao!=null&&StringUtils.isNotBlank(kcKechengbiao.getXkrs())){
|
||||
pageList.getRecords().forEach(zyInfo1 -> {
|
||||
String xkrs = kcKechengbiao.getXkrs();
|
||||
zyInfo1.setXkxs(xkrs);
|
||||
int wtj = Integer.parseInt(xkrs)-Integer.parseInt(zyInfo1.getDpynum())-Integer.parseInt(zyInfo1.getYpynum());
|
||||
zyInfo1.setWtjnum(wtj+"");
|
||||
});
|
||||
}
|
||||
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
|
|
@ -233,7 +233,7 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
}
|
||||
}
|
||||
queryWrapper.eq(StringUtils.isNotEmpty(zyInfoStudent.getYwid()),"b.id",zyInfoStudent.getYwid());
|
||||
queryWrapper.eq(StringUtils.isNotEmpty(zyInfoStudent.getRwbh()),"c.KCAPZBBH",zyInfoStudent.getRwbh());
|
||||
queryWrapper.eq(StringUtils.isNotEmpty(zyInfoStudent.getRwbh()),"c.KCAPZBBH",zyInfoStudent.getRwbh());
|
||||
IPage<ZyInfoStudent> pageList = zyInfoStudentService.getList2(page, queryWrapper);
|
||||
for(ZyInfoStudent ZyInfoStudentPar:pageList.getRecords()){
|
||||
List<ZyInfoStudent> list = zyInfoStudentService.getCcjg(ZyInfoStudentPar);
|
||||
|
|
Loading…
Reference in New Issue