From f234661cfecc41ba7854e836ea48c7da5a0d9c89 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 23 Aug 2023 21:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E9=87=8F=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E8=A1=A8sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KcEvaluationsStatController.java          |  2 +-
 .../mapper/xml/KcEvaluationsStatMapper.xml    | 57 ++++++++++++++-----
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java
index 9ddf0bd7..3f8abdca 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/controller/KcEvaluationsStatController.java
@@ -158,7 +158,7 @@ public class KcEvaluationsStatController extends JeecgController<KcEvaluationsSt
     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, KcEvaluationsStat kcEvaluationsStat) {
-        return super.exportXls(request, kcEvaluationsStat, KcEvaluationsStat.class, "kc_evaluations_stat");
+        return super.exportXls(request, kcEvaluationsStat, KcEvaluationsStat.class, "全量评价表");
     }
 
     /**
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 051a7870..34ae3cbe 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
@@ -287,10 +287,11 @@
         AND KT.SKRQ >= XQXN.START_TIME
         AND KT.SKRQ &lt;= XQXN.END_TIME
         ORDER BY EVS.QUEID) YBTK
-        where ybtk.COL00 not in (select col00 from kc_evaluations_stat)
+        where YBTK.COL00 not in (select col00 from kc_evaluations_stat)
     </select>
 
     <select id="getXstkbJxsjSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
+
         SELECT XSTK.COL00,
         XSTK.COL01,
         XSTK.COL02,
@@ -380,7 +381,7 @@
         WHEN '2' THEN
         '服务大厅'
         WHEN '3' THEN
-        '后台导入'
+        '纸质评价'
         ELSE
         '未知数据源'
         END AS COL16,
@@ -423,19 +424,46 @@
         '' AS COL53,
         '' AS COL54,
         '' AS COL55
-        FROM (SELECT UPUSER,
-        UPUSERID,
-        KETANGBIAOID,
-        QUEID,
-        ANSID,
-        EVALUATIONID,
-        DETANSWER
         FROM (SELECT EVS.UPUSER,
         EVS.UPUSERID,
         EVS.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
+        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 = '2'
+        AND EVS.EVALUATIONID = #{col00}
+        AND QUE.QUETYPE = '1'
+        AND EVS.QUEID >= 11
+        AND EVS.QUEID &lt; 14
+        UNION
+        SELECT EVS.UPUSER,
+        EVS.UPUSERID,
+        EVS.KETANGBIAOID,
+        EVS.QUEID,
+        EVS.EVALUATIONID,
+        EVS.ANSID,
         GROUP_CONCAT(CASE ANS.ORDERNUM
         WHEN '1' THEN
         'A'
@@ -505,6 +533,8 @@
         AND EV.evaluationver = '2'
         AND EVS.EVALUATIONID = #{col00}
         AND QUE.QUETYPE = '1'
+        AND EVS.QUEID >= 15
+        AND EVS.QUEID &lt; 18
         UNION
         SELECT EVS.UPUSER,
         EVS.UPUSERID,
@@ -521,8 +551,7 @@
         AND EVS.QUEID = QUE.ID
         AND EV.evaluationver = '2'
         AND EVS.EVALUATIONID = #{col00}
-        AND QUE.QUETYPE = '3') EVSTMP
-        ORDER BY QUEID) EVS,
+        AND QUE.QUETYPE = '3') EVS,
         KC_EVALUATION EV,
         KC_XQXN_HISTORY XQXN,
         KC_KETANGBIAO KT,
@@ -551,7 +580,7 @@
         AND KT.SKRQ >= XQXN.START_TIME
         AND KT.SKRQ &lt;= XQXN.END_TIME
         ORDER BY EVS.QUEID) XSTK
-        where ybtk.COL00 not in (select col00 from kc_evaluations_stat)
+        where XSTK.COL00 not in (select col00 from kc_evaluations_stat)
     </select>
 
     <select id="getThpjbJxsjSyncList" resultType="org.jeecg.modules.kc.kcEvaluationsStat.entity.KcEvaluationsStat">
@@ -645,7 +674,7 @@
         WHEN '2' THEN
         '服务大厅'
         WHEN '3' THEN
-        '后台导入'
+        '纸质评价'
         ELSE
         '未知数据源'
         END AS COL16,
@@ -816,6 +845,6 @@
         AND KT.SKRQ >= XQXN.START_TIME
         AND KT.SKRQ &lt;= XQXN.END_TIME
         ORDER BY EVS.QUEID) THPJ
-        where ybtk.COL00 not in (select col00 from kc_evaluations_stat)
+        where THPJ.COL00 not in (select col00 from kc_evaluations_stat)
     </select>
 </mapper>
\ No newline at end of file