项目库-项目库详情-合规认证计划

jero-boot/db/蔚来标准sql/dev_2nd_period.sql

@@ -423,4 +423,14 @@ ALTER TABLE `laws_weilai`.`params_report_config_data`
 
 -- 流程历史表，增加字段 附件id  2023-3-20   未同步生产环境
 ALTER TABLE `process_history`
-    ADD COLUMN `approval_file` varchar(2000) NULL COMMENT '附件id，多个之间使用英文逗号分隔' AFTER `project_laws_inventory_id`;
+    ADD COLUMN `approval_file` varchar(2000) NULL COMMENT '附件id，多个之间使用英文逗号分隔' AFTER `project_laws_inventory_id`;
+
+-- 项目库-相关人员维护表，增加字段 工程接口人法规工程师设置,工程接口人认证工程师设置  2023-3-22   未同步生产环境
+ALTER TABLE `project_related_personnel`
+    ADD COLUMN `engineer_law_set` varchar(500) NULL COMMENT '工程接口人法规工程师设置' AFTER `law_engineer`;
+    ADD COLUMN `engineer_att_set` varchar(500) NULL COMMENT '工程接口人认证工程师设置' AFTER `certification_engineer`;
+
+-- 项目库-法规/认证任务计划 (各阶段确认进度) 表，增加字段 认证提交  2023-3-23   未同步生产环境
+ALTER TABLE `project_task_planning`
+    ADD COLUMN `certification_submission` datetime(0) NULL COMMENT '认证提交' AFTER `attestation_start_time`;
+

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java

@@ -67,6 +67,12 @@ public class ProjectTaskPlanning implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date attestationEndTime;
 
+    /**认证提交*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date  certificationSubmission;
+
+
     /**验证符合性确认截止时间*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java

@@ -18,6 +18,8 @@ public enum ProjectTaskPlanningNameEnum {
     PREHOMO_DEADLINE("摸底开始","Get Started"), // name:Pre-Homo   value:Pre-Homo
     ATTESTATION_START_TIME("认证开始","Certification Start"),//  name:认证开始   value:Certification begins
     VERIFY_DEADLINE("验证核查","Verification And Verification"),
+    CERTIFICATION_SUBMISSION("认证提交","Certification Submission"),
+
     ;
     String name;
     String value;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java

@@ -270,6 +270,27 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl<ProjectTaskPlann
 				verifyDeadlineVO.setProjectId(projectTaskPlanning.getProjectId());
 				timeNodeVOS.add(verifyDeadlineVO);
 			}
+			//认证提交
+			if(ObjectUtils.isNotEmpty(projectTaskPlanning.getCertificationSubmission())){
+				TimeNodeVO certificationSubmissionVo = new TimeNodeVO();
+
+				if(CutEnum.CN.getValue().equals(cut)){
+					certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.CERTIFICATION_SUBMISSION.getName());
+				}else{
+					certificationSubmissionVo.setName(ProjectTaskPlanningNameEnum.CERTIFICATION_SUBMISSION.getValue());
+				}
+
+				certificationSubmissionVo.setTime(projectTaskPlanning.getVerifyDeadline());
+				if(projectTaskPlanning.getVerifyDeadline().after(trueNow)){
+					certificationSubmissionVo.setStatus(PlanStatusEnum.LESS_THAN_TIME.getValue());
+				}else if(projectTaskPlanning.getVerifyDeadline().before(trueNow)){
+					certificationSubmissionVo.setStatus(PlanStatusEnum.OUT_OF_DATE.getValue());
+				}else{
+					certificationSubmissionVo.setStatus(PlanStatusEnum.ON_GOING.getValue());
+				}
+				certificationSubmissionVo.setProjectId(projectTaskPlanning.getProjectId());
+				timeNodeVOS.add(certificationSubmissionVo);
+			}
 
 			// 排序
 //				Collections.sort(timeNodeVOS, listConfirmationVO);