From c53310b294cb1cd2954ad8305c87f05aad28cadc Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 9 May 2022 16:25:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95=20-=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=85=E5=8A=9E=E4=BB=BB=E5=8A=A1=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=AE=9A=E4=B9=89key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/entity/ProjectTaskInventoryEO.java        | 11 +++++++++++
 .../impl/ProjectTaskInventoryEOServiceImpl.java       |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
index 8d0ac3542..6fade57ca 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java
@@ -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")
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
index be2986391..c77268277 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java
@@ -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());
 						}