From 277fe33c9c9868fe5be0c009cd611514cf7914dd Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Sun, 8 Oct 2023 19:12:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/KcEvaluationsStatMapper.xml | 15 +++++++++------ .../jeecg/modules/kc/qa/entity/KcEvaluation.java | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) 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 ce747017..18976087 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 @@ -277,10 +277,11 @@ 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, B.ITEM_TEXT + 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') TKSF + AND B.DICT_ID = '1682386362753224705' + GROUP BY a.gh) TKSF ON TKSF.GH = EVS.UPUSERID LEFT JOIN KC_EVALUATIONQUE QUE ON EVS.QUEID = QUE.ID) YBTK @@ -567,10 +568,11 @@ 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, B.ITEM_TEXT + 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') TKSF + AND B.DICT_ID = '1682386362753224705' + GROUP BY a.gh) TKSF ON TKSF.GH = EVS.UPUSERID LEFT JOIN KC_EVALUATIONQUE QUE ON EVS.QUEID = QUE.ID) XSTK @@ -829,10 +831,11 @@ 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, B.ITEM_TEXT + 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') TKSF + AND B.DICT_ID = '1682386362753224705' + GROUP BY a.gh) TKSF ON TKSF.GH = EVS.UPUSERID LEFT JOIN KC_EVALUATIONQUE QUE ON EVS.QUEID = QUE.ID) THPJ diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java index e8cd9197..7887a0ea 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcEvaluation.java @@ -117,7 +117,7 @@ public class KcEvaluation implements Serializable { @Excel(name = "评课要求", width = 15) @TableField(exist = false) private java.lang.String tkyq; - @Excel(name = "实际听课数", width = 15) + @Excel(name = "实际评课数", width = 15) @TableField(exist = false) private java.lang.String sjtksl; @Excel(name = "其中马列教研室课程数", width = 15)