src/main/java/com/biutag/supervision/constants/enums/InspectCaseEnum.java

@@ -12,15 +12,17 @@ public enum InspectCaseEnum {
     TRUE("1", "属实"),
     // 部分属实
     PARTIALLY_TRUE("2", "部分属实"),
+    QTFT("3", "不属实，但发现存在其他问题"),
     // 不属实
-    FALSE("3", "不属实");
+    WFCS("4", "现有证据暂时无法查实"),
+    FALSE("5", "不属实");
 
     private String value;
 
     private String label;
 
     public static boolean isItTure(String value) {
-        return TRUE.getValue().equals(value) || PARTIALLY_TRUE.getValue().equals(value);
+        return TRUE.getValue().equals(value) || PARTIALLY_TRUE.getValue().equals(value) || QTFT.getValue().equals(value);
     }
 
 }

src/main/java/com/biutag/supervision/pojo/dto/common/BarItem.java

@@ -2,7 +2,6 @@ package com.biutag.supervision.pojo.dto.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.math.BigDecimal;
@@ -14,15 +13,8 @@ import java.math.BigDecimal;
 @Setter
 @Getter
 @AllArgsConstructor
-@NoArgsConstructor
 public class BarItem {
 
     private String label;
     private BigDecimal value;
-    private String detailId;
-
-    public BarItem(String label, BigDecimal value) {
-        this.label = label;
-        this.value = value;
-    }
 }

src/main/resources/mapper/StatisticsGroupMapper.xml

@@ -79,11 +79,9 @@
     <select id="selectNegativeStatisticsByThree" resultType="com.biutag.supervision.pojo.dto.common.BarItem">
         SELECT
             membersName label,
-            `value`,
-            detail_depart.id detailId
+            `value`
         FROM
             negative_group_members m
-                LEFT JOIN sup_depart detail_depart ON detail_depart.id = m.membersCode
                 LEFT JOIN (
                 SELECT
                     three_involve_depart_id,
@@ -104,11 +102,9 @@
     <select id="selectNegativePerNumberStatisticsByThree" resultType="com.biutag.supervision.pojo.dto.common.BarItem">
         SELECT
             membersName label,
-            `value`,
-            detail_depart.id detailId
+            `value`
         FROM
             negative_group_members m
-                LEFT JOIN sup_depart detail_depart ON detail_depart.id = m.membersCode
                 LEFT JOIN (
                 SELECT
                     three_involve_depart_id,
@@ -131,11 +127,9 @@
         SELECT
             membersName label,
             CASE WHEN s.police_size + s.aux_size > 0 THEN
-                     ROUND(total / ( s.police_size + s.aux_size ), 1) ELSE 0 END `value`,
-            detail_depart.id detailId
+                     ROUND(total / ( s.police_size + s.aux_size ), 1) ELSE 0 END `value`
         FROM
             negative_group_members m
-                LEFT JOIN sup_depart detail_depart ON detail_depart.id = m.membersCode
                 LEFT JOIN (
                 SELECT
                     three_involve_depart_id,
@@ -157,12 +151,7 @@
     <select id="selectNegativeStatistics" resultType="com.biutag.supervision.pojo.dto.common.BarItem">
         SELECT
             b.blameName label,
-            count( DISTINCT n.id ) `value`,
-            CASE WHEN COUNT(DISTINCT NULLIF(TRIM(b.blameIdCode), '')) = 1
-                      AND COUNT(DISTINCT p.id) = 1
-                      AND (SELECT COUNT(DISTINCT NULLIF(TRIM(b2.blameIdCode), ''))
-                           FROM negative_blame b2 WHERE b2.blameName = b.blameName) = 1
-                 THEN MIN(p.id_code) END detailId
+            count( DISTINCT n.id ) `value`
         FROM
             negative n
                 JOIN negative_blame b ON n.id = b.negativeId
@@ -170,7 +159,6 @@
                 <foreach collection="personTypeCode" item="data" open="(" close=")" separator=",">
                     #{data}
                 </foreach>
-            LEFT JOIN sup_police p ON p.id_code = b.blameIdCode AND p.del = 0
             LEFT JOIN sup_depart d ON n.handle_three_depart_id = d.id
         WHERE
             n.crtTime BETWEEN #{beginTime} AND #{endTime}