From cdcefab554b5532f667bba61c7e3c89acb63ec3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Tue, 26 Mar 2024 00:50:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProblemmodifyController.java   |  3 +-
 .../trouble/SmzSspProblemmodifyMapper.xml     | 51 ++++++++++---------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
index ac052ec5..bef7f7ee 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
@@ -92,8 +92,7 @@ public class ProblemmodifyController extends BaseController {
 
     /**
      * 质量整改-安全分类汇总(按项目)
-     * @param deptId
-     * @param roleType
+     * @param where 查询条件
      * @return
      */
     @PostMapping("/safetySummaryByProject")
diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index 1f7f6d2b..b0da6f96 100644
--- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -425,31 +425,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectSummary" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
-        SELECT a.dict_value id,a.dict_label problemArea,b.cnt roleType  FROM (SELECT * FROM sys_dict_data
-        <where>
-            <if test="infoType==0">and dict_type='ssp_aqyhlx'</if>
-            <if test="infoType>0">and dict_type='ssp_zlyhlx'</if>
-
-        </where>
-        ) a
-        LEFT JOIN ( SELECT danger_type,COUNT(1) cnt FROM smz_ssp_problemmodify WHERE projectId IN(
-            SELECT id FROM sur_project
-            where isDel=0
-                <if test="projectId>0">and projectId=#{projectId}</if>
-                <if test="deptId >0 ">AND deptid = #{deptId}</if>
-            <if test="prjIds !=null and prjIds.size()>0">
-                and projectId in
-                <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-        ) AND infotype=#{infoType} and isDel=0
-        <if test="roleType > 0">AND roletype=#{roleType}</if>
-        <if test="startDate!=null">and DATE(createtime)>=DATE(#{startDate})</if>
-        <if test="endDate!=null">and DATE(createtime) &lt;= DATE(#{endDate})</if>
-        GROUP BY danger_type) b
-        ON a.dict_value=b.danger_type ORDER BY cnt DESC,a.dict_value+0
+        SELECT
+        sp.danger_type as id,
+        sd.dict_label as problemArea,
+        COUNT(1) as roleType
+        FROM
+        smz_ssp_problemmodify sp
+        left join sys_dict_data sd on sd.dict_value=sp.danger_type
+        <if test="infoType==0">and sd.dict_type = 'ssp_aqyhlx'</if>
+        <if test="infoType==1">and sd.dict_type = 'ssp_zlyhlx'</if>
+        WHERE sp.isDel = 0
+        AND sp.infotype = #{infoType}
+        <if test="roleType > 0">AND sp.roletype=#{roleType}</if>
+        <if test="startDate!=null">and DATE(sp.createtime) &gt;= DATE(#{startDate})</if>
+        <if test="endDate!=null">and DATE(sp.createtime) &lt;= DATE(#{endDate})</if>
+        <if test="projectId>0">and sp.projectId=#{projectId}</if>
+        <if test="deptId >0 ">AND sp.deptid = #{deptId}</if>
+        <if test="prjIds !=null and prjIds.size()>0">
+            and sp.projectId in
+            <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        GROUP BY
+        sp.danger_type
+        ORDER BY
+        roleType desc
     </select>
+
     <select id="selectSummaryByProject" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
         select a.projectId,a.prjName projectName,a.proble id,if(b.timoutNoComp is null,0,b.timoutNoComp) infoType,
                if(c.timoutComp is null,0,c.timoutComp) checkState,