From eb83194431fb9bdabcd116f80c24d794633400cb Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Wed, 13 Nov 2024 15:05:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E8=B5=8B=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sensitivePerception/ProfileDepartController.java |  6 ------
 .../sensitivePerception/ProfilePoliceController.java |  9 +--------
 src/main/resources/mapper/ProfileDepartMapper.xml    | 12 ++++++++----
 src/main/resources/mapper/ProfilePoliceMapper.xml    |  4 +++-
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfileDepartController.java b/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfileDepartController.java
index 99a44f0..ff6fe53 100644
--- a/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfileDepartController.java
+++ b/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfileDepartController.java
@@ -60,12 +60,6 @@ public class ProfileDepartController {
         }
         Page<DepartNegativeModel> page = profileDepartMapper.queryDepartNegative(Page.of(param.getCurrent(), param.getSize()), beginTime, endTime,
                 param.getDepartName(), param.getDepartId(), param.getDepartGroupId());
-        long l = System.currentTimeMillis();
-        for (DepartNegativeModel item : page.getRecords()) {
-            List<Object> result = negativeScoreService.calculateDepartScore(beginTime, endTime, item.getDepartId());
-            item.setScore((BigDecimal) result.get(0));
-        }
-        log.info("风险指数计算耗时：{}s", (System.currentTimeMillis() - l) / 1000);
         return Result.success(page);
     }
 
diff --git a/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfilePoliceController.java b/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfilePoliceController.java
index bbc48f3..abfd15d 100644
--- a/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfilePoliceController.java
+++ b/src/main/java/com/biutag/supervision/controller/sensitivePerception/ProfilePoliceController.java
@@ -63,12 +63,6 @@ public class ProfilePoliceController {
         }
         Page<PoliceNegativeModel> page = profilePoliceMapper.queryPoliceNegative(Page.of(param.getCurrent(), param.getSize()), beginTime, endTime,
                 param.getName(),param.getEmpNo(), param.getDepartId(), param.getDepartGroupId());
-        long l = System.currentTimeMillis();
-        for (PoliceNegativeModel item : page.getRecords()) {
-            List<Object> result = negativeScoreService.calculatePoliceScore(beginTime, endTime, item.getIdCode());
-            item.setScore((BigDecimal) result.get(0));
-        }
-        log.info("风险指数计算耗时：{}s", (System.currentTimeMillis() - l) / 1000);
         return Result.success(page);
     }
 
@@ -154,8 +148,7 @@ public class ProfilePoliceController {
         List<Object> result = negativeScoreService.calculatePoliceScore(beginTime, endTime, idCode);
         profilePolice.setScore((BigDecimal) result.get(0));
         profilePolice.setExpression(result.get(1).toString());
-
-
+        profilePolice.setRemarks(result.get(2).toString());
         return Result.success(profilePolice);
     }
 
diff --git a/src/main/resources/mapper/ProfileDepartMapper.xml b/src/main/resources/mapper/ProfileDepartMapper.xml
index ec93598..ca609d6 100644
--- a/src/main/resources/mapper/ProfileDepartMapper.xml
+++ b/src/main/resources/mapper/ProfileDepartMapper.xml
@@ -7,8 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryDepartNegative" resultType="com.biutag.supervision.pojo.model.DepartNegativeModel">
         SELECT
             d.*,
-            count( DISTINCT n.id_code ) verify_police_size,
-            count( n.id ) verify_size,
+            count( DISTINCT nb.blameIdCode  ) verify_police_size,
+            count( n.negative_id ) verify_size,
             dc.score
         FROM
             (
@@ -24,13 +24,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN sup_depart_police_size p ON p.depart_id = d.id
             WHERE
                 d.LEVEL = 3
-                and d.statistics_group_id = #{departGroupId}
+                <if test="departGroupId != null and departGroupId != ''">
+                    and d.statistics_group_id = #{departGroupId}
+                </if>
+
             ) d
             LEFT JOIN negative_score_depart n ON d.depart_id = n.depart_id
+            LEFT JOIN negative_blame nb ON n.negative_id = nb.blameId
             left join depart_score dc on d.depart_id = dc.depart_id
         WHERE
             n.depart_id is not null
-            AND n.discoveryTime BETWEEN #{beginTime} AND #{endTime}
+            AND n.discovery_time BETWEEN #{beginTime} AND #{endTime}
             <if test="departName != null and departName != ''">
                 AND d.short_name like concat('%', #{departName}, '%')
             </if>
diff --git a/src/main/resources/mapper/ProfilePoliceMapper.xml b/src/main/resources/mapper/ProfilePoliceMapper.xml
index de3b114..a13a5cd 100644
--- a/src/main/resources/mapper/ProfilePoliceMapper.xml
+++ b/src/main/resources/mapper/ProfilePoliceMapper.xml
@@ -25,7 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             n.id_code is not null
             AND n.discovery_time BETWEEN #{beginTime} AND #{endTime}
-            AND d.statistics_group_id = #{departGroupId}
+            <if test="departGroupId != null and departGroupId != ''">
+                AND d.statistics_group_id = #{departGroupId}
+            </if>
             AND pc.score > 0
             <if test="name != null and name != ''">
                 AND p.name like concat('%', #{name}, '%')