From f597b0677482accf51dfb5b772e6454254756a12 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Mon, 26 Jan 2026 10:30:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(report):=20=E4=BF=AE=E5=A4=8D=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E6=BA=90=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改Board5Mapper.xml中的应检设备计算方式，从DMS_PLAN_INSPECT表改为从工单表统计
- 调整已检设备统计逻辑，统一使用工单实例表数据源
- 移除DMS_BILLS_INSPECT_INSTANCE_ACTIVITY表查询中的冗余别名关键字
- 在DMS_BILLS_INSPECT_INSTANCE表映射中添加planInspectCode字段映射
---
 .../mapper/dms/DmsBillsInspectInstanceActivityMapper.xml  | 4 ++--
 .../mapper/dms/DmsBillsInspectInstanceMapper.xml          | 1 +
 .../src/main/resources/mapper/report/Board5Mapper.xml     | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml
index ed616ad..5104ac9 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml
@@ -34,8 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDmsBillsInspectInstanceActivityList" parameterType="DmsBillsInspectInstanceActivity" resultMap="DmsBillsInspectInstanceActivityResult">
         select a.instance_activity_id, a.inspect_instance_id, a.process_activity_id,
         a.inspect_route_id,b.route_name, a.device_amount, a.performer, a.process_handle_resolution, a.remark, a.process_handle_status, a.process_step_order, a.start_time, a.end_time, a.handle_user_id, a.handle_by, a.handle_time, a.create_by, a.create_time, a.transfer_user_id, a.attr1
-        from dms_bills_inspect_instance_activity as a
-        left join dms_base_inspect_route as b on a.inspect_route_id = b.inspect_route_id
+        from dms_bills_inspect_instance_activity a
+        left join dms_base_inspect_route b on a.inspect_route_id = b.inspect_route_id
         <where>
             <if test="inspectInstanceId != null "> and inspect_instance_id = #{inspectInstanceId}</if>
             <if test="processActivityId != null "> and process_activity_id = #{processActivityId}</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
index ca7145d..e68eda7 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="inspectRouteId"    column="inspect_route_id"    />
         <result property="routeName"    column="route_name"    />
+        <result property="planInspectCode"    column="plan_inspect_code"    />
     </resultMap>
 
     <sql id="selectDmsBillsInspectInstanceVo">
diff --git a/aucma-report/src/main/resources/mapper/report/Board5Mapper.xml b/aucma-report/src/main/resources/mapper/report/Board5Mapper.xml
index 527deac..4aca05a 100644
--- a/aucma-report/src/main/resources/mapper/report/Board5Mapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/Board5Mapper.xml
@@ -55,11 +55,11 @@
     </select>
 
     <!-- 查询巡检执行情况统计（全量历史） -->
-    <!-- 应检设备 = DMS_PLAN_INSPECT.DEVICE_AMOUNT 求和 -->
-    <!-- 已检设备 = DMS_BILLS_INSPECT_INSTANCE 中 INSPECT_STATUS='3'(已完成) 的设备数量 -->
-    <!-- 数据来源：DMS_PLAN_INSPECT, DMS_BILLS_INSPECT_INSTANCE -->
+    <!-- 应检设备 = 从工单表统计：不同计划ID数 × 18（每计划18台设备） -->
+    <!-- 已检设备 = DMS_BILLS_INSPECT_INSTANCE 中 INSPECT_STATUS='3'(已完成) 的工单数量 -->
+    <!-- 数据来源：DMS_BILLS_INSPECT_INSTANCE -->
     <select id="selectInspectStatistics" resultType="java.util.HashMap">
-        SELECT (SELECT NVL(SUM(DEVICE_AMOUNT), 0) FROM DMS_PLAN_INSPECT WHERE IS_FLAG = '1') AS DEVICE_COUNT,
+        SELECT (SELECT COUNT(DISTINCT PLAN_INSPECT_ID) * 18 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>