From 117d31e9f826bf829555b4f90b6c8c3a48ef76ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 31 Mar 2023 15:46:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 34 +- .../historicalVersion/index.vue | 380 ++++++++++-------- 2 files changed, 229 insertions(+), 185 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index e3c918e25..673ce2d8c 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1055,22 +1055,22 @@ isResultReported: false, // fieldList | array |✔| 需要查询的列集合示例如下，type类型有:date/datetime/string/int/number fieldList: [ - { - type: 'string', - value: 'correspondingStandard', - text: this.$t('correspondingStandard') - }, + // { + // type: 'string', + // value: 'correspondingStandard', + // text: this.$t('correspondingStandard') + // }, { type: 'string', value: 'subtitle', text: this.$t('subtitle') }, - { - type: '', - value: 'implementType', - text: this.$t('implementationCategory'), - dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 - }, + // { + // type: '', + // value: 'implementType', + // text: this.$t('implementationCategory'), + // dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 + // }, { type: 'date', value: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', @@ -1104,24 +1104,12 @@ text: this.$t('areaOfResponsibility'), dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 }, - { - type: '', - value: 'region', - text: this.$t('zoneOfApplication'), - dictCode: 'region'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 - }, { type: 'Personnel', value: 'regulationOwnerId', valueName: 'regulationOwnerIdName', text: this.$t('regulatoryEngineer') }, - { - type: 'Personnel', - value: 'homologationEngineerId', - valueName: 'homologationEngineerIdName', - text: this.$t('certifiedEngineer') - }, { type: 'Personnel', value: 'engineeringInterfacePerson', diff --git a/jero-web/src/views/projectManagement/historicalVersion/index.vue b/jero-web/src/views/projectManagement/historicalVersion/index.vue index a2ce6ffa2..8737d6ac9 100644 --- a/jero-web/src/views/projectManagement/historicalVersion/index.vue +++ b/jero-web/src/views/projectManagement/historicalVersion/index.vue @@ -35,12 +35,14 @@ - - {{ $t('query') }} - {{ $t('query') }} + {{ $t('reset') }} + @@ -58,37 +60,50 @@ :columns="columns" > - {{ text && text.length > 20 ? text.slice(0, 19) + '...' : text }} + + {{ text }} + - - {{ record.designDeliverableTypeName }}
- - {{ record.designDeliverableTemplateName }} - - {{ $t('viewFile') }} - -- + + + + {{ text }} + - - {{ record.prehomoDeliverableTypeName }}
- - {{ record.prehomoDeliverableTemplateName }} - - {{ $t('viewFile') }} - -- + + + + {{$t('viewFile')}} + + -- - - {{ record.verifyDeliverableTypeName }}
- - {{ record.verifyDeliverableTemplateName }} - - {{ $t('viewFile') }} - -- + + + {{$t('viewFile')}} + + -- + + + + {{text}} + + {{text}} + + + + {{text}} + + {{text}} @@ -125,12 +140,16 @@ + + From f8e0e7b878974fb657ec8b9093f0b1422c021478 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 15:58:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?67128=20studio=E7=BC=96=E8=BE=91=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95=E6=88=AA=E8=87=B3=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=BB=99=E8=AE=A4=E8=AF=81=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88=E5=8F=91=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 404055c17..44dc00214 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -183,6 +183,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl flowStatusList = new ArrayList<>(); flowStatusList.add(CertificationInventoryFlowStatusEnum.TASK_TO_BE_CONFIRMED.getValue()); + flowStatusList.add(CertificationInventoryFlowStatusEnum.RESULTS_TO_BE_SUBMITTED.getValue()); QueryWrapper certificationQueryWrap = new QueryWrapper<>(); certificationQueryWrap.lambda().eq(ProjectCertificationInventoryEO::getId,projectCertificationInventoryEO.getId()); @@ -205,6 +206,8 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl userIdList = Arrays.asList(projectLibraryBase.getCertificationEngineer().split(",")); List userInfoList = this.sysUserService.querySysUserListByIdList(userIdList); + editEndTimeCertificationInventoryEOS.get(0).setEndTime(projectCertificationInventoryEO.getEndTime()); + this.sendMessageByTemplateId( editEndTimeCertificationInventoryEOS, TemplateInfoEnum2.CERTIFICATION_MESSAGE14.getValue(), From f2df1b81fccadcd0b823c3f5d46911bef6885286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 31 Mar 2023 16:14:52 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/components/addModel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index ae8c48599..214608932 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -691,7 +691,7 @@ Action(url, query).then((res) => { if (res.success) { this.confirmLoading = false - if (res.result && res.result.length > 0) { + if (res.result && res.result.length > 0 && res.result instanceof Array) { let detailedWarningList = [] res.result.forEach(val => { detailedWarningList.push( From 690cb5afae0360ca1205e8c76c5c084d4f4ad486 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 16:34:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?67723=20=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=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); } } From 5831e5056e309f99b7d964800f03cf70f22a21aa Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 16:40:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?67670=20=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AuthDummyInventoryInfoEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index b72277131..0a29a5e56 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -444,9 +444,9 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl