From fc76209507ccc9c9190b58ca47a9b2d1df7c3b75 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 13:55:23 +0800
Subject: [PATCH] 修改自定义更新

---
 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml                |    6 +++---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanDate.java                     |    5 ++++-
 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java |    1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanDate.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanDate.java
index 5908bd2..8ea0b85 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanDate.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanDate.java
@@ -1,5 +1,7 @@
 package com.aps.core.domain;
 
+import com.aps.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serial;
@@ -13,7 +15,7 @@
  * &#064;date  2025-05-08
  */
 @Data
-public class ApsPlateOrderPlanDate
+public class ApsPlateOrderPlanDate extends BaseEntity
 {
     @Serial
     private static final long serialVersionUID = 1L;
@@ -27,5 +29,6 @@
     private List<Long> planIds;
 
     /** 鑷畾涔夋棩鏈� */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Timestamp customDate;
 }
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
index fde2037..48c0241 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateOrderPlanManagerServiceImpl.java
@@ -59,6 +59,7 @@
     @Override
     public void updatePlanDate(ApsPlateOrderPlanDate apsPlateOrderPlanDate) {
         if (apsPlateOrderPlanDate.getIsCustom()) {
+            apsPlateOrderPlanDate.setUpdateBy(SecurityUtils.getUsername());
             apsPlateOrderPlanManagerMapper.updatePlanDateByCustom(apsPlateOrderPlanDate);
         } else {
             List<ApsPlateOrderPlanRequireDate> planRequireDates = apsPlateOrderPlanManagerMapper.selectPlanRequireIds(apsPlateOrderPlanDate.getPlanIds());
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
index be61a98..c491c83 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanOrderManagerMapper.xml
@@ -159,11 +159,11 @@
 
     <update id="updatePlanDateByCustom" parameterType="ApsPlateOrderPlanDate">
         update aps_plate_plan set
-          custom_time = #{planRequireDate.customDate},
-          update_by = #{planRequireDate.updateBy},
+          custom_time = #{customDate},
+          update_by = #{updateBy},
           update_time = now()
         where id in
-        <foreach collection="planRequireDate.planIds" item="id" open="(" separator="," close=")">
+        <foreach collection="planIds" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </update>

--
Gitblit v1.9.3