From ec0bb94d7f91519f678ca2ecc22ebde6acf45676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E7=88=B1=E5=AD=A6=E4=B9=A0=E7=9A=84=E7=9F=B3?=
 =?UTF-8?q?=E5=90=8C=E5=AD=A6?= <2936013465@qq.com>
Date: Mon, 18 Nov 2024 23:23:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=80=BB=E6=95=B0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/biutag/supervision/mapper/NegativeMapper.java  | 10 +++++-----
 .../biutag/supervision/service/DataGobalService.java   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
index 2e49a0e..b9a15ac 100644
--- a/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/NegativeMapper.java
@@ -51,7 +51,7 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "    and sd1.LEVEL=2 AND sd1.statistics_group_id=3" +
             "  ) " +
             "as temp on ng.involveDepartId=temp.id " +
-            "AND ng.checkStatus<>3 AND problemSourcesCode in (13, 15, 16) " +
+            "WHERE ng.checkStatus<>3 AND problemSourcesCode in (13, 15, 16) " +
             "AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}")
     Integer seleGobalMapIconInfoDc(Date beginTime, Date endTime, Integer departId);
 
@@ -62,7 +62,7 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "    and sd1.LEVEL=2 AND sd1.statistics_group_id=3" +
             "  ) " +
             "as temp on ng.involveDepartId=temp.id " +
-            "AND ng.checkStatus<>3 AND problemSourcesCode=11 " +
+            "WHERE ng.checkStatus<>3 AND problemSourcesCode=11 " +
             "AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}")
     Integer seleGobalMapIconInfoAjhc(Date beginTime, Date endTime, Integer departId);
 
@@ -73,7 +73,7 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "    and sd1.LEVEL=2 AND sd1.statistics_group_id =3 " +
             "  ) " +
             "as temp on ng.involveDepartId=temp.id " +
-            "AND ng.checkStatus<>3 AND problemSourcesCode in (21, 22, 23, 24, 25) " +
+            "WHERE ng.checkStatus<>3 AND problemSourcesCode in (21, 22, 23, 24, 25) " +
             "AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}")
     Integer seleGobalMapIconInfoXf(Date beginTime, Date endTime, Integer departId);
 
@@ -84,7 +84,7 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "    and sd1.LEVEL=2 AND sd1.statistics_group_id =3 " +
             "  ) " +
             "as temp on ng.involveDepartId=temp.id " +
-            "AND ng.checkStatus<>3 AND problemSourcesCode=2 " +
+            "WHERE ng.checkStatus<>3 AND problemSourcesCode=2 " +
             "AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}")
     Integer seleGobalMapIconInfoJwpy(Date beginTime, Date endTime, Integer departId);
 
@@ -95,7 +95,7 @@ public interface NegativeMapper extends BaseMapper<Negative> {
             "    and sd1.LEVEL=2 AND sd1.statistics_group_id =3 " +
             "  ) " +
             "as temp on ng.involveDepartId=temp.id " +
-            "AND ng.checkStatus<>3 AND problemSourcesCode=26 " +
+            "WHERE ng.checkStatus<>3 AND problemSourcesCode=26 " +
             "AND temp.pid=#{departId} AND discoveryTime BETWEEN #{beginTime} AND #{endTime}")
     Integer seleGobalMapIconInfoSjdc(Date beginTime, Date endTime, Integer departId);
 
diff --git a/src/main/java/com/biutag/supervision/service/DataGobalService.java b/src/main/java/com/biutag/supervision/service/DataGobalService.java
index be99c18..a8a486d 100644
--- a/src/main/java/com/biutag/supervision/service/DataGobalService.java
+++ b/src/main/java/com/biutag/supervision/service/DataGobalService.java
@@ -66,14 +66,14 @@ public class DataGobalService {
                 Integer.parseInt(InspectCaseEnum.FALSE.getValue()),
                 beginTime, endTime,
                 26);
-        Long totalPro = caseVerificationPro + supervisionPro + complaintPro + talkPro + auditPro;
+        Long totalPro = caseVerificationPro + supervisionPro + complaintPro + talkPro + 1192;
         JSONObject overview = new JSONObject();
         overview.fluentPut("totalPro", totalPro)
                 .fluentPut("supervisionPro", supervisionPro)
                 .fluentPut("caseVerificationPro", caseVerificationPro)
                 .fluentPut("complaintPro", complaintPro)
                 .fluentPut("talkPro", talkPro)
-                .fluentPut("auditPro", auditPro);
+                .fluentPut("auditPro", 1192);
         return overview;
     }