From 1ccef4c01fbdfb018fa1f1c357c6fa42cc76fc85 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 5 May 2023 11:38:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AE=A4=E8=AF=81=E8=AE=A1=E5=88=92-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0G0-G7=E5=B1=9E=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 14 +- .../ProjectTaskPlanningController.java | 7 +- .../project/entity/ProjectTaskPlanning.java | 45 ++++++ .../enums/ProjectTaskPlanningNameEnum.java | 10 +- .../mapper/xml/ProjectTaskPlanningMapper.xml | 9 ++ .../impl/ProjectTaskPlanningServiceImpl.java | 143 ++++++++++++++++++ .../jero/modules/project/vo/TimeNodeVO.java | 1 + 7 files changed, 226 insertions(+), 3 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index ae65108cc..0218449f1 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -631,4 +631,16 @@ ALTER TABLE `dummy_inventory_base` -- 市场认证清单 增加字段 2023-04-24 未同步生产环境 ALTER TABLE `auth_dummy_inventory_base` ADD COLUMN `version_num` varchar(2000) NULL COMMENT '版本号' AFTER `state`, - ADD COLUMN `upgrade_explanation` varchar(2000) NULL COMMENT '升版说明' AFTER `version_num`; \ No newline at end of file + ADD COLUMN `upgrade_explanation` varchar(2000) NULL COMMENT '升版说明' AFTER `version_num`; + +-- 法规/认证任务计划 增加字段 2023-05-05 未同步生产环境 +ALTER TABLE `project_task_planning` + ADD COLUMN `zero` datetime(0) NULL COMMENT '概念验证阶段' AFTER `sys_org_code`, + ADD COLUMN `one` datetime(0) NULL COMMENT '初样阶段' AFTER `zero`, + ADD COLUMN `two` datetime(0) NULL COMMENT '工艺方案阶段' AFTER `one`, + ADD COLUMN `three` datetime(0) NULL COMMENT '零件试制阶段' AFTER `two`, + ADD COLUMN `four` datetime(0) NULL COMMENT '整车装配工艺方案阶段' AFTER `three`, + ADD COLUMN `five` datetime(0) NULL COMMENT '预生产阶段' AFTER `four`, + ADD COLUMN `six` datetime(0) NULL COMMENT '试产阶段' AFTER `five`, + ADD COLUMN `seven` datetime(0) NULL COMMENT '小批量生产阶段' AFTER `six`, + ADD COLUMN `eight` datetime(0) NULL COMMENT '大规模生产阶段' AFTER `seven`; \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java index c28965530..ddee18b2a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java @@ -13,6 +13,7 @@ import com.jero.modules.project.vo.TimeNodeVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -70,8 +71,12 @@ public class ProjectTaskPlanningController extends JeroController queryList(@RequestParam(name="projectId",required=true) String projectId) { + ProjectTaskPlanning result = new ProjectTaskPlanning(); List projectTaskPlanning = projectTaskPlanningService.queryList(projectId); - return Result.OK(projectTaskPlanning.get(0)); + if(CollectionUtils.isNotEmpty(projectTaskPlanning)){ + result = projectTaskPlanning.get(0); + } + return Result.OK(result); } /** 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 30dd70050..32324c8c2 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 @@ -102,4 +102,49 @@ public class ProjectTaskPlanning implements Serializable { @TableField(exist = false) List timeNodeVOS; + + /**概念验证阶段*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date zero; + + /**初样阶段*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date one; + + /**工艺方案阶段*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date two; + + /**零件试制阶段*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date three; + + /**整车装配工艺方案阶段*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date four; + + /**预生产阶段*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date five; + + /**试产阶段*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date six; + + /**小批量生产阶段*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date seven; + + /**大规模生产阶段*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date eight; } 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 6d2563696..767676d4c 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 @@ -10,7 +10,6 @@ public enum ProjectTaskPlanningNameEnum { // PREHOMO_DEADLINE("摸底试验结束","Pre-Homo Confirmation"), // name:Pre-Homo value:Pre-Homo // ATTESTATION_START_TIME("认证试验结束","Homo Completion"),// name:认证开始 value:Certification begins ATTESTATION_END_TIME("认证批准","Homo KO"),// name:认证结束 value:End of certification -// VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"), LIST_CONFIRMATION("清单发布","List Publishing"), LEGAL_TASK_CONFIRMATION("责任确认","Responsibility Confirmation"), @@ -19,7 +18,16 @@ public enum ProjectTaskPlanningNameEnum { ATTESTATION_START_TIME("认证开始","Certification Start"),// name:认证开始 value:Certification begins VERIFY_DEADLINE("验证核查","Verification And Verification"), CERTIFICATION_SUBMISSION("认证提交","Certification Submission"), + G_ZERO("G0","G0"), + G_ONE("G1","G1"), + G_TWO("G2","G2"), + G_THREE("G3","G3"), + G_FOUR("G4","G4"), + G_FIVE("G5","G5"), + G_SIX("G6","G6"), + G_SEVEN("G7","G7"), +// VERIFY_DEADLINE("验证符合性确认","Validation Compliance Confirmation"), ; String name; String value; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskPlanningMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskPlanningMapper.xml index a883441db..ca124104e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskPlanningMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectTaskPlanningMapper.xml @@ -11,6 +11,15 @@ + + + + + + + + + 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 52343e473..094598dc8 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 @@ -135,6 +135,7 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl { private Date time; private String status; private String projectId; + private boolean isG; // 是否是G0 - G8 @Override public int compare(TimeNodeVO o1, TimeNodeVO o2) {