From 283c2d1c61674cc7293508898aa9dacb7bd10020 Mon Sep 17 00:00:00 2001 From: liao Date: Tue, 28 Nov 2023 15:18:53 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=9D=E5=AD=98=E4=B8=BA=E8=8D=89?= =?UTF-8?q?=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/process/common/entity/ProcessDraft.java | 11 +++++++++++ .../fb/service/impl/ProcessHandleServiceImpl.java | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java index 98c7e51f..fbb09e2e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java @@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; /** * @@ -104,6 +106,15 @@ public class ProcessDraft implements Serializable { @TableField(exist = false) private java.lang.String nodeName; + /**流程信息-截止日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "流程信息-截止日期") + private java.util.Date processDueDate; + /**流程信息-流程说明*/ + @ApiModelProperty(value = "流程信息-流程说明") + private java.lang.String processDescription; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index 0a2a720d..a1828c1d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -288,6 +288,8 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { processDraft.setProcessInstanceId(basicProcessInfoDTO.getProcessInstanceId()); // 流程实例id processDraft.setPrcName(basicProcessInfoDTO.getProcessName()); // 流程名称 processDraft.setPrcType(basicProcessInfoDTO.getProcessType()); // 流程类型 + processDraft.setProcessDueDate(basicProcessInfoDTO.getProcessDueDate()); // 流程信息-截止日期 + processDraft.setProcessDescription(basicProcessInfoDTO.getProcessDescription()); // 流程信息-流程说明 processDraft.setTaskId(basicTaskInfoDTO.getTaskId()); // 任务id processDraft.setHandleText(basicTaskInfoDTO.getHandleText()); // 流程审批信息-备注 processDraft.setHandleFile(basicTaskInfoDTO.getHandleFile()); // 流程审批信息-附件 @@ -372,6 +374,11 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { basicTaskInfoDTO.setHandleText(processDraft.getHandleText()); basicTaskInfoDTO.setHandleFile(processDraft.getHandleFile()); processInfoVO.setBusinessId(processDraft.getProjectId()); + + basicProcessInfoDTO.setProcessType(processDraft.getPrcType()); + basicProcessInfoDTO.setProcessName(processDraft.getPrcName()); + basicProcessInfoDTO.setProcessDescription(processDraft.getProcessDescription()); + basicProcessInfoDTO.setProcessDueDate(processDraft.getProcessDueDate()); } }