大屏接口修复

src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java

@@ -16,6 +16,8 @@ public class XzSecurityQualityInspectionRecordTotalVo {
     private Integer verificationNum;
     @ApiModelProperty("合格（已闭合）")
     private Integer closeNum;
+    @ApiModelProperty("合格（已闭合）（不包含排查记录）")
+    private Integer closeInspectionNum;
     @ApiModelProperty("超期未关闭")
     private Integer overdueNotCloseNum;
 
@@ -37,6 +39,8 @@ public class XzSecurityQualityInspectionRecordTotalVo {
     private Integer verificationNumToday;
     @ApiModelProperty("合格（已闭合）（今日）")
     private Integer closeNumToday;
+    @ApiModelProperty("合格（已闭合）（今日）（不包含排查记录）")
+    private Integer closeInspectionNumToday;
     @ApiModelProperty("超期未关闭（今日）")
     private Integer overdueNotCloseNumToday;
 
@@ -58,6 +62,8 @@ public class XzSecurityQualityInspectionRecordTotalVo {
     private Integer verificationNumYesterday;
     @ApiModelProperty("合格（已闭合）（昨日）")
     private Integer closeNumYesterday;
+    @ApiModelProperty("合格（已闭合）（昨日）（不包含排查记录）")
+    private Integer closeInspectionNumYesterday;
     @ApiModelProperty("超期未关闭（昨日）")
     private Integer overdueNotCloseNumYesterday;
 
@@ -79,6 +85,8 @@ public class XzSecurityQualityInspectionRecordTotalVo {
     private Double verificationNumJzrRate;
     @ApiModelProperty("合格（已闭合）（较昨日%）")
     private Double closeNumJzrRate;
+    @ApiModelProperty("合格（已闭合）（较昨日%）（不包含排查记录）")
+    private Double closeInspectionNumJzrRate;
     @ApiModelProperty("超期未关闭（较昨日%）")
     private Double overdueNotCloseNumJzrRate;
 

src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml

@@ -155,6 +155,7 @@
         SELECT count(1) totalNum,
         IFNULL(SUM((CASE WHEN t.record_type = 2 THEN 1 ELSE 0 END)), 0) investigateNum,
         IFNULL(SUM((CASE WHEN t.status = 5 THEN 1 ELSE 0 END)), 0) closeNum,
+        IFNULL(SUM((CASE WHEN t.status = 5 and t.record_type=1 THEN 1 ELSE 0 END)), 0) closeInspectionNum,
         IFNULL(SUM((CASE
         WHEN t.status = 1 OR t.status = 2 OR t.status = 3 OR t.status = 4 THEN 1
         ELSE 0 END)), 0) notCloseNum,

src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java

@@ -251,6 +251,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
         vo.setReviewNumYesterday(yesterday.getReviewNum());
         vo.setVerificationNumYesterday(yesterday.getVerificationNum());
         vo.setCloseNumYesterday(yesterday.getCloseNum());
+        vo.setCloseInspectionNumYesterday(yesterday.getCloseInspectionNum());
         vo.setOverdueNotCloseNumYesterday(yesterday.getOverdueNotCloseNum());
         vo.setGreatFaultLevelNumYesterday(yesterday.getGreatFaultLevelNum());
         vo.setLargerRiskNumYesterday(yesterday.getLargerRiskNum());
@@ -265,6 +266,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
         vo.setReviewNumJzrRate(NumberUtils.rate(today.getReviewNum() + 0D, vo.getLowRiskNumYesterday() + 0D, 2));
         vo.setVerificationNumJzrRate(NumberUtils.rate(today.getVerificationNum() + 0D, vo.getVerificationNumYesterday() + 0D, 2));
         vo.setCloseNumJzrRate(NumberUtils.rate(today.getCloseNum() + 0D, vo.getCloseNumYesterday() + 0D, 2));
+        vo.setCloseInspectionNumJzrRate(NumberUtils.rate(today.getCloseInspectionNum() + 0D, vo.getCloseInspectionNumYesterday() + 0D, 2));
         vo.setOverdueNotCloseNumJzrRate(NumberUtils.rate(today.getOverdueNotCloseNum() + 0D, vo.getOverdueNotCloseNumYesterday() + 0D, 2));
         vo.setGreatFaultLevelNumJzrRate(NumberUtils.rate(today.getGreatFaultLevelNum() + 0D, vo.getGreatFaultLevelNumYesterday() + 0D, 2));
         vo.setLargerRiskNumJzrRate(NumberUtils.rate(today.getLargerRiskNum() + 0D, vo.getLargerRiskNumYesterday() + 0D, 2));
@@ -791,7 +793,9 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
 
     @Override
     public void noticeBigScreen(String type, XzSecurityQualityInspectionRecord qualityInspectionRecord, String time, String format) {
-        List<SystemUser> systemUsers = systemUserService.getSystemUsersBySn(new MapBuilder<String, Object>().put(Cts.SN, qualityInspectionRecord.getProjectSn()).put(Cts.QUERY_TYPE, Cts.PROJECT_LEVEL).build());
+        List<SystemUser> systemUsers = systemUserService.getSystemUsersBySn(new MapBuilder<String, Object>()
+                .put(Cts.SN, qualityInspectionRecord.getProjectSn())
+                .put(Cts.QUERY_TYPE, Cts.PROJECT_LEVEL).build());
         for (SystemUser systemUser : systemUsers) {
             Notice notice = new Notice();
             notice.setType(type);
@@ -800,8 +804,12 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
             notice.setTitle("大屏通知");
             notice.setSendTime(DateUtil.now());
             Integer level = qualityInspectionRecord.getLevel();
-            notice.setPayload(JSON.toJSONString(new MapBuilder<String, Object>().put("time", time)
+            notice.setPayload(JSON.toJSONString(
-                    .put("level", level).build()));
+                    new MapBuilder<String, Object>()
+                            .put("time", time)
+                            .put("level", level)
+                            .put("status", qualityInspectionRecord.getStatus())
+                            .build()));
             noticeService.addNotice(notice, false);
         }
     }