diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 596ec4a59..91fe2cd4d 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -491,6 +491,20 @@ ADD COLUMN `db_field_txt` varchar(255) NULL COMMENT '动态表头使用' AFTER ` ADD COLUMN `is_lock` varchar(255) NULL COMMENT '动态表头使用' AFTER `db_field_txt`, ADD COLUMN `type` varchar(255) NULL COMMENT '动态表头使用' AFTER `is_lock`; +-- 项目库-法规清单增加字段 2023-04-12 未同步生产环境 +ALTER TABLE `project_laws_inventory` + ADD COLUMN `design_duty_due_date` datetime(0) NULL COMMENT '设计符合性确认-责任确认截止时间' AFTER `design_p_id`, + ADD COLUMN `verify_duty_due_date` datetime(0) NULL COMMENT '验证符合性确认-责任确认截止时间' AFTER `verify_p_id`; + +-- 认证清单-认证进度数据字典调整 2023-04-12 未同步生产环境 + -- 删除之前的不涉及 + DELETE FROM `sys_dict_item` WHERE `id` = '1524311785378549761'; + -- 新增字典项 + INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1646059617545809921', '1524311122804346881', '部件报告已入库', '25181c5a4c044001b4beca539c77a5c8', '部件报告已入库', 6, 1, 'admin', '2023-04-12 15:56:10', NULL, NULL, 1, NULL, NULL, '0', 'Component report has been stored'); + INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1646059536658657282', '1524311122804346881', '部件报告已提交', '0a384b5475554ae8886b950730a3bff7', '部件报告已提交', 5, 1, 'admin', '2023-04-12 15:55:51', NULL, NULL, 1, NULL, NULL, '0', 'Component report submitted'); + INSERT INTO `sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1646059431692005378', '1524311122804346881', '部件报告未提交', '7cba3c71fd24421eade54c685e3b4444', '部件报告未提交', 4, 1, 'admin', '2023-04-12 15:55:25', 'admin', '2023-04-12 15:55:33', 1, NULL, NULL, '0', 'Component report not submitted'); + -- 修改字典项 + UPDATE `sys_dict_item` SET `item_text` = '未开始', `description` = '未开始' WHERE `id` = '1524311601424764929'; -- 初始化生产环境，设计符合性流程状态为空的数据 处理成 清单待发布 2023-4-10 未同步生产环境 UPDATE `project_laws_inventory` 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 855583737..c6da492f3 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 @@ -511,4 +511,15 @@ public class ProjectLawsInventoryEO implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "流程结束时间 最后的时间") private Date processEndTime; + + /**设计符合性确认-责任确认截止时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "设计符合性确认-责任确认截止时间") + private Date designDutyDueDate; + /**验证符合性确认-责任确认截止时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "验证符合性确认-责任确认截止时间") + private Date verifyDutyDueDate; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java index 897123b64..12fa19212 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/CertificationProgressEnum.java @@ -9,9 +9,12 @@ import com.jero.common.constant.enums.CutEnum; public enum CertificationProgressEnum { TEST_PASSED("实验通过","Test passed"), TEST_FAILED("实验失败","Test failed"), - NOT_START("待开始","Not start"), + NOT_START("未开始","Not start"), IN_PROGRESS("进行中","In progress"), - NA("不涉及","NA"), +// NA("不涉及","NA"),// 04-12弃用， + COMPONENT_REPORT_NOT_SUBMITTED("部件报告未提交","Component report not submitted"), + COMPONENT_REPORT_SUBMITTED("部件报告已提交","Component report submitted"), + COMPONENT_REPORT_HAS_BEEN_STORED("部件报告已入库","Component report has been stored"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index 898f2ebfc..170c0f48e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -361,9 +361,10 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService //2. 认证进度(不涉及/待开始/进行中/实验失败/实验通过) if(StringUtils.isNotBlank(certificationProgressTemp)){ - if(CertificationProgressEnum.NA.getValue().equals(certificationProgressTemp)){ - na++; - }else if(CertificationProgressEnum.NOT_START.getValue().equals(certificationProgressTemp)){ +// if(CertificationProgressEnum.NA.getValue().equals(certificationProgressTemp)){ +// na++; +// }else + if(CertificationProgressEnum.NOT_START.getValue().equals(certificationProgressTemp)){ notStart++; }else if(CertificationProgressEnum.IN_PROGRESS.getValue().equals(certificationProgressTemp)){ inProgress++;