From b68ff244e74fcc2dec95de9eee5381061ccb4d47 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 25 Dec 2023 14:40:02 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E6=B5=81=E7=A8=8B=20=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectnotmet/entity/ProcessProjectNotMet.java | 2 +- .../entity/ProcessProjectNotMetLink.java | 12 +++++++++++- .../service/ProcessProjectNotMetService.java | 10 +++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMet.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMet.java index c28b15ff..5b68f9b4 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMet.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMet.java @@ -25,7 +25,7 @@ public class ProcessProjectNotMet { /** * 主键ID */ - @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键ID") private String id; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java index a6f8b343..c97012ae 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/entity/ProcessProjectNotMetLink.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -25,7 +27,7 @@ public class ProcessProjectNotMetLink { /** * 主键ID */ - @TableId(value = "id", type = IdType.INPUT) + @TableId(value = "id", type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键ID") private String id; @@ -131,12 +133,16 @@ public class ProcessProjectNotMetLink { */ @TableField(value = "expected_time") @ApiModelProperty(value = "预计整改完成日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date expectedTime; /** * 实际整改完成日期 */ @ApiModelProperty(value = "实际整改完成日期") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") private Date realityTime; /** @@ -157,6 +163,8 @@ public class ProcessProjectNotMetLink { * 创建时间 */ @TableField(value = "create_time") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") private Date createTime; @@ -171,6 +179,8 @@ public class ProcessProjectNotMetLink { * 修改时间 */ @TableField(value = "update_time") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "修改时间") private Date updateTime; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java index 95ceba06..a3797262 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java @@ -95,6 +95,9 @@ public class ProcessProjectNotMetService extends ServiceImpl userInfoMap = processInfoVO.getUserInfoMap(); //启动流程 BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); + basicProcessInfoDTO.setProcessName(standardNumber+"-"+standardName+"未符合项跟踪"); basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.PROJECT_NOT_MET)); // 流程定义id basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_NOT_MET.getValue()); // 流程类型 userInfoMap.put(ProcessProjectNotMetCommon.STANDARDS_ENGINEER, CurrentUserUtil.getId()); - userInfoMap.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, processProjectNotMetLinks.get(0).getEngineerId()); + userInfoMap.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, processProjectNotMetLink.getEngineerId()); //userInfoMap.put(ProcessProjectNotMetCommon.MANAGER_LEADER, distinctAllResponsibleUnitLeaderListJoin); //processInfoVO.setUserInfoMap(userInfoMap); processHandleService.startProcess(processInfoVO);