From cf11dcaec2bed83986be3478f50148e0e98e8ddf Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 10 Nov 2025 18:19:00 +0800
Subject: [PATCH] demand: committer: heyu

---
 .../emis/mapper/EmisSettleInvoiceRecordMapper.java   |  7 +++++--
 .../impl/EmisSettleInvoiceRecordServiceImpl.java     |  7 +++++--
 .../mapper/EmisSettleInvoiceRecordMapper.xml         | 12 ++++++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRecordMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRecordMapper.java
index 79e0b81ab..0d627ce14 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRecordMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceRecordMapper.java
@@ -125,16 +125,19 @@ public interface EmisSettleInvoiceRecordMapper extends BaseMapper<EmisSettleInvo
      * 
      * @param ids 发票记录ID数组
      * @param delayOpManCode 延期操作人
+     * @param updateSite 更新网点
      * @return 结果
      */
-    public int batchDelayInvoice(@Param("ids") Long[] ids, @Param("delayOpManCode") String delayOpManCode);
+    public int batchDelayInvoice(@Param("ids") Long[] ids, @Param("delayOpManCode") String delayOpManCode, @Param("updateSite") String updateSite);
 
     /**
      * 批量取消发票延期
      * 
      * @param ids 发票记录ID数组
+     * @param cancelOpManCode 取消延期操作人
+     * @param updateSite 更新网点
      * @return 结果
      */
-    public int batchCancelDelayInvoice(@Param("ids") Long[] ids);
+    public int batchCancelDelayInvoice(@Param("ids") Long[] ids, @Param("cancelOpManCode") String cancelOpManCode, @Param("updateSite") String updateSite);
 
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
index 2c87d7646..76db31a37 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
@@ -1126,9 +1126,10 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
 
         // 获取当前操作人
         String delayOpManCode = getCurrentUser().getEmpCode();
+        String updateSite = getCurrentUser().getOwnerSiteCode();
 
         // 执行批量延期
-        return emisSettleInvoiceRecordMapper.batchDelayInvoice(ids, delayOpManCode);
+        return emisSettleInvoiceRecordMapper.batchDelayInvoice(ids, delayOpManCode, updateSite);
     }
 
     /**
@@ -1158,7 +1159,9 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
         }
 
         // 执行批量取消延期
-        return emisSettleInvoiceRecordMapper.batchCancelDelayInvoice(ids);
+        String cancelOpManCode = getCurrentUser().getEmpCode();
+        String updateSite = getCurrentUser().getOwnerSiteCode();
+        return emisSettleInvoiceRecordMapper.batchCancelDelayInvoice(ids, cancelOpManCode, updateSite);
     }
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
index e3bf1bacc..5737ab6d3 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
@@ -68,6 +68,8 @@
 
         <association property="delayOpManName"    column="delay_op_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
 
+        <association property="updateByName"    column="update_by" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+
     </resultMap>
 
     <!-- 简化版resultMap -->
@@ -713,7 +715,10 @@
         update emis_settle_invoice_record
         set bl_delay = '1',
             delay_op_man_code = #{delayOpManCode},
-            delay_op_date = now()
+            delay_op_date = now(),
+            update_by = #{delayOpManCode},
+            update_time = now(),
+            update_site = #{updateSite}
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}
@@ -727,7 +732,10 @@
         update emis_settle_invoice_record
         set bl_delay = '0',
             delay_op_man_code = null,
-            delay_op_date = null
+            delay_op_date = null,
+            update_by = #{cancelOpManCode},
+            update_time = now(),
+            update_site = #{updateSite}
         where id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
             #{id}