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 200190b24..345aadffa 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 @@ -251,4 +251,8 @@ public class ProjectTaskInventoryEO implements Serializable { private String verifySendMsgFlag; /**验证符合性流程-结束当天发送消息标识0未发 1已发**/ private String verifySendMsgCurrentFlag; + + /**项目状态评估备注**/ + @TableField(exist = false) + private String projectStatusAssessRemark; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DesignComplianceStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DesignComplianceStatusEnum.java index 57d8f8b8b..d3b281492 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DesignComplianceStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DesignComplianceStatusEnum.java @@ -7,9 +7,9 @@ import org.apache.commons.lang.StringUtils; * 设计符合性确认流程状态枚举类 */ public enum DesignComplianceStatusEnum { - TO_SUBMIT("待提交","to submit"), - TO_REVIEW("待审查","to review"), - REVIEW_COMPLETED("审查完成","review completed"), + TO_SUBMIT("待提交","To submit"), + TO_REVIEW("待审查","To approve"), + REVIEW_COMPLETED("审查完成","Complete"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/InventoryAffirmStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/InventoryAffirmStatusEnum.java index 7efdb9d2f..b44f8662c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/InventoryAffirmStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/InventoryAffirmStatusEnum.java @@ -14,8 +14,8 @@ public enum InventoryAffirmStatusEnum { NOT_STARTED("未发起","Not started"), LIST_TO_CONFIRM("待确认","List to confirm"), - ACCEPTED("接受","accepted"), - REJECTED("拒绝","rejected"), + ACCEPTED("接受","Accepted"), + REJECTED("拒绝","Rejected"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java index 97b303aad..60d8a7486 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java @@ -7,13 +7,13 @@ import com.jero.common.constant.enums.CutEnum; * 审查结果枚举类 */ public enum ReviewResultEnum { - LAUNCH("发起","launch"), - TO_BE_CONFIRMED("待确认","to be confirmed"), - CONFORMITY("符合","conformity"), - INCONFORMITY("不符合","inconformity"), - TO_TRACK("待追踪","to track"), - UNINVOLVED("不涉及","uninvolved"), - TERMINATION_OF_TASK("任务终止","termination of task") + LAUNCH("发起","Launch"), + TO_BE_CONFIRMED("待确认","No rating"), + CONFORMITY("符合","Compliance"), + INCONFORMITY("不符合","Non-Compliance"), + TO_TRACK("待追踪","To be tracked"), + UNINVOLVED("不涉及","NA"), + TERMINATION_OF_TASK("任务终止","Termination of task") ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/TaskAffirmStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/TaskAffirmStatusEnum.java index 4d1309d57..937ecc88e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/TaskAffirmStatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/TaskAffirmStatusEnum.java @@ -15,8 +15,8 @@ public enum TaskAffirmStatusEnum { */ NOT_STARTED("未发起","Not started"), LIST_TO_CONFIRM("待确认","List to confirm"), - ACCEPTED("接受","accepted"), - REJECTED("拒绝","rejected"), + ACCEPTED("接受","Accepted"), + REJECTED("拒绝","Rejected"), ;