zcloud_gbs
/
zcloud_gbs_safetyDutyList
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5-28 fix

master
tianxinlei 2026-05-28 11:24:31 +08:00
parent 16720d652b
commit 566c120a5e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web-app/src/main/java/com/zcloud/safetyDutyList/command/tasklist/FeedbackAddExe.java
View File

@ -10,6 +10,7 @@ import com.zcloud.safetyDutyList.domain.model.tasklist.TaskListE;
import com.zcloud.safetyDutyList.domain.util.FeedbackCycleUtil; import com.zcloud.safetyDutyList.domain.util.FeedbackCycleUtil;
import com.zcloud.safetyDutyList.dto.clientobject.tasklist.FeedbackCO; import com.zcloud.safetyDutyList.dto.clientobject.tasklist.FeedbackCO;
import com.zcloud.safetyDutyList.dto.tasklist.FeedbackAddCmd; import com.zcloud.safetyDutyList.dto.tasklist.FeedbackAddCmd;
import jodd.util.StringUtil;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -48,7 +49,11 @@ public class FeedbackAddExe {
FeedbackE feedbackE = new FeedbackE(); FeedbackE feedbackE = new FeedbackE();
BeanUtils.copyProperties(cmd, feedbackE); BeanUtils.copyProperties(cmd, feedbackE);
feedbackE.init(); if (!StringUtil.isEmpty(cmd.getFeedbackId())) {
feedbackE.setTaskDetailId(cmd.getTaskDetailId());
} else {
feedbackE.init();
}
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
String periodFlag = FeedbackCycleUtil.generatePeriodFlag(detailE.getFeedbackCycleType(), now); String periodFlag = FeedbackCycleUtil.generatePeriodFlag(detailE.getFeedbackCycleType(), now);
feedbackE.setFeedbackPeriodFlag(periodFlag); feedbackE.setFeedbackPeriodFlag(periodFlag);

3
web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/FeedbackAddCmd.java
View File

@ -29,6 +29,9 @@ public class FeedbackAddCmd implements Serializable {
@NotEmpty(message = "清单明细ID不能为空") @NotEmpty(message = "清单明细ID不能为空")
private String taskDetailId; private String taskDetailId;
@ApiModelProperty(value = "反馈ID", required = true)
private String feedbackId;
@ApiModelProperty(value = "反馈内容", required = true) @ApiModelProperty(value = "反馈内容", required = true)
@NotEmpty(message = "反馈内容不能为空") @NotEmpty(message = "反馈内容不能为空")
private String feedbackContent; private String feedbackContent;