diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 7a6de1b0b..3c69a69fa 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -370,3 +370,8 @@ INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_ti INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545540197302273', '0', '摸底报告Cn', NULL, 'admin', '2023-03-14 15:36:58', 'admin', '2023-03-14 15:37:20', 'A01', '1635543933669818369', NULL, '摸底报告En', NULL, 1, NULL, NULL, 0, NULL, 7); INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545630152540161', '0', '工程评估（文本）Cn', NULL, 'admin', '2023-03-14 15:37:20', NULL, NULL, 'A01', '1635543933669818369', NULL, '工程评估（文本）En', NULL, 1, NULL, NULL, 0, NULL, 6); INSERT INTO `sys_category` (`id`, `pid`, `name`, `code`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `sys_dict_id`, `has_child`, `en_name`, `description`, `is_tag_dict`, `attribute_type`, `is_read_only`, `del_flag`, `item_value`, `sort_order`) VALUES ('1635545748968783874', '0', 'N/A不填Cn', NULL, 'admin', '2023-03-14 15:37:48', NULL, NULL, 'A01', '1635543933669818369', NULL, 'N/A不填En', NULL, 1, NULL, NULL, 0, NULL, 8); + +-- 法规清单表 增加字段 设计、验证符合性确认-流程状态 2023-03-17 未同步生产环境 +ALTER TABLE `project_laws_inventory` + ADD COLUMN `design_flow_status` varchar(255) NULL COMMENT '设计符合性确认-流程状态' AFTER `design_due_date`, + ADD COLUMN `verify_flow_status` varchar(255) NULL COMMENT '验证符合性确认-流程状态' AFTER `verify_due_date`; \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index d198a80ac..4419ea728 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -484,4 +484,11 @@ public class ProjectLawsInventoryEO implements Serializable { @TableField(exist = false) private String excelName; + /**设计符合性确认-流程状态*/ + @ApiModelProperty(value = "设计符合性确认-流程状态") + private String designFlowStatus; + + /**验证符合性确认-流程状态*/ + @ApiModelProperty(value = "验证符合性确认-流程状态") + private String verifyFlowStatus; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java new file mode 100644 index 000000000..25b712ff2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ComplianceFlowStatusEnum.java @@ -0,0 +1,65 @@ +package com.jero.modules.project.enums; + +import com.jero.common.constant.enums.CutEnum; +import org.apache.commons.lang.StringUtils; + +/** + * 符合性确认流程状态枚举类 + */ +public enum ComplianceFlowStatusEnum { + LIST_TO_BE_RELEASED("清单待发布","List to be released","List to be released"), + LIST_TO_BE_CHECKED("清单待校核","List to be checked","List to be checked"), + TASK_TO_BE_CONFIRMED("任务待确认","Task to be confirmed","Task to be confirmed"), + RESULTS_TO_BE_SUBMITTED("结果待提交","Results to be submitted","Results to be submitted"), + RESULTS_TO_BE_REVIEWED("结果待审查","Results to be reviewed","Results to be reviewed"), + ; + + + String cnName; + String enName; + String value; + + private ComplianceFlowStatusEnum(String cnName,String enName, String value) { + this.cnName = cnName; + this.enName = enName; + this.value = value; + } + + public String getCnName() { + return cnName; + } + + public void setCnName(String cnName) { + this.cnName = cnName; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value,String cut) { + ComplianceFlowStatusEnum[] values = values(); + for (ComplianceFlowStatusEnum complianceFlowStatusEnum : values) { + if (complianceFlowStatusEnum.value.equals(value)) { + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + return complianceFlowStatusEnum.cnName; + }else { + return complianceFlowStatusEnum.enName; + } + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 834084bca..c0ea2547e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -300,6 +300,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl