From 69a99136c8726026929ebb46f3ac76c69f86f275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 31 Mar 2023 18:10:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E7=BB=B4=E6=8A=A4=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E4=BA=A4=E4=BB=98=E7=89=A9=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/addModel.vue | 73 ++++++++++++++++++- .../components/editModel.vue | 72 +++++++++++++++++- .../certificationListMaintenance.vue | 29 +++++++- 3 files changed, 167 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue index fe909f061..c6e0407ae 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/addModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/addModel.vue @@ -145,6 +145,25 @@ + + +
+
+ {{$t('deliverableTemplate')}} +
+ + + {{ (item.deliverableTemplate === 'null' || item.deliverableTemplate === '' + || + item.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + +
+ + @@ -154,12 +173,14 @@ + @@ -366,4 +426,13 @@ export default { font-size: 16px; margin-right: 4px; } + +.button-text { + height: 38px; + width: calc(100% - 100px); + line-height: 38px; + background: #fff; + border: 1px #00B3BE solid; + color: #00B3BE; +} \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue index 907e6582d..fb2cdaa5a 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/editModel.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/editModel.vue @@ -127,6 +127,25 @@ + + +
+
+ {{$t('deliverableTemplate')}} +
+ + + {{ (formInline.deliverableTemplate === 'null' || formInline.deliverableTemplate === '' + || + formInline.deliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') + }} + + +
+ +
@@ -135,18 +154,21 @@
+ @@ -333,4 +392,13 @@ export default { background: #fff; border-radius: 0 0 2px 2px; } + +.button-text { + height: 38px; + width: calc(100% - 100px); + line-height: 38px; + background: #fff; + border: 1px #00B3BE solid; + color: #00B3BE; +} \ No newline at end of file diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index d6f76858b..d20b3415a 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -206,9 +206,17 @@ @change="tableOnChange" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns"> - - {{text}} + + + {{$t('viewFile')}} + + -- + + + + @@ -250,6 +259,7 @@ import addModel from '../components/addModel' import editModel from '../components/editModel' import batSetting from '../components/batSetting' + import viewFileModel from '@/components/viewFileModel/index' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { @@ -261,7 +271,8 @@ transferList, addModel, editModel, - batSetting + batSetting, + viewFileModel }, mixins: [ResizeHeader, ResizeColumnProvide], data() { @@ -340,6 +351,14 @@ width: 330, ellipsis: true }, + { + title: this.$t('deliverableTemplate'), + align: 'left', + dataIndex: 'deliverableTemplate', + width: 330, + ellipsis: true, + scopedSlots: { customRender: 'deliverableTemplate' } + }, { title: this.$t('operation'), align: 'left', @@ -536,6 +555,10 @@ }) } }) + }, + // 交付物模板 + viewFileClick(item) { + this.$refs.viewFileModelRef.clickButtonToUpload(item) } } } From b76cc51c2216e9eb3edbb8b7de6ff6439bd99c22 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 18:11:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?67677=20=E8=AE=A4=E8=AF=81=E6=B5=81?= =?UTF-8?q?=E7=A8=8B-=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...jectCertificationInventoryEOServiceImpl.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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 44dc00214..b0e469b38 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 @@ -1311,6 +1311,17 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl dutyPersonIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getDutyPerson).distinct().collect(Collectors.toList()); List dutyPersonList = this.sysUserService.querySysUserListByIdList(dutyPersonIdList); try { + // 给责任人分配待办中心的任务 + List processInfoDetailEOList = new ArrayList<>(); + for (ProjectCertificationInventoryEO projectCertificationInventoryEO : projectCertificationInventoryEOList) { + ProcessInfoDetailEO processInfoDetailEO = new ProcessInfoDetailEO(); + processInfoDetailEO.setUserId(projectCertificationInventoryEO.getDutyPerson()); + processInfoDetailEO.setEndTime(projectCertificationInventoryEO.getEndTime()); + processInfoDetailEO.setProjectLawsInventoryId(projectCertificationInventoryEO.getId()); + processInfoDetailEOList.add(processInfoDetailEO); + } + this.addProcessInfoDetailEO(processInfoDetailEOList,projectLibraryBase.getId(),CertificationFlowNodeEnum.ZRRTJRW.getKey()); + // 更新数据状态为 审查退回 this.updateBatchById(projectCertificationInventoryEOList); @@ -1494,7 +1505,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl certificationIdList = projectCertificationInventoryEOList.stream().map(ProjectCertificationInventoryEO::getId).distinct().collect(Collectors.toList()); // 将当前责任人的待办任务转为已办 LambdaUpdateWrapper detailUpdateWrap = new LambdaUpdateWrapper<>(); detailUpdateWrap.eq(ProcessInfoDetailEO::getProcessInfoId,projectLibraryBase.getId()); detailUpdateWrap.eq(ProcessInfoDetailEO::getUserId,currentUser.getId()); detailUpdateWrap.eq(ProcessInfoDetailEO::getTaskDefinitionKey,CertificationFlowNodeEnum.ZRRJSRW.getKey()); + detailUpdateWrap.in(ProcessInfoDetailEO::getProjectLawsInventoryId,certificationIdList); detailUpdateWrap.set(ProcessInfoDetailEO::getStatus,TaskStatusEnum.HAVE_DONE.getValue()); this.processInfoDetailEOService.update(detailUpdateWrap); From 17868dd7dc3c10257a09823690ccc3772c998140 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Fri, 31 Mar 2023 18:26:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E4=BA=A4=E4=BB=98=E7=89=A9=E6=A8=A1=E6=9D=BF=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 | 6 +++++- .../entity/AuthDummyInventoryInfoEO.java | 8 ++++++++ .../AuthDummyInventoryInfoEOServiceImpl.java | 17 +++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 4a96f2e7b..dec5fd18d 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -448,4 +448,8 @@ ALTER TABLE `project_version_info` 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 + ADD COLUMN `applicable_supplement` varchar(255) NULL COMMENT '适用增补件' AFTER `project_laws_inventory_id`; + +-- 虚拟认证清单-增加字段 2023-3-30 未同步生产环境 +ALTER TABLE `auth_dummy_inventory_info` + ADD COLUMN `deliverable_template` varchar(500) NULL COMMENT '交付物模板' AFTER `auth_dummy_inventory_base_id`; \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java index fdda05dd9..c587bb7a1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java @@ -134,4 +134,12 @@ public class AuthDummyInventoryInfoEO implements Serializable { /**值类型，对应SysCategoryValueTypeEnum中value**/ @TableField(exist = false) private String valueType; + + /**交付物模板*/ + @ApiModelProperty(value = "交付物模板") + private String deliverableTemplate; + /**交付物模板名称**/ + @TableField(exist = false) + @Excel(name = "交付物模板", width = 20) + private String deliverableTemplateName; } 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 0a29a5e56..6fb49863b 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 @@ -27,6 +27,7 @@ import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum; import com.jero.modules.dummy.service.impl.DummyLogEOServiceImpl; import com.jero.modules.dummy.util.DeepCopyListUtil; +import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; import com.jero.modules.project.enums.ProjectInventoryFieldEnum; @@ -1302,6 +1303,8 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl categoryList = this.sysCategoryService.list(); List sysDictItems = this.sysDictItemServiceImpl.getBaseMapper().selectItemsAll(); + String deliverableTemplates = datas.stream().map(AuthDummyInventoryInfoEO::getDeliverableTemplate).distinct().collect(Collectors.joining(",")); + List deliverableTemplateFileList = iOSSFileService.getFileInfos(deliverableTemplates); for (AuthDummyInventoryInfoEO data : datas) { if(StringUtils.isNotEmpty(data.getDeliverableType())){ @@ -1312,6 +1315,20 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl { + boolean flag = false; + for (String deliverableTemplate : deliverableTemplateArr) { + if (StringUtils.equals(file.getId(),deliverableTemplate)) { + flag = true; + break; + } + } + return flag; + }).map(OSSFile::getFileName).collect(Collectors.joining(",")); + data.setDeliverableTemplateName(deliverableTemplateName); + } } } From 0e51853348987bd8a7cf02e17c17274b654b1686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 31 Mar 2023 18:34:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E7=BB=B4=E6=8A=A4=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E4=BA=A4=E4=BB=98=E7=89=A9=E6=A8=A1=E6=9D=BF-=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=90=8Espan=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationListMaintenance.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index d20b3415a..a6ba3ebd8 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -691,4 +691,9 @@ ::v-deep .ant-table-placeholder { margin-top: 8px !important; } + + .viewFile { + color: #00B3BE; + cursor: pointer; + } \ No newline at end of file