From 29154c3901b552155f7e9447f9958ee4c932509c Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 27 Dec 2023 08:21:39 +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

---
 .../kc/kcZzThpjb/mapper/xml/KcZzThpjbMapper.xml    |  2 +-
 .../kcZzXstkb/controller/KcZzXstkbController.java  | 12 +++++++-----
 .../kc/kcZzXstkb/mapper/xml/KcZzXstkbMapper.xml    |  2 +-
 .../kc/kcZzYbtkb/mapper/xml/KcZzYbtkbMapper.xml    |  2 +-
 .../kc/qa/mapper/xml/KcEvaluationMapper.xml        | 14 ++++++++++++--
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/mapper/xml/KcZzThpjbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/mapper/xml/KcZzThpjbMapper.xml
index ea03666a..97c63d74 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/mapper/xml/KcZzThpjbMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzThpjb/mapper/xml/KcZzThpjbMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.kc.kcZzThpjb.mapper.KcZzThpjbMapper">
 
     <select id="selectPage" resultType="org.jeecg.modules.kc.kcZzThpjb.entity.KcZzThpjb">
-        select a.*,b.title as xqxn from kc_zz_thpjb a
+        select distinct a.*,b.title as xqxn from kc_zz_thpjb a
         LEFT JOIN kc_xqxn_history b on a.sksj >= b.start_time + '' and a.sksj &lt;= b.end_time +''
         left join xxhbuser c on a.pkjsbh = c.gh
         left join xxhbuser d on d.dwh = c.dwh
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java
index 9c4f79bc..a4e30e2d 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/controller/KcZzXstkbController.java
@@ -228,13 +228,15 @@ public class KcZzXstkbController extends JeecgController<KcZzXstkb, IKcZzXstkbSe
 
 				QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper4 = new QueryWrapper<>();
 				kcEvaluationansQueryWrapper4.eq("queid","14");
-				kcEvaluationansQueryWrapper4.eq("ordernum",ans4);
+				kcEvaluationansQueryWrapper4.in("ordernum",ans4.split(","));
 				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);
+					for(KcEvaluationans KcEvaluationans:kcEvaluationansList4){
+						kcEvaluations.setId(null);
+						kcEvaluations.setQueid(KcEvaluationans.getQueid());
+						kcEvaluations.setAnsid(KcEvaluationans.getId());
+						kcEvaluationsService.save(kcEvaluations);
+					}
 				}
 
 				QueryWrapper<KcEvaluationans> kcEvaluationansQueryWrapper5 = new QueryWrapper<>();
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/mapper/xml/KcZzXstkbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/mapper/xml/KcZzXstkbMapper.xml
index bc61988f..f7322941 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/mapper/xml/KcZzXstkbMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzXstkb/mapper/xml/KcZzXstkbMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.kc.kcZzXstkb.mapper.KcZzXstkbMapper">
 
     <select id="selectPage" resultType="org.jeecg.modules.kc.kcZzXstkb.entity.KcZzXstkb">
-        select a.*,b.title as xqxn from kc_zz_xstkb a
+        select distinct a.*,b.title as xqxn from kc_zz_xstkb a
         LEFT JOIN kc_xqxn_history b on a.sksj >= b.start_time + '' and a.sksj &lt;= b.end_time +''
         left join xxhbuser c on a.tkjsgh = c.gh
         left join xxhbuser d on d.dwh = c.dwh
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/mapper/xml/KcZzYbtkbMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/mapper/xml/KcZzYbtkbMapper.xml
index 334baa16..5f758f49 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/mapper/xml/KcZzYbtkbMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcZzYbtkb/mapper/xml/KcZzYbtkbMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.kc.kcZzYbtkb.mapper.KcZzYbtkbMapper">
 
     <select id="selectPage" resultType="org.jeecg.modules.kc.kcZzYbtkb.entity.KcZzYbtkb">
-        select a.*,b.title as xqxn from kc_zz_ybtkb a
+        select distinct a.*,b.title as xqxn from kc_zz_ybtkb a
         LEFT JOIN kc_xqxn_history b on a.SKRQ >= b.start_time + '' and a.SKRQ &lt;= b.end_time +''
         left join xxhbuser c on a.tkjsbh = c.gh
         left join xxhbuser d on d.dwh = c.dwh
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 5063ae1b..188bd27d 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
@@ -75,8 +75,18 @@
             and (c.xm like concat('%',#{kcEvaluation.username},'%') or c.gh like concat('%',#{kcEvaluation.username},'%'))
         </if>
         ) AS pk
-        LEFT JOIN (SELECT gh as usercode,xm as username, zwmc as assess1
-        FROM kc_tksfrzb
+        LEFT JOIN (
+<!--        SELECT gh as usercode,xm as username, zwmc as assess1-->
+<!--        FROM kc_tksfrzb-->
+        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)
+<!--        <if test="kcEvaluation.tksf != null and kcEvaluation.tksf != ''">-->
+<!--            AND b.item_value = #{kcEvaluation.tksf}-->
+<!--        </if>-->
+        GROUP BY gh,xm
+
+
          ) au ON pk.userid = au.usercode
         LEFT JOIN kc_xqxn_history xnxq on pk.skrq >= xnxq.start_time  and pk.skrq &lt;= xnxq.end_time
         left join kc_kechengbiao kcb on pk.kechengbiaoid = kcb.id