From 690cb5afae0360ca1205e8c76c5c084d4f4ad486 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 16:34:46 +0800 Subject: [PATCH] =?UTF-8?q?67723=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=AE=9A=E7=89=88=E4=BF=AE=E6=94=B9=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 ++++++- .../project/entity/ProjectVersionInfoEO.java | 32 +++++++++++++- .../ProjectHistoryVersionsEOServiceImpl.java | 1 + .../impl/ProjectVersionInfoEOServiceImpl.java | 42 ++++++++++++++++++- 4 files changed, 84 insertions(+), 5 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index ea739fe22..4a96f2e7b 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -436,4 +436,16 @@ ALTER TABLE `project_task_planning` -- 项目库-认证清单-认证目录 说明字段长度修改 2023-3-30 未同步生产环境 ALTER TABLE `project_certification_directory` - MODIFY COLUMN `explain_info` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`; \ No newline at end of file + MODIFY COLUMN `explain_info` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '说明' AFTER `detection_report_location`; + +-- 项目库-法规清单-定版表增加字段 2023-3-30 未同步生产环境 +ALTER TABLE `project_version_info` + MODIFY COLUMN `inventory_affirm_status` varchar(100) CHARACTER SET utf32 NULL DEFAULT NULL COMMENT '清单确认状态' AFTER `task_affirm_status`, + ADD COLUMN `design_flow_status` varchar(255) NULL COMMENT '设计符合性确认-流程状态' AFTER `inventory_affirm_status`, + ADD COLUMN `verify_flow_status` varchar(255) NULL COMMENT '验证符合性确认-流程状态' AFTER `design_flow_status`; + +-- 项目库-法规清单-定版表增加字段 2023-3-30 未同步生产环境 +ALTER TABLE `project_version_info` + ADD COLUMN `project_laws_inventory_id` varchar(255) NULL COMMENT '法规清单数据id' AFTER `verify_flow_status`; +ALTER TABLE `project_version_info` + ADD COLUMN `applicable_supplement` varchar(255) NULL COMMENT '适用增补件' AFTER `project_laws_inventory_id`; \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectVersionInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectVersionInfoEO.java index 2f4889a22..698eea852 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectVersionInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectVersionInfoEO.java @@ -271,7 +271,7 @@ public class ProjectVersionInfoEO implements Serializable { /**设计符合性确认-责任人名称*/ @TableField(exist = false) - private String designDutyName; + private String designDutyIdName; /**prehomo确认-发起人名称*/ @@ -288,7 +288,7 @@ public class ProjectVersionInfoEO implements Serializable { /**验证符合性确认-责任人名称*/ @TableField(exist = false) - private String verifyDutyName; + private String verifyDutyIdName; @@ -329,4 +329,32 @@ public class ProjectVersionInfoEO implements Serializable { private String verifyDeliverableTemplateName; + /**设计符合性确认-流程状态*/ + @ApiModelProperty(value = "设计符合性确认-流程状态") + private String designFlowStatus; + @TableField(exist = false) + @Excel(name = "流程状态", width = 20,groupName = "设计符合性确认") + private String designFlowStatusName; + + /**验证符合性确认-流程状态*/ + @ApiModelProperty(value = "验证符合性确认-流程状态") + private String verifyFlowStatus; + @TableField(exist = false) + @Excel(name = "流程状态", width = 20,groupName = "验证符合性确认") + private String verifyFlowStatusName; + + /**验证符合性确认-流程实例id*/ + @TableField(exist = false) + private String verifyPId; + + /**设计符合性确认-流程实例id*/ + @TableField(exist = false) + private String designPId; + + @ApiModelProperty(value = "法规清单数据id") + private String projectLawsInventoryId; + + /**适用增补件*/ + @ApiModelProperty(value = "适用增补件") + private java.lang.String applicableSupplement; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectHistoryVersionsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectHistoryVersionsEOServiceImpl.java index cbcdf9479..289f2a191 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectHistoryVersionsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectHistoryVersionsEOServiceImpl.java @@ -56,6 +56,7 @@ public class ProjectHistoryVersionsEOServiceImpl extends ServiceImpl processInfoDetailEOQueryWrapper = new QueryWrapper<>(); + processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectVersionInfoEO.getProjectLawsInventoryId()); + processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType, FlowTypeEnum.YZFHXSCLC.getValue()); + List processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper); + if(CollectionUtils.isNotEmpty(processInfoDetailEOS)){ + projectVersionInfoEO.setVerifyPId(processInfoDetailEOS.get(0).getActiProcInstId()); + } + } + if(!StringUtils.equals(projectVersionInfoEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_RELEASED.getValue()) + ||!StringUtils.equals(projectVersionInfoEO.getDesignFlowStatus(),ComplianceFlowStatusEnum.LIST_TO_BE_CHECKED.getValue())){ + QueryWrapper processInfoDetailEOQueryWrapper = new QueryWrapper<>(); + processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getProjectLawsInventoryId,projectVersionInfoEO.getProjectLawsInventoryId()); + processInfoDetailEOQueryWrapper.lambda().eq(ProcessInfoDetailEO::getFlowType,FlowTypeEnum.SJFHXSHLC.getValue()); + List processInfoDetailEOS = this.processInfoDetailEOService.list(processInfoDetailEOQueryWrapper); + if(CollectionUtils.isNotEmpty(processInfoDetailEOS)){ + projectVersionInfoEO.setDesignPId(processInfoDetailEOS.get(0).getActiProcInstId()); + } + } } List sysUsers = new ArrayList<>(); @@ -259,7 +297,7 @@ public class ProjectVersionInfoEOServiceImpl extends ServiceImpl designDutyId.equals(e.getId())). map(SysUser::getUsername).collect(Collectors.joining(",")); - projectVersionInfoEO.setDesignDutyName(designDutyName); + projectVersionInfoEO.setDesignDutyIdName(designDutyName); } //prehomo确认 @@ -291,7 +329,7 @@ public class ProjectVersionInfoEOServiceImpl extends ServiceImpl verifyDutyId.equals(e.getId())). map(SysUser::getUsername).collect(Collectors.joining(",")); - projectVersionInfoEO.setVerifyDutyName(verifyDutyName); + projectVersionInfoEO.setVerifyDutyIdName(verifyDutyName); } }