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 b771ee1d..8b7d4e16 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 @@ -255,4 +255,6 @@ public class KcEvaluationsStat implements Serializable { @Excel(name = "10.其它建议", width = 15) @ApiModelProperty(value = "10.其它建议") private java.lang.String col55; + private java.lang.String col56; + private java.lang.String col57; } 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 18976087..5b7ecd17 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 @@ -82,7 +82,9 @@ YBTK.COL52, YBTK.COL53, YBTK.COL54, - YBTK.COL55 + YBTK.COL55, + YBTK.COL56, + YBTK.COL57 FROM (SELECT EVS.EVALUATIONID AS COL00, XQXN.TITLE AS COL01, -- 一般听课表(3) KT.KCMC AS COL02, @@ -167,7 +169,9 @@ '' AS COL52, '' AS COL53, '' AS COL54, - '' AS COL55 + '' AS COL55, + rjzy.rjzy as col56, + ev.rjzy as col57 FROM (SELECT UPUSER, UPUSERID, KETANGBIAOID, @@ -268,10 +272,11 @@ AND EV.evaluationver = '3' AND QUE.QUETYPE = '3') EVSTMP ORDER BY QUEID) EVS - LEFT JOIN KC_EVALUATION EV + LEFT JOIN (select * from KC_EVALUATION ev left join (select gh,tklx,dwmc,xm,sf,zt,ytkcs,rjzy,xqxn from kc_export_config_tpkwcqkjzglx where xqxn in (select max(xqxn) from kc_export_config_tpkwcqkjzglx)) 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_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh LEFT JOIN KC_XQXN_HISTORY XQXN ON KT.SKRQ >= XQXN.START_TIME AND KT.SKRQ <= XQXN.END_TIME @@ -345,7 +350,9 @@ XSTK.COL52, XSTK.COL53, XSTK.COL54, - XSTK.COL55 + XSTK.COL55, + XSTK.COL56, + XSTK.COL57 FROM (SELECT EVS.evaluationid AS COL00, XQXN.TITLE AS COL01, -- 线上听课表(2) KT.KCMC AS COL02, @@ -430,7 +437,9 @@ '' AS COL52, '' AS COL53, '' AS COL54, - '' AS COL55 + '' AS COL55, + rjzy.rjzy as col56, + ev.rjzy as col57 FROM (SELECT EVS.UPUSER, EVS.UPUSERID, EVS.KETANGBIAOID, @@ -559,10 +568,11 @@ AND EV.evaluationver = '2' AND EVS.EVALUATIONID = #{col00} AND QUE.QUETYPE = '3') EVS - LEFT JOIN KC_EVALUATION EV + LEFT JOIN (select * from KC_EVALUATION ev left join (select gh,tklx,dwmc,xm,sf,zt,ytkcs,rjzy,xqxn from kc_export_config_tpkwcqkjzglx where xqxn in (select max(xqxn) from kc_export_config_tpkwcqkjzglx)) 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_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh LEFT JOIN KC_XQXN_HISTORY XQXN ON KT.SKRQ >= XQXN.START_TIME AND KT.SKRQ <= XQXN.END_TIME @@ -636,7 +646,9 @@ THPJ.COL52, THPJ.COL53, THPJ.COL54, - THPJ.COL55 + THPJ.COL55, + THPJ.COL56, + THPJ.COL57 FROM (SELECT EVS.EVALUATIONID AS COL00, XQXN.TITLE AS COL01, -- 同行评价表(4) KT.KCMC AS COL02, @@ -721,7 +733,9 @@ '' AS COL52, '' AS COL53, '' AS COL54, - '' AS COL55 + '' AS COL55, + rjzy.rjzy as col56, + ev.rjzy as col57 FROM (SELECT UPUSER, UPUSERID, KETANGBIAOID, @@ -822,10 +836,11 @@ AND EVS.EVALUATIONID = #{col00} AND QUE.QUETYPE = '3') EVSTMP ORDER BY QUEID) EVS - LEFT JOIN KC_EVALUATION EV + LEFT JOIN (select * from KC_EVALUATION ev left join (select gh,tklx,dwmc,xm,sf,zt,ytkcs,rjzy,xqxn from kc_export_config_tpkwcqkjzglx where xqxn in (select max(xqxn) from kc_export_config_tpkwcqkjzglx)) 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_export_config_tpkwcqkjzglx rjzy on kt.jgh = rjzy.gh LEFT JOIN KC_XQXN_HISTORY XQXN ON KT.SKRQ >= XQXN.START_TIME AND KT.SKRQ <= XQXN.END_TIME diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java index a7555058..07ed2311 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java @@ -307,4 +307,7 @@ public class KcKetangbiao implements Serializable { private String title; @TableField(exist = false) private String notes; + @TableField(exist = false) + private String sftkb; + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml index 64501367..2a43f488 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml @@ -35,7 +35,7 @@