From 713b6fd5482f3eccfe705593cf9b22515b6c5dfa Mon Sep 17 00:00:00 2001
From: lujiang <ljxuzhou@163.com>
Date: Fri, 30 Aug 2024 00:30:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/admin/RepairMapper.xml        | 2 +-
 .../src/main/resources/mapper/admin/RepairStatsMapper.xml   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml
index 1de2a4f..bd0c8d8 100644
--- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml
+++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairMapper.xml
@@ -255,7 +255,7 @@
         <if test="evalService != null and evalService==1"> AND rep.eval_service &gt;= 4</if>
         <if test="evalService != null and evalService==2"> AND rep.eval_service = 3</if>
         <if test="evalService != null and evalService==3"> AND rep.eval_service &lt;= 2</if>
-        <if test="timeout != null and timeout==9"> and predate &lt; now() and status &lt; 9</if>
+        <if test="timeout != null and timeout==9"> and predate is not null and predate &lt; now() and status &lt; 9</if>
         order by create_time desc
     </select>
 
diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml
index c3647c0..08c8485 100644
--- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml
+++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/RepairStatsMapper.xml
@@ -125,8 +125,8 @@
     <select id="repairAdminStats" resultType="com.ics.admin.vo.RepairAdminStatsVo">
     <![CDATA[
       SELECT `wait`,`anew`,newnotice,oldnotice FROM
-        (SELECT count(id) as `wait` FROM  ics_repair where delete_flag=0 and status=3) as A,
-        (SELECT count(DISTINCT repair_id) as `anew` FROM  ics_repair_log where delete_flag=0 and node_form=3) as B,
+        (SELECT count(id) as `wait` FROM  ics_repair where delete_flag=0 and status=1) as A,
+        (SELECT count(id) as `anew` FROM  ics_repair where delete_flag=0 and status=3) as B,
         (select count(id) as newnotice from ics_repair_remind where `read`=0 and user_id= #{userId}) C,
         (select count(id) as oldnotice from ics_repair_remind where `read`=1 and user_id= #{userId}) D
     ]]>
@@ -137,7 +137,7 @@
         <![CDATA[
         SELECT
             count(id) zs,
-            sum(case when status < 9 then 1 else 0 end) `wait`,
+            sum(case when status <= 7 then 1 else 0 end) `wait`,
             sum(case when predate is not null and predate < now() and status < 9 then 1 else 0 end) timeout,
             sum(case when eval_service is not null then 1 else 0 end) as pj,
             sum(case when eval_service is not null and eval_service >=4 then 1 else 0 end) as h,