From 34f7f2bb597f2053e8998a882a9c6a8f7dc3c97e Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Fri, 6 Feb 2026 09:28:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(base):=20=E6=B7=BB=E5=8A=A0=E8=B4=A8?=
 =?UTF-8?q?=E6=A3=80=E9=A1=B9=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在BaseQualityInspectionItemController中新增selectBaseQualityInspectionItemList方法
- 添加权限验证注解@PreAuthorize控制访问权限
- 更新巡检执行情况统计数据源，从DMS_PLAN_INSPECT表改为DMS_BILLS_INSPECT_INSTANCE表
- 简化selectInspectStatistics查询逻辑，移除复杂的子查询结构
- 调整应检设备计算方式，直接统计DMS_BILLS_INSPECT_INSTANCE表中的记录数
---
 .../BaseQualityInspectionItemController.java        | 11 +++++++++++
 .../impl/DmsBaseInspectProjectServiceImpl.java      | 12 ++----------
 .../main/resources/mapper/report/Board5Mapper.xml   | 13 +++----------
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/aucma-base/src/main/java/com/aucma/base/controller/BaseQualityInspectionItemController.java b/aucma-base/src/main/java/com/aucma/base/controller/BaseQualityInspectionItemController.java
index 670e58b..cd41e3a 100644
--- a/aucma-base/src/main/java/com/aucma/base/controller/BaseQualityInspectionItemController.java
+++ b/aucma-base/src/main/java/com/aucma/base/controller/BaseQualityInspectionItemController.java
@@ -129,4 +129,15 @@ public class BaseQualityInspectionItemController extends BaseController {
     public AjaxResult getQualityDefects(@PathVariable("stationCode" ) String stationCode) {
         return success(baseQualityInspectionItemService.getQualityDefects(stationCode));
     }
+
+    /**
+     * 查询质检项信息维护列表
+     */
+    @PreAuthorize("@ss.hasPermi('base:qualityInspectionItem:list')" )
+    @GetMapping("/selectBaseQualityInspectionItemList" )
+    public AjaxResult selectBaseQualityInspectionItemList(BaseQualityInspectionItem baseQualityInspectionItem) {
+        List<BaseQualityInspectionItem> list = baseQualityInspectionItemService.selectBaseQualityInspectionItemList(baseQualityInspectionItem);
+        return success(list);
+    }
+
 }
diff --git a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectProjectServiceImpl.java b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectProjectServiceImpl.java
index 880e5b5..f8930d4 100644
--- a/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectProjectServiceImpl.java
+++ b/aucma-dms/src/main/java/com/aucma/dms/service/impl/DmsBaseInspectProjectServiceImpl.java
@@ -1,13 +1,5 @@
 package com.aucma.dms.service.impl;
 
-//import com.hw.common.core.exception.ServiceException;
-//import com.hw.common.core.utils.DateUtils;
-//import com.hw.common.security.utils.SecurityUtils;
-//import com.aucma.dms.domain.DmsBaseInspectProject;
-//import com.aucma.dms.mapper.DmsBaseInspectProjectMapper;
-//import com.aucma.dms.service.IDmsBaseInspectProjectService;
-//import com.hw.system.api.model.LoginUser;
-
 import com.aucma.common.core.domain.model.LoginUser;
 import com.aucma.common.exception.ServiceException;
 import com.aucma.common.utils.DateUtils;
@@ -69,7 +61,7 @@ public class DmsBaseInspectProjectServiceImpl implements IDmsBaseInspectProjectS
         InspectProject.setInspectProjectCode(dmsBaseInspectProject.getInspectProjectCode());
         List<DmsBaseInspectProject> DmsBaseInspectProjectList = dmsBaseInspectProjectMapper
                 .selectDmsBaseInspectProjectList(InspectProject);
-        if (DmsBaseInspectProjectList.size()>0){
+        if (!DmsBaseInspectProjectList.isEmpty()){
             throw new ServiceException("巡检项目编号已存在");
         }
         if (dmsBaseInspectProject.getInspectType()==null){
@@ -95,7 +87,7 @@ public class DmsBaseInspectProjectServiceImpl implements IDmsBaseInspectProjectS
         InspectProject.setInspectProjectCode(dmsBaseInspectProject.getInspectProjectCode());
         List<DmsBaseInspectProject> DmsBaseInspectProjectList = dmsBaseInspectProjectMapper
                 .selectDmsBaseInspectProjectList(InspectProject);
-        if (DmsBaseInspectProjectList.size()>0 && !DmsBaseInspectProjectList.get(0).getInspectProjectId()
+        if (!DmsBaseInspectProjectList.isEmpty() && !DmsBaseInspectProjectList.get(0).getInspectProjectId()
                 .equals(dmsBaseInspectProject.getInspectProjectId())){
             throw new ServiceException("巡检项目编号已存在");
         }
diff --git a/aucma-report/src/main/resources/mapper/report/Board5Mapper.xml b/aucma-report/src/main/resources/mapper/report/Board5Mapper.xml
index f973dc2..48be8bb 100644
--- a/aucma-report/src/main/resources/mapper/report/Board5Mapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/Board5Mapper.xml
@@ -55,18 +55,11 @@
     </select>
 
     <!-- 查询巡检执行情况统计（全量历史） -->
-    <!-- 应检设备 = 关联 DMS_PLAN_INSPECT 表，汇总 DEVICE_AMOUNT（设备总数） -->
+    <!-- 应检设备 = DMS_BILLS_INSPECT_INSTANCE 全量（历史累计） -->
     <!-- 已检设备 = DMS_BILLS_INSPECT_INSTANCE 中 INSPECT_STATUS='3'(已完成) 的工单数量 -->
-    <!-- 数据来源：DMS_BILLS_INSPECT_INSTANCE + DMS_PLAN_INSPECT -->
+    <!-- 数据来源：DMS_BILLS_INSPECT_INSTANCE -->
     <select id="selectInspectStatistics" resultType="java.util.HashMap">
-        SELECT (SELECT NVL(SUM(p.DEVICE_AMOUNT), 0)
-                FROM DMS_PLAN_INSPECT p
-                WHERE p.PLAN_INSPECT_ID IN (
-                    SELECT DISTINCT PLAN_INSPECT_ID
-                    FROM DMS_BILLS_INSPECT_INSTANCE
-                    WHERE IS_FLAG = '1'
-                )
-               ) AS DEVICE_COUNT,
+        SELECT (SELECT COUNT(*) FROM DMS_BILLS_INSPECT_INSTANCE WHERE IS_FLAG = '1') AS DEVICE_COUNT,
                (SELECT COUNT(*) FROM DMS_BILLS_INSPECT_INSTANCE WHERE IS_FLAG = '1' AND INSPECT_STATUS = '3') AS COMPLETE_COUNT
         FROM DUAL
     </select>