From f8cd2742668c74cdc725c712328b3c82aa6ed921 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Thu, 26 Feb 2026 11:08:47 +0800
Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E6=B7=BB=E5=8A=A0=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E5=B7=A5=E5=8D=95=E7=9B=B8=E5=85=B3=E5=BA=8F=E5=88=97?=
 =?UTF-8?q?=E5=92=8C=E6=95=B0=E6=8D=AE=E6=98=A0=E5=B0=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 SEQ_DMS_BILLS_INSPECT_INSTANCE 序列用于巡检工单实例
- 新增 SEQ_DMS_BILLS_INSPECT_ACTIVITY 序列用于巡检工单活动
- 配置巡检工单实例表的数据插入映射关系
- 配置巡检工单活动表的数据插入映射关系
- 更新序列同步脚本以包含新的巡检相关序列
- 授权新序列的访问权限并创建同义词
---
 aucma-dms/DMS_SEQUENCES.sql                   | 45 +++++++++++++++++--
 .../DmsBillsInspectInstanceActivityMapper.xml |  9 +++-
 .../dms/DmsBillsInspectInstanceMapper.xml     |  9 +++-
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/aucma-dms/DMS_SEQUENCES.sql b/aucma-dms/DMS_SEQUENCES.sql
index 0a4ec07..5375522 100644
--- a/aucma-dms/DMS_SEQUENCES.sql
+++ b/aucma-dms/DMS_SEQUENCES.sql
@@ -1,4 +1,4 @@
--- ============================================
+-- ============================================
 -- DMS 模块所有序列定义
 -- 生成时间: 2026-01-23
 -- 说明: 包含 DMS 模块所有 Mapper 中使用的序列
@@ -226,6 +226,39 @@ CREATE SEQUENCE "HAIWEI"."SEQ_FAULT_INSTANCE_ACTIVITY"
   CACHE 20;
 
 -- ----------------------------
+-- ----------------------------
+-- 14. SEQ_DMS_BILLS_INSPECT_INSTANCE (巡检工单)
+-- 表: DMS_BILLS_INSPECT_INSTANCE
+-- ----------------------------
+BEGIN
+   EXECUTE IMMEDIATE 'DROP SEQUENCE "HAIWEI"."SEQ_DMS_BILLS_INSPECT_INSTANCE"';
+EXCEPTION
+   WHEN OTHERS THEN NULL;
+END;
+/
+CREATE SEQUENCE "HAIWEI"."SEQ_DMS_BILLS_INSPECT_INSTANCE"
+  MINVALUE 1
+  MAXVALUE 9999999999999999999999999999
+  START WITH 1
+  INCREMENT BY 1
+  CACHE 20;
+
+-- ----------------------------
+-- 15. SEQ_DMS_BILLS_INSPECT_ACTIVITY (巡检工单活动)
+-- 表: DMS_BILLS_INS_INST_ACT
+-- ----------------------------
+BEGIN
+   EXECUTE IMMEDIATE 'DROP SEQUENCE "HAIWEI"."SEQ_DMS_BILLS_INSPECT_ACTIVITY"';
+EXCEPTION
+   WHEN OTHERS THEN NULL;
+END;
+/
+CREATE SEQUENCE "HAIWEI"."SEQ_DMS_BILLS_INSPECT_ACTIVITY"
+  MINVALUE 1
+  MAXVALUE 9999999999999999999999999999
+  START WITH 1
+  INCREMENT BY 1
+  CACHE 20;
 -- 14. SEQ_DMS_MAINT_INST (保养工单)
 -- 表: DMS_BILLS_MAINT_INSTANCE
 -- ----------------------------
@@ -559,8 +592,12 @@ BEGIN
   -- 13. 故障工单活动
   sync_seq('HAIWEI.SEQ_FAULT_INSTANCE_ACTIVITY',    'HAIWEI.DMS_FAULT_INSTANCE_ACTIVITY',   'INSTANCE_ACTIVITY_ID');
   -- 14. 保养工单
-  sync_seq('HAIWEI.SEQ_DMS_MAINT_INST',             'HAIWEI.DMS_BILLS_MAINT_INSTANCE',      'MAINT_INSTANCE_ID');
-  -- 15. 保养工单明细
+ sync_seq('HAIWEI.SEQ_DMS_MAINT_INST',             'HAIWEI.DMS_BILLS_MAINT_INSTANCE',      'MAINT_INSTANCE_ID');
+  -- 14A. 巡检工单
+  sync_seq('HAIWEI.SEQ_DMS_BILLS_INSPECT_INSTANCE', 'HAIWEI.DMS_BILLS_INSPECT_INSTANCE',     'INSPECT_INSTANCE_ID');
+  -- 14B. 巡检工单活动
+  sync_seq('HAIWEI.SEQ_DMS_BILLS_INSPECT_ACTIVITY', 'HAIWEI.DMS_BILLS_INS_INST_ACT',          'INSTANCE_ACTIVITY_ID');
+   -- 15. 保养工单明细
   sync_seq('HAIWEI.SEQ_DMS_MAINT_DETAIL',           'HAIWEI.DMS_BILLS_MAINT_DETAIL',        'BILLS_MAINT_DETAIL_ID');
   -- 16. 保养明细项目
   sync_seq('HAIWEI.SEQ_DMS_MAINT_DTL_PROJ',         'HAIWEI.DMS_BILLS_MAINT_DETAIL_PROJECT','MAINT_DETAIL_PROJECT_ID');
@@ -603,6 +640,8 @@ BEGIN
   grant_and_synonym('SEQ_DMS_SHUT_TYPE');
   grant_and_synonym('SEQ_DMS_BILLS_FAULT_INSTANCE');
   grant_and_synonym('SEQ_FAULT_INSTANCE_ACTIVITY');
+  grant_and_synonym('SEQ_DMS_BILLS_INSPECT_INSTANCE');
+  grant_and_synonym('SEQ_DMS_BILLS_INSPECT_ACTIVITY');
   grant_and_synonym('SEQ_DMS_MAINT_INST');
   grant_and_synonym('SEQ_DMS_MAINT_DETAIL');
   grant_and_synonym('SEQ_DMS_MAINT_DTL_PROJ');
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml
index 5e128f7..afbc16e 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceActivityMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
@@ -60,9 +60,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where instance_activity_id = #{instanceActivityId}
     </select>
 
-    <insert id="insertDmsBillsInspectInstanceActivity" parameterType="DmsBillsInspectInstanceActivity" useGeneratedKeys="true" keyProperty="instanceActivityId">
+    <insert id="insertDmsBillsInspectInstanceActivity" parameterType="DmsBillsInspectInstanceActivity">
+        <selectKey keyProperty="instanceActivityId" resultType="long" order="BEFORE">
+            SELECT HAIWEI.SEQ_DMS_BILLS_INSPECT_ACTIVITY.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_bills_ins_inst_act
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="instanceActivityId != null">instance_activity_id,</if>
             <if test="inspectInstanceId != null">inspect_instance_id,</if>
             <if test="processActivityId != null">process_activity_id,</if>
             <if test="inspectRouteId != null">inspect_route_id,</if>
@@ -83,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="attr1 != null">attr1,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="instanceActivityId != null">#{instanceActivityId},</if>
             <if test="inspectInstanceId != null">#{inspectInstanceId},</if>
             <if test="processActivityId != null">#{processActivityId},</if>
             <if test="inspectRouteId != null">#{inspectRouteId},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
index e5239f9..d376820 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsInspectInstanceMapper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
@@ -83,9 +83,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where inspect_instance_id = #{inspectInstanceId}
     </select>
 
-    <insert id="insertDmsBillsInspectInstance" parameterType="DmsBillsInspectInstance" useGeneratedKeys="true" keyProperty="inspectInstanceId">
+    <insert id="insertDmsBillsInspectInstance" parameterType="DmsBillsInspectInstance">
+        <selectKey keyProperty="inspectInstanceId" resultType="long" order="BEFORE">
+            SELECT HAIWEI.SEQ_DMS_BILLS_INSPECT_INSTANCE.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_bills_inspect_instance
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="inspectInstanceId != null">inspect_instance_id,</if>
             <if test="planInspectId != null">plan_inspect_id,</if>
             <!-- 已废弃审批流 -->
             <!-- <if test="wfProcessId != null">wf_process_id,</if> -->
@@ -105,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="inspectInstanceId != null">#{inspectInstanceId},</if>
             <if test="planInspectId != null">#{planInspectId},</if>
             <!-- 已废弃审批流 -->
             <!-- <if test="wfProcessId != null">#{wfProcessId},</if> -->