From 8f2c9b43741ca3004587c6c8dd30260f29647997 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Thu, 23 Mar 2023 10:58:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=E8=AF=A6=E6=83=85-=E5=90=88=E8=A7=84=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 12 ++++++++++- .../project/entity/ProjectTaskPlanning.java | 6 ++++++ .../enums/ProjectTaskPlanningNameEnum.java | 2 ++ .../impl/ProjectTaskPlanningServiceImpl.java | 21 +++++++++++++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 8ad35e0cf..079c40133 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/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`; \ No newline at end of file + 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`; + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java index 3bcf71247..30dd70050 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskPlanning.java +++ b/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") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 4d7cbc3ac..6d2563696 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/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; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index 6de8959a8..9302162bf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/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