From 4d2954f3a113c12b9abe92639b90fc69d5b1aaf2 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Fri, 5 Jul 2024 09:11:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=B4=A8=E9=87=8F=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/vo/StatsDirectorateBigscreenVo.java         |  4 +++-
 .../XzSecurityQualityInspectionRecordServiceImpl.java  | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsDirectorateBigscreenVo.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsDirectorateBigscreenVo.java
index b144fda40..195e1ee14 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsDirectorateBigscreenVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/entity/vo/StatsDirectorateBigscreenVo.java
@@ -1,6 +1,5 @@
 package com.zhgd.xmgl.modules.xz.security.entity.vo;
 
-import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -18,6 +17,9 @@ public class StatsDirectorateBigscreenVo {
     @ApiModelProperty("风险统计数量（安全隐患数量）")
     private Integer securityQualityInspectionRecordNum;
 
+    @ApiModelProperty("风险统计数量（质量隐患数量）")
+    private Integer qualityInspectionRecordNum;
+
     @ApiModelProperty("AI报警数量")
     private Integer aiAnalyseHardWareAlarmRecordNum;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java
index faecbf9fc..d7a539389 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java
@@ -28,7 +28,9 @@ import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
 import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl;
 import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringRecord;
 import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringRecordMapper;
+import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord;
 import com.zhgd.xmgl.modules.quality.entity.QualityRegion;
+import com.zhgd.xmgl.modules.quality.mapper.QualityInspectionRecordMapper;
 import com.zhgd.xmgl.modules.quality.mapper.QualityRegionMapper;
 import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord;
 import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper;
@@ -117,6 +119,8 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl<Xz
     @Autowired
     private XzSecurityQualityInspectionRecordMapper xzSecurityQualityInspectionRecordMapper;
     @Autowired
+    private QualityInspectionRecordMapper qualityInspectionRecordMapper;
+    @Autowired
     private XzSecurityQualityRectifyRecordMapper xzSecurityQualityRectifyRecordMapper;
     @Autowired
     private INoticeService noticeService;
@@ -697,6 +701,12 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl<Xz
                 .eq(XzSecurityQualityInspectionRecord::getProjectSn, projectSn)
         );
         vo.setSecurityQualityInspectionRecordNum(rc);
+        Integer rc1 = qualityInspectionRecordMapper.selectCount(new LambdaQueryWrapper<QualityInspectionRecord>()
+                .ne(QualityInspectionRecord::getStatus, 6)
+                .ne(QualityInspectionRecord::getRecordType, 2)
+                .eq(QualityInspectionRecord::getProjectSn, projectSn)
+        );
+        vo.setQualityInspectionRecordNum(rc1);
         Integer ac = aiAnalyseHardWareAlarmRecordMapper.selectCount(new LambdaQueryWrapper<AiAnalyseHardWareAlarmRecord>()
                 .eq(AiAnalyseHardWareAlarmRecord::getProjectSn, projectSn)
                 .eq(AiAnalyseHardWareAlarmRecord::getIsPushed, 1)