WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务清单 - 增加待办任务节点定义key

Browse Source
This commit is contained in:
wangzhijiang
2022-05-09 16:25:50 +08:00
parent 50d0b18057
commit c53310b294
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
+11
View File
@@ -148,6 +148,10 @@ public class ProjectTaskInventoryEO implements Serializable {
@TableField(exist = false)
private String designTaskStatus;
/**设计符合性 节点定义key**/
@TableField(exist = false)
private String designTaskDefinitionKey;
/**设计符合性 截止时间**/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@@ -163,6 +167,10 @@ public class ProjectTaskInventoryEO implements Serializable {
@TableField(exist = false)
private String verifyTaskStatus;
/**验证符合性 待办任务节点定义key**/
@TableField(exist = false)
private String verifyTaskDefinitionKey;
/**验证符合性 截止时间**/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@@ -178,6 +186,9 @@ public class ProjectTaskInventoryEO implements Serializable {
/**prehomo确认 待办状态 0待办 1已办**/
@TableField(exist = false)
private String prehomoTaskStatus;
/**prehomo确认 任务节点定义key**/
@TableField(exist = false)
private String prehomoTaskDefinitionKey;
/**prehomo确认 截止时间**/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+6
View File
@@ -369,6 +369,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
projectTaskInventoryEO.setDesignPId(designPid);
projectTaskInventoryEO.setDesignTaskId(designTaskId);
projectTaskInventoryEO.setDesignTaskStatus(designTaskStatus);
projectTaskInventoryEO.setDesignTaskDefinitionKey(designTaskDefinitionKey);
}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){
prehomoPid = actiProcInstId;
if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
@@ -390,6 +391,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
projectTaskInventoryEO.setPrehomoPId(prehomoPid);
projectTaskInventoryEO.setPrehomoTaskId(prehomoTaskId);
projectTaskInventoryEO.setPrehomoTaskStatus(prehomoTaskStatus);
projectTaskInventoryEO.setPrehomoTaskDefinitionKey(prehomoTaskDefinitionKey);
}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
verifyPid = actiProcInstId;
if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
@@ -411,6 +413,7 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
projectTaskInventoryEO.setVerifyPId(verifyPid);
projectTaskInventoryEO.setVerifyTaskId(verifyTaskId);
projectTaskInventoryEO.setVerifyTaskStatus(verifyTaskStatus);
projectTaskInventoryEO.setVerifyTaskDefinitionKey(verifyTaskDefinitionKey);
}
}else {
if(StringUtils.equals(currentUser.getId(),projectTaskInventoryDetailEO.getUserId())){
@@ -419,14 +422,17 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
projectTaskInventoryEO.setDesignPId(actiProcInstId);
projectTaskInventoryEO.setDesignTaskId(projectTaskInventoryDetailEO.getTaskId());
projectTaskInventoryEO.setDesignTaskStatus(projectTaskInventoryDetailEO.getStatus());
projectTaskInventoryEO.setDesignTaskDefinitionKey(projectTaskInventoryDetailEO.getTaskDefinitionKey());
}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.PREHOMOQRLC.getValue())){
projectTaskInventoryEO.setPrehomoPId(actiProcInstId);
projectTaskInventoryEO.setPrehomoTaskId(projectTaskInventoryDetailEO.getTaskId());
projectTaskInventoryEO.setPrehomoTaskStatus(projectTaskInventoryDetailEO.getStatus());
projectTaskInventoryEO.setPrehomoTaskDefinitionKey(projectTaskInventoryDetailEO.getTaskDefinitionKey());
}else if(StringUtils.equals(projectTaskInventoryDetailEO.getFlowType(),FlowTypeEnum.YZFHXSCLC.getValue())){
projectTaskInventoryEO.setVerifyPId(actiProcInstId);
projectTaskInventoryEO.setVerifyTaskId(projectTaskInventoryDetailEO.getTaskId());
projectTaskInventoryEO.setVerifyTaskStatus(projectTaskInventoryDetailEO.getStatus());
projectTaskInventoryEO.setVerifyTaskDefinitionKey(projectTaskInventoryDetailEO.getTaskDefinitionKey());
}
projectTaskInventoryEO.setShowFlag(TaskStatusEnum.SHOW_FLAG.getValue());
}