diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml index f4053e4e..512e7ab7 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/mapper/xml/KcExportConfigTpkwcqkjzglxMapper.xml @@ -89,13 +89,15 @@ diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java index bd339464..3db76221 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java @@ -257,6 +257,7 @@ public class KcEvaluationsStat implements Serializable { private java.lang.String col57; private java.lang.String col58; private java.lang.String col59; + private java.lang.String col60; @TableField(exist = false) private java.lang.String xqxn; 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 c0cbff0e..5fa4a7c4 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 @@ -94,7 +94,8 @@ YBTK.COL56, YBTK.COL57, YBTK.COL58, - YBTK.COL59 + YBTK.COL59, + YBTK.COL60 FROM (SELECT EVS.EVALUATIONID AS COL00, XQXN.TITLE AS COL01, -- 一般听课表(3) KT.KCMC AS COL02, @@ -183,14 +184,16 @@ rjzy.rjzy as col56, ev.rjzy as col57, KT.ID AS COL58, - CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59 + CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59, + EVS.UP_DATE AS COL60 FROM (SELECT UPUSER, UPUSERID, KETANGBIAOID, QUEID, ANSID, EVALUATIONID, - DETANSWER + DETANSWER, + EVSTMP.UP_DATE FROM (SELECT EVS.UPUSER, EVS.UPUSERID, EV.MINKCID AS KETANGBIAOID, @@ -222,7 +225,8 @@ 'K' ELSE '' - END) AS DETANSWER + END) AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -254,7 +258,8 @@ 'E' ELSE 'F' - END AS DETANSWER + END AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -273,7 +278,8 @@ EVS.QUEID, EVS.EVALUATIONID, EVS.ANSID, - EVS.TEXTANSCONTENT AS DETANSWER + EVS.TEXTANSCONTENT AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONQUE QUE @@ -370,7 +376,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x XSTK.COL56, XSTK.COL57, XSTK.COL58, - XSTK.COL59 + XSTK.COL59, + XSTK.COL60 FROM (SELECT EVS.evaluationid AS COL00, XQXN.TITLE AS COL01, -- 线上听课表(2) KT.KCMC AS COL02, @@ -459,7 +466,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x rjzy.rjzy as col56, ev.rjzy as col57, KT.ID AS COL58, - CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59 + CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59, + EVS.UP_DATE AS COL60 FROM (SELECT EVS.UPUSER, EVS.UPUSERID, EV.MINKCID AS KETANGBIAOID, @@ -479,7 +487,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x 'E' ELSE 'F' - END AS DETANSWER + END AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -525,7 +534,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x 'K' ELSE '' - END) AS DETANSWER + END) AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -557,7 +567,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x 'E' ELSE 'F' - END AS DETANSWER + END AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -578,7 +589,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x EVS.QUEID, EVS.EVALUATIONID, EVS.ANSID, - EVS.TEXTANSCONTENT AS DETANSWER + EVS.TEXTANSCONTENT AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONQUE QUE @@ -674,7 +686,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x THPJ.COL56, THPJ.COL57, THPJ.COL58, - THPJ.COL59 + THPJ.COL59, + THPJ.COL60 FROM (SELECT EVS.EVALUATIONID AS COL00, XQXN.TITLE AS COL01, -- 同行评价表(4) KT.KCMC AS COL02, @@ -763,14 +776,16 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x rjzy.rjzy as col56, ev.rjzy as col57, KT.ID AS COL58, - CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59 + CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59, + EVS.UP_DATE AS COL60 FROM (SELECT UPUSER, UPUSERID, KETANGBIAOID, QUEID, ANSID, EVALUATIONID, - DETANSWER + DETANSWER, + EVSTMP.UP_DATE FROM (SELECT EVS.UPUSER, EVS.UPUSERID, EV.MINKCID AS KETANGBIAOID, @@ -802,7 +817,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x 'K' ELSE '' - END) AS DETANSWER + END) AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -834,7 +850,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x 'E' ELSE 'F' - END AS DETANSWER + END AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, @@ -853,7 +870,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x EVS.QUEID, EVS.EVALUATIONID, EVS.ANSID, - EVS.TEXTANSCONTENT AS DETANSWER + EVS.TEXTANSCONTENT AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONQUE QUE @@ -950,7 +968,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x LBPJ.COL56, LBPJ.COL57, LBPJ.COL58, - LBPJ.COL59 + LBPJ.COL59, + LBPJ.COL60 FROM (SELECT EVS.EVALUATIONID AS COL00, XQXN.TITLE AS COL01, -- 老版评价表(1) KT.KCMC AS COL02, @@ -1039,14 +1058,16 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x rjzy.rjzy as col56, ev.rjzy as col57, KT.ID AS COL58, - CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59 + CASE KC.SZKC WHEN '1' THEN '是' ELSE '否' END AS col59, + EVS.UP_DATE AS COL60 FROM (SELECT UPUSER, UPUSERID, KETANGBIAOID, QUEID, ANSID, EVALUATIONID, - DETANSWER + DETANSWER, + EVSTMP.UP_DATE FROM ( SELECT EVS.UPUSER, EVS.UPUSERID, @@ -1067,7 +1088,8 @@ select max(id) as id,gh,xqxn from KC_EXPORT_CONFIG_TPKWCQKJZGLX where xqxn = #{x 'E' ELSE 'F' - END AS DETANSWER + END AS DETANSWER, + EVS.UP_DATE FROM kc_evaluation EV, KC_EVALUATIONS EVS, KC_EVALUATIONANS ANS, 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 188bd27d..783c17ef 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 @@ -80,7 +80,16 @@ select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as assess1 ,round(max(ytkcs-0),0) as tkyq 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) + + + and a.xqxn = #{kcEvaluation.xnxq} + + + and a.xqxn = (select flag1 from kc_sys_config where id = 1) + + + + @@ -351,27 +360,44 @@