Merge remote-tracking branch 'origin/main'

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeIssue.java

@@ -63,9 +63,9 @@ public class LargeIssue extends CustomBaseEntity {
     private String projectName;
 
     /**
-     * 问题状态（0代表已解决  2代表待解决）
+     * 问题状态（0代表未解决  1代表已解决）
      */
-    @Excel(name = "问题状态", readConverterExp = "0=代表已解决,2=代表待解决")
+    @Excel(name = "问题状态", readConverterExp = "0=代表未解决,1=代表已解决")
     private String status;
 
 }

project-zcustom/src/main/resources/mapper/zcustom/unit/LargeIssueMapper.xml

@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getIssueNum" parameterType="String" resultType="int">
         SELECT
-            COUNT(*)
+            COUNT(a.id)
         FROM
             large_plat_issue a
                 LEFT JOIN large_plat_project b ON a.project_id = b.id
@@ -114,17 +114,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getOverIssueNum" parameterType="String" resultType="int">
         SELECT
-            COUNT(*)
+            COUNT(a.id)
         FROM
             large_plat_issue a
                 LEFT JOIN large_plat_project b ON a.project_id = b.id
                 LEFT JOIN large_plat_app_org c ON b.app_org = c.app_org
         WHERE
-            a.del_flag = 0
+            a.del_flag = 0 and a.status = 1
           AND b.del_flag = 0
           AND c.del_flag = '0'
         <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
-          AND a.`status` = '0'
     </select>
 
     <select id="getIssueListLastWeek" parameterType="String" resultMap="LargeIssueResult">
@@ -144,6 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             DATE( a.create_time ) BETWEEN DATE( CURDATE() - 7 )
             AND CURDATE()
             )
+        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
         order by a.create_time desc
     </select>
 </mapper>

project-zcustom/src/main/resources/mapper/zcustom/unit/LargeProjectMapper.xml

@@ -144,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getCameraNumList" parameterType="String" resultMap="LargeProjectResult">
         SELECT
+            a.id,
             a.project_name,
             COUNT(
                     IF
@@ -157,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getProjectNumThisWeek" parameterType="String" resultType="int">
         SELECT
-            COUNT(*)
+            COUNT(a.id)
         FROM
             large_plat_plan a
                 LEFT JOIN large_plat_project b ON a.project_id = b.id