From 94ace3d13e207603f982eaad61edd87cfd52d08c Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Sat, 30 Mar 2024 08:35:04 +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/KcExportConfigTpkwcqkjzglxMapper.xml      | 9 ++++++---
 .../modules/kc/qa/mapper/xml/KcEvaluationMapper.xml      | 7 +++----
 .../src/main/resources/application-dev.yml               | 2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

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 a16b0988..5a872f8b 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
@@ -82,6 +82,9 @@
             <if test='kcExportConfigTpkwcqkjzglx.type != null and kcExportConfigTpkwcqkjzglx.type == "2"'>
                 and ytkcs -0 > sjtkcs - 0
             </if>
+            <if test='kcExportConfigTpkwcqkjzglx.xm != null and kcExportConfigTpkwcqkjzglx.xm != ""'>
+                and xm like concat('%',#{kcExportConfigTpkwcqkjzglx.xm} ,'%')
+            </if>
 
         </where>
     </select>
@@ -102,8 +105,8 @@
         SELECT
         kc.dwjc as dwmc,
         total.total_sum,
-        ready.ready_sum,
-        round(ready.ready_sum / total.total_sum,2) as ytkcs
+        ifnull(ready.ready_sum,'0') as ready_sum,
+        round( ifnull(ready.ready_sum,'0') / total.total_sum, 2 ) AS ytkcs
         FROM
         (
         SELECT
@@ -155,7 +158,7 @@
         count( 'x' ) AS pj_sum
         FROM
         kc_evaluation a,
-        ( select bxqkssj as start_time , bxqkssj as end_time FROM kc_xqxn_history WHERE id = '1') b,
+        ( SELECT bxqkssj AS start_time, bxqjssj AS end_time FROM kc_sys_config WHERE id = '1') b,
         (
         SELECT
         xqxn,
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 783c17ef..ea203d57 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
@@ -310,11 +310,10 @@
         FROM (
         SELECT ev.upuserid, cu.xm as upuser, count( ev.id ) sjtksl, count( CASE WHEN kt.kkdw = '马列教研室' THEN 1 END ) mltksl, cu.dwmc AS tkdw,kt.skrq
         FROM
-        kc_evaluation ev,
+        kc_evaluation ev
         left join kc_ketangbiao kt on ev.minkcid = kt.id
         left join xxhbuser cu on ev.upuserid = cu.gh
 
-        left join kc_kechengbiao kcb on pk.kechengbiaoid = kcb.id
         WHERE  1=1
         <if test="startTime != null and startTime != ''">
             <!--            and ev.up_date &gt;= #{kcEvaluation.startTime}-->
@@ -351,8 +350,8 @@
         ( select gh as usercode,xm as username,GROUP_CONCAT( b.item_text SEPARATOR ',' ) as tksf1 ,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 test="tksf != null and tksf != ''">
+            AND b.item_value = #{tksf}
         </if>
         GROUP BY gh,xm) au
         on tk.upuserid = au.usercode
diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
index 2b729db9..07c6fde2 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
+++ b/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
@@ -145,7 +145,7 @@ spring:
 #          driver-class-name: oracle.jdbc.OracleDriver
   #redis 配置
   redis:
-    database: 1
+    database: 2
     host: 127.0.0.1
     port: 6379
     password: ''