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