From 0c2428045aae29aedad833702f720d48eb971ec0 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Thu, 26 Feb 2026 14:01:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(mapper):=20=E6=B7=BB=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=B3=A8=E8=A7=A3=E5=B9=B6=E4=BC=98=E5=8C=96=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为 BaseOrderInfoMapper 的方法添加 @Param 注解以支持 MyBatis 参数映射
- 在工单查询条件中使用 nvl 函数处理执行状态空值情况
- 在停机记录查询中新增按停机原因ID过滤的功能
---
 .../aucma/base/mapper/BaseOrderInfoMapper.java    | 15 ++++++++++++---
 .../resources/mapper/base/BaseOrderInfoMapper.xml |  2 +-
 .../mapper/dms/DmsRecordShutDownMapper.xml        |  1 +
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/aucma-base/src/main/java/com/aucma/base/mapper/BaseOrderInfoMapper.java b/aucma-base/src/main/java/com/aucma/base/mapper/BaseOrderInfoMapper.java
index 91bdb50..445e2d5 100644
--- a/aucma-base/src/main/java/com/aucma/base/mapper/BaseOrderInfoMapper.java
+++ b/aucma-base/src/main/java/com/aucma/base/mapper/BaseOrderInfoMapper.java
@@ -3,6 +3,7 @@ package com.aucma.base.mapper;
 import java.util.List;
 
 import com.aucma.base.domain.BaseOrderInfo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 工单信息Mapper接口
@@ -75,7 +76,9 @@ public interface BaseOrderInfoMapper {
      * @param startTime 开始时间
      * @return 结果
      */
-    public int batchStartProduction(Long[] objIds, String operator, java.util.Date startTime);
+    public int batchStartProduction(@Param("objIds") Long[] objIds,
+                                    @Param("operator") String operator,
+                                    @Param("startTime") java.util.Date startTime);
 
     /**
      * 批量更新完工数量
@@ -86,7 +89,10 @@ public interface BaseOrderInfoMapper {
      * @param updateTime 更新时间
      * @return 结果
      */
-    public int batchUpdateQuantity(Long[] objIds, Long completeQty, Long defectQty, java.util.Date updateTime);
+    public int batchUpdateQuantity(@Param("objIds") Long[] objIds,
+                                   @Param("completeQty") Long completeQty,
+                                   @Param("defectQty") Long defectQty,
+                                   @Param("updateTime") java.util.Date updateTime);
 
     /**
      * 批量更新工单为已完工状态
@@ -97,5 +103,8 @@ public interface BaseOrderInfoMapper {
      * @param finishTime 完工时间
      * @return 结果
      */
-    public int batchCompleteProduction(Long[] objIds, Long completeQty, Long defectQty, java.util.Date finishTime);
+    public int batchCompleteProduction(@Param("objIds") Long[] objIds,
+                                       @Param("completeQty") Long completeQty,
+                                       @Param("defectQty") Long defectQty,
+                                       @Param("finishTime") java.util.Date finishTime);
 }
diff --git a/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml
index 3aef39c..e17b0eb 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseOrderInfoMapper.xml
@@ -93,7 +93,7 @@
             <if test="orderStatus != null  and orderStatus != '' and orderStatus != 'RELCRTD'">and oi.order_status LIKE #{orderStatus} || '%'</if>
             <if test="orderStatus != null  and orderStatus != '' and orderStatus == 'RELCRTD'">and (oi.order_status LIKE 'REL%' OR oi.order_status LIKE 'CRTD%')</if>
             <if test="manualUpdateFlag != null  and manualUpdateFlag != ''">and oi.manual_update_flag = #{manualUpdateFlag}</if>
-            <if test="executionStatus != null and executionStatus != ''">and oi.execution_status = #{executionStatus}</if>
+            <if test="executionStatus != null and executionStatus != ''">and nvl(oi.execution_status, 'PENDING') = #{executionStatus}</if>
             <if test="beginDate != null ">and oi.begin_date = #{beginDate}</if>
             <if test="endDate != null ">and oi.end_date = #{endDate}</if>
             <if test="beginTime != null and endTime != null">
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml
index 11daa79..7d5fce9 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml
@@ -53,6 +53,7 @@
         <where>
             <if test="shutType != null ">and r.shut_type_id = #{shutType}</if>
             <if test="shutReason != null  and shutReason != ''">and r.shut_reason = #{shutReason}</if>
+            <if test="shutReasonId != null">and r.shut_reason_id = #{shutReasonId}</if>
             <if test="beginTime != null and endTime != null">
                 and r.shut_begin_time between #{beginTime} and #{endTime}
             </if>