From 7b1c8755893297f6e9c019ec102ff9774fe22f1e Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 3 Apr 2023 14:10:25 +0800 Subject: [PATCH] =?UTF-8?q?67717=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=88=E8=A7=84=E6=8A=A5=E5=91=8A=E4=BF=AE?= =?UTF-8?q?=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 | 6 +- .../entity/ProjectLawsInventoryEO.java | 6 ++ .../ProjectLawsInventoryEOServiceImpl.java | 58 ++++++++++++++----- 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index b39f68ad5..14e6f0379 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -470,4 +470,8 @@ ALTER TABLE `auth_dummy_inventory_info` MODIFY COLUMN `config_item` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '配置项' AFTER `inspection_item`, MODIFY COLUMN `wvta_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'WVTA ID' AFTER `config_item`, MODIFY COLUMN `duty_territory` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任领域' AFTER `serial_number`, - MODIFY COLUMN `deliverable_template` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物模板' AFTER `auth_dummy_inventory_base_id`; \ No newline at end of file + MODIFY COLUMN `deliverable_template` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物模板' AFTER `auth_dummy_inventory_base_id`; + +-- 项目库-法规清单，增加字段 流程最后结束的时间（导出合规性报告时使用） 2023-4-03 未同步生产环境 +ALTER TABLE `project_laws_inventory` + ADD COLUMN `process_end_time` datetime NULL COMMENT '流程最后结束的时间' AFTER `stand_id`; \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 8ebc4d8d4..855583737 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -505,4 +505,10 @@ public class ProjectLawsInventoryEO implements Serializable { /**设计符合性确认-流程实例id*/ @TableField(exist = false) private String designPId; + + /**流程结束时间 最后的时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "流程结束时间 最后的时间") + private Date processEndTime; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 759b95ce3..e2542b7ae 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -9280,6 +9280,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl lawsInventoryQueryWrapper = new QueryWrapper<>(); lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId,id); - ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne(lawsInventoryQueryWrapper); + ProjectLawsInventoryEO projectLawsInventory = this.baseMapper.selectOne(lawsInventoryQueryWrapper); + List projectLawsInventoryEOList = new ArrayList<>(); + projectLawsInventoryEOList.add(projectLawsInventory); + this.dataDispose( + projectLawsInventoryEOList, + currentUser, + Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()), + CutEnum.EN.getValue() + ); + + ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOList.get(0); params.put("projectLawsInventoryEO",projectLawsInventoryEO); - QueryWrapper taskInventoryQueryWrapper = new QueryWrapper<>(); + /*QueryWrapper taskInventoryQueryWrapper = new QueryWrapper<>(); taskInventoryQueryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId,id); ProjectTaskInventoryEO projectTaskInventoryEO = projectTaskInventoryEOService.getBaseMapper().selectOne(taskInventoryQueryWrapper); - params.put("projectTaskInventoryEO",projectTaskInventoryEO); + params.put("projectTaskInventoryEO",projectTaskInventoryEO);*/ QueryWrapper libraryBaseQueryWrapper = new QueryWrapper<>(); libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLawsInventoryEO.getProjectLibraryId()); @@ -9314,14 +9326,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskFeedbackQueryWrapper = new QueryWrapper<>(); + /*QueryWrapper taskFeedbackQueryWrapper = new QueryWrapper<>(); taskFeedbackQueryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getActiProcInstId,pId); List projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(taskFeedbackQueryWrapper); if(CollectionUtils.isNotEmpty(projectTaskInventoryFeedbackEOList)){ List fileIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getFileId).distinct().collect(Collectors.toList()); String fileId = StringUtils.join(fileIdList,","); List fileList = iOSSFileService.getFileInfos(fileId); + if(CollectionUtils.isNotEmpty(fileList)){ + fileList.forEach(file -> { + Map fileMap = new HashMap<>(); + fileMap.put("ITEM_FILENAME", StringUtils.isNotEmpty(file.getFileName()) ? file.getFileName() : ""); + fileMap.put("ITEM_FILEPATH", StringUtils.isNotEmpty(file.getUrl()) ? file.getUrl() : ""); + *//*fileMap.put("item.fileName", file.getFileName()); + fileMap.put("item.filePath", file.getUrl());*//* + dataList.add(fileMap); + }); + } + }*/ + params.put("actiProcInstId",pId); + List processHistoryEOList = processHistoryEOService.queryList(params); + if(CollectionUtils.isNotEmpty(processHistoryEOList)){ + List fileIdList = processHistoryEOList.stream().map(ProcessHistoryEO::getApprovalFile).distinct().collect(Collectors.toList()); + String fileId = StringUtils.join(fileIdList,","); + List fileList = iOSSFileService.getFileInfos(fileId); if(CollectionUtils.isNotEmpty(fileList)){ fileList.forEach(file -> { Map fileMap = new HashMap<>();