From 566c120a5e27555bcdc4b41a551248e98ababba8 Mon Sep 17 00:00:00 2001
From: tianxinlei <tianxinlei@zcloudchina.com>
Date: Thu, 28 May 2026 11:24:31 +0800
Subject: [PATCH] 5-28 fix

---
 .../safetyDutyList/command/tasklist/FeedbackAddExe.java    | 7 ++++++-
 .../zcloud/safetyDutyList/dto/tasklist/FeedbackAddCmd.java | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java
index 3acaed4..94c1458 100644
--- a/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java
+++ b/web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java
@@ -10,6 +10,7 @@ import com.zcloud.safetyDutyList.domain.model.tasklist.TaskListE;
 import com.zcloud.safetyDutyList.domain.util.FeedbackCycleUtil;
 import com.zcloud.safetyDutyList.dto.clientobject.tasklist.FeedbackCO;
 import com.zcloud.safetyDutyList.dto.tasklist.FeedbackAddCmd;
+import jodd.util.StringUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
@@ -48,7 +49,11 @@ public class FeedbackAddExe {
 
         FeedbackE feedbackE = new FeedbackE();
         BeanUtils.copyProperties(cmd, feedbackE);
-        feedbackE.init();
+        if (!StringUtil.isEmpty(cmd.getFeedbackId())) {
+            feedbackE.setTaskDetailId(cmd.getTaskDetailId());
+        } else {
+            feedbackE.init();
+        }
         LocalDateTime now = LocalDateTime.now();
         String periodFlag = FeedbackCycleUtil.generatePeriodFlag(detailE.getFeedbackCycleType(), now);
         feedbackE.setFeedbackPeriodFlag(periodFlag);
diff --git a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackAddCmd.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackAddCmd.java
index 8f68ab1..6a61514 100644
--- a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackAddCmd.java
+++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackAddCmd.java
@@ -29,6 +29,9 @@ public class FeedbackAddCmd implements Serializable {
     @NotEmpty(message = "清单明细ID不能为空")
     private String taskDetailId;
 
+    @ApiModelProperty(value = "反馈ID", required = true)
+    private String feedbackId;
+
     @ApiModelProperty(value = "反馈内容", required = true)
     @NotEmpty(message = "反馈内容不能为空")
     private String feedbackContent;