From 632f381e027e660b9c8618380f9d3b2548dd1f53 Mon Sep 17 00:00:00 2001
From: guoqibing <guoqibing@sino-assistance.com>
Date: Mon, 11 Aug 2025 18:06:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=9C=80=E6=B1=82=E9=AA=8C?=
 =?UTF-8?q?=E6=94=B6=E4=BA=BA=EF=BC=8C=E9=97=AE=E9=A2=98=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sa/zentao/controller/ZtStoryUserController.java  | 2 +-
 src/main/java/com/sa/zentao/dao/ZtStoryUserDTO.java           | 4 ++++
 src/main/java/com/sa/zentao/entity/ZtStoryUser.java           | 4 ++++
 .../sa/zentao/service/impl/ZtStoryFeedbackServiceImpl.java    | 1 +
 src/main/resources/mapper/ZtStoryUserMapper.xml               | 2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sa/zentao/controller/ZtStoryUserController.java b/src/main/java/com/sa/zentao/controller/ZtStoryUserController.java
index ca179c4..c0c058a 100644
--- a/src/main/java/com/sa/zentao/controller/ZtStoryUserController.java
+++ b/src/main/java/com/sa/zentao/controller/ZtStoryUserController.java
@@ -91,7 +91,7 @@ public class ZtStoryUserController {
             eq.in(ZtStoryUser::getStatus, UserStoryEnums.CFM.getCode(),UserStoryEnums.KFZ.getCode());
         }
         eq.select(ZtStoryUser::getId,ZtStoryUser::getTitle,ZtStoryUser::getProduct,
-                ZtStoryUser::getOpenedby,ZtStoryUser::getAssignedto
+                ZtStoryUser::getOpenedby,ZtStoryUser::getAssignedto,ZtStoryUser::getYsUser
         );
         List<ZtStoryUser> list = storyUserService.list(eq
         );
diff --git a/src/main/java/com/sa/zentao/dao/ZtStoryUserDTO.java b/src/main/java/com/sa/zentao/dao/ZtStoryUserDTO.java
index 3dcd8b1..34c2e79 100644
--- a/src/main/java/com/sa/zentao/dao/ZtStoryUserDTO.java
+++ b/src/main/java/com/sa/zentao/dao/ZtStoryUserDTO.java
@@ -200,6 +200,10 @@ public class ZtStoryUserDTO implements Serializable {
      * 1通过 2不通过
      */
     private Integer ysFlag;
+    /**
+     * 验收人
+     */
+    private String ysUser;
 
 
     private String spec;
diff --git a/src/main/java/com/sa/zentao/entity/ZtStoryUser.java b/src/main/java/com/sa/zentao/entity/ZtStoryUser.java
index 61b24f1..f7ce220 100644
--- a/src/main/java/com/sa/zentao/entity/ZtStoryUser.java
+++ b/src/main/java/com/sa/zentao/entity/ZtStoryUser.java
@@ -208,6 +208,10 @@ public class ZtStoryUser implements Serializable {
      * 1通过 2不通过
      */
     private Integer ysFlag;
+    /**
+     * 验收人
+     */
+    private String ysUser;
     private String ysRemark;
     private String spec;
 
diff --git a/src/main/java/com/sa/zentao/service/impl/ZtStoryFeedbackServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtStoryFeedbackServiceImpl.java
index 54c6601..2d04f5a 100644
--- a/src/main/java/com/sa/zentao/service/impl/ZtStoryFeedbackServiceImpl.java
+++ b/src/main/java/com/sa/zentao/service/impl/ZtStoryFeedbackServiceImpl.java
@@ -510,6 +510,7 @@ public class ZtStoryFeedbackServiceImpl extends ServiceImpl<ZtStoryFeedbackMappe
         if ("wait".equals(status)) {
             ztStoryFeedback.setHandDate(new Date());
             ztStoryFeedback.setStatus("doing");
+            ztStoryFeedback.setYsFlag(0);
             this.baseMapper.updateById(ztStoryFeedback);
             //添加action
             actionService.addAction(ActionType.WTFK, ActionStatus.KSCL, ztStoryFeedback.getId(), ztStoryFeedback.getProduct() + "", null, null,
diff --git a/src/main/resources/mapper/ZtStoryUserMapper.xml b/src/main/resources/mapper/ZtStoryUserMapper.xml
index 1502ce7..659fbea 100644
--- a/src/main/resources/mapper/ZtStoryUserMapper.xml
+++ b/src/main/resources/mapper/ZtStoryUserMapper.xml
@@ -139,7 +139,7 @@
             s.ps_date,
             s.deliver_remark,
             s.old_status,
-
+            s.ys_user,
 
             pt.name productName from zt_story_user s LEFT JOIN zt_product pt on s.product = pt.id WHERE 1=1