工作情况统计表 隐患数量统计逻辑调整

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/util/SecurityWorkExport.java

@@ -129,7 +129,7 @@ public class SecurityWorkExport {
     private Integer foundDangerNumber;
     @ExcelProperty(value = {"总行（联社）安全检查 ", "已整改隐患数"}, index = 54)
     private Integer rectificationDangerNumber;
-    @ExcelProperty(value = {"总行（联社）安全检查 ", "未整改隐患数"}, index = 55)
+    @ExcelProperty(value = {"总行（联社）安全检查 ", "未整改隐患数(包含逾期整改、未整改隐患)"}, index = 55)
     private Integer noRectificationDangerNumber;
     @ExcelProperty(value = {"营业网点安全检查", "本季度辖内所有营业网点组织开展自查次数（每个网点检查数量的累计数）"}, index = 56)
     private Integer quarterSelfInspectNumber;

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -1270,12 +1270,12 @@ and a.org_path LIKE concat(#{orgPath}, '%')
     </select>
     <select id="getDangerNumber" resultType="java.util.Map">
         SELECT
-            IFNULL( SUM( IF ( confirm_status >= 2 AND reform_status IN ( 10, 11 ), 1, 0 )), 0 ) AS foundDangerNumber,
+            IFNULL( SUM( IF ( confirm_status >= 2 AND reform_status IN ( 10, 11,12,13 ), 1, 0 )), 0 ) AS foundDangerNumber,
             IFNULL( SUM( IF ( reform_status = 11, 1, 0 )), 0 ) AS rectificationDangerNumber,
             IFNULL(
                         SUM(
                                 IF
-                                    ( confirm_status >= 2 AND reform_status IN ( 10, 11 ), 1, 0 ))- SUM(
+                                    ( confirm_status >= 2 AND reform_status IN ( 10,11,12,13 ), 1, 0 ))- SUM(
                                 IF
                                     ( reform_status = 11, 1, 0 )),
                         0