update 未符合项跟踪流程 发起流程报错

This commit is contained in:
lijiarao
2023-12-25 14:40:02 +08:00
parent ced76032fd
commit b68ff244e7
3 changed files with 21 additions and 3 deletions
@@ -25,7 +25,7 @@ public class ProcessProjectNotMet {
/** /**
* 主键ID * 主键ID
*/ */
@TableId(value = "id", type = IdType.INPUT) @TableId(value = "id", type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "主键ID")
private String id; private String id;
@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
@@ -25,7 +27,7 @@ public class ProcessProjectNotMetLink {
/** /**
* 主键ID * 主键ID
*/ */
@TableId(value = "id", type = IdType.INPUT) @TableId(value = "id", type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "主键ID")
private String id; private String id;
@@ -131,12 +133,16 @@ public class ProcessProjectNotMetLink {
*/ */
@TableField(value = "expected_time") @TableField(value = "expected_time")
@ApiModelProperty(value = "预计整改完成日期") @ApiModelProperty(value = "预计整改完成日期")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date expectedTime; private Date expectedTime;
/** /**
* 实际整改完成日期 * 实际整改完成日期
*/ */
@ApiModelProperty(value = "实际整改完成日期") @ApiModelProperty(value = "实际整改完成日期")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date realityTime; private Date realityTime;
/** /**
@@ -157,6 +163,8 @@ public class ProcessProjectNotMetLink {
* 创建时间 * 创建时间
*/ */
@TableField(value = "create_time") @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 = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
@@ -171,6 +179,8 @@ public class ProcessProjectNotMetLink {
* 修改时间 * 修改时间
*/ */
@TableField(value = "update_time") @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 = "修改时间") @ApiModelProperty(value = "修改时间")
private Date updateTime; private Date updateTime;
@@ -95,6 +95,9 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
ProcessProjectNotMet processProjectNotMet = businessInfoDTO.getProcessProjectNotMet(); ProcessProjectNotMet processProjectNotMet = businessInfoDTO.getProcessProjectNotMet();
if (processProjectNotMet == null){
processProjectNotMet = new ProcessProjectNotMet();
}
this.save(processProjectNotMet); this.save(processProjectNotMet);
String processProjectNotMetId = processProjectNotMet.getId(); String processProjectNotMetId = processProjectNotMet.getId();
processInfoVO.setBusinessId(processProjectNotMetId); processInfoVO.setBusinessId(processProjectNotMetId);
@@ -106,14 +109,19 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
} }
); );
processProjectNotMetLinkService.saveBatch(processProjectNotMetLinks); processProjectNotMetLinkService.saveBatch(processProjectNotMetLinks);
ProcessProjectNotMetLink processProjectNotMetLink = processProjectNotMetLinks.get(0);
String standardNumber = processProjectNotMetLink.getStandardNumber();
String standardName = processProjectNotMetLink.getStandardName();
//保存标准分发的设计工程师 //保存标准分发的设计工程师
Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap(); Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
//启动流程 //启动流程
BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
basicProcessInfoDTO.setProcessName(standardNumber+"-"+standardName+"未符合项跟踪");
basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.PROJECT_NOT_MET)); // 流程定义id basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.PROJECT_NOT_MET)); // 流程定义id
basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_NOT_MET.getValue()); // 流程类型 basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_NOT_MET.getValue()); // 流程类型
userInfoMap.put(ProcessProjectNotMetCommon.STANDARDS_ENGINEER, CurrentUserUtil.getId()); 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); //userInfoMap.put(ProcessProjectNotMetCommon.MANAGER_LEADER, distinctAllResponsibleUnitLeaderListJoin);
//processInfoVO.setUserInfoMap(userInfoMap); //processInfoVO.setUserInfoMap(userInfoMap);
processHandleService.startProcess(processInfoVO); processHandleService.startProcess(processInfoVO);