From f5eb3befc6114feca0917c5cbb3123b4f65e9677 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 21 Sep 2023 20:37:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B5=81=E7=A8=8B=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=88=E5=B9=B3=E5=8F=B0=E4=BB=B6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...PhoneProjectLawsInventoryEOController.java | 13 ++ .../IProjectLawsInventoryEOService.java | 3 +- .../ProjectLawsInventoryEOServiceImpl.java | 128 ++++++++++++++++++ 3 files changed, 143 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java index 9ec966ed0..2f178b654 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/PhoneProjectLawsInventoryEOController.java @@ -561,4 +561,17 @@ public class PhoneProjectLawsInventoryEOController extends JeroController finalizationVerify(@RequestParam Map params){ return this.projectLawsInventoryEOService.finalizationVerify(params); } + + /** + * 点击流程状态查看流程详情（平台件） + * + * @return + */ + @AutoLog(value = "点击流程状态查看流程详情（平台件）") + @ApiOperation(value="点击流程状态查看流程详情（平台件）", notes="点击流程状态查看流程详情（平台件）") + @GetMapping(value = "/queryPlatformList") + public Result> queryPlatformList(String lawsInventoryId,String flowFlag,String cut) { + List list = projectLawsInventoryEOService.queryPlatformList(lawsInventoryId,flowFlag,cut); + return Result.OK(list); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index d6280ef2a..2f2687e23 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.itextpdf.text.DocumentException; import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.MessageTypeEnum; -import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.project.entity.ProjectLawsInventoryEO; @@ -323,4 +322,6 @@ public interface IProjectLawsInventoryEOService extends IService queryPlatformList(String lawsInventoryId,String flowFlag,String cut); } 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 e07916a03..70d4fdedd 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 @@ -12176,4 +12176,132 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryPlatformList(String lawsInventoryId,String flowFlag,String cut){ + if(StringUtils.isBlank(lawsInventoryId) || StringUtils.isBlank(flowFlag)){ + return new ArrayList<>(); + } + List sysDictItems = this.sysDictItemServiceImpl.selectItemsAll(); + List categoryList = sysCategoryService.list(); + + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(LawsInventoryPlatformEO::getLawsInventoryId,lawsInventoryId); + List lawsInventoryPlatformEOS = lawsInventoryPlatformEOService.list(wrapper); + List idList = new ArrayList<>(); + List projectLawsInventoryEOList = new ArrayList<>(); + if(ObjectUtils.isNotEmpty(lawsInventoryPlatformEOS)){ + idList = lawsInventoryPlatformEOS.stream().map(LawsInventoryPlatformEO::getPlatformLawsInventoryId).collect(Collectors.toList()); + projectLawsInventoryEOList = this.listByIds(idList); + List userIdList = new ArrayList<>(); + List collect1 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getDesignDutyId).distinct().collect(Collectors.toList()); + List collect2 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getVerifyDutyId).distinct().collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(collect1)){ + userIdList.addAll(collect1); + } + if(ObjectUtils.isNotEmpty(collect2)){ + userIdList.addAll(collect2); + } + + List fileIdList = new ArrayList<>(); + List collect3 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getDesignDeliverableTemplate).distinct().collect(Collectors.toList()); + List collect4 = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getVerifyDeliverableTemplate).distinct().collect(Collectors.toList()); + if(ObjectUtils.isNotEmpty(collect3)){ + fileIdList.addAll(collect3); + } + if(ObjectUtils.isNotEmpty(collect4)){ + fileIdList.addAll(collect4); + } + + List sysUsers = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(userIdList)) { + userIdList = userIdList.stream().distinct().collect(Collectors.toList()); + QueryWrapper sysUserQueryWrapper = new QueryWrapper<>(); + sysUserQueryWrapper.lambda().in(SysUser::getId, userIdList); + sysUsers = sysUserMapper.selectList(sysUserQueryWrapper); + } + + List fileInfos = new ArrayList<>(); + if (fileIdList.size() != 0) { + fileInfos = iOSSFileService.getFileInfos(StringUtils.join(fileIdList, ",")); + } + + for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) { + //流程状态 + String flowStatus = ""; + if("design".equals(flowFlag)){ + flowStatus = projectLawsInventoryEO.getDesignFlowStatus(); + }else{ + flowStatus = projectLawsInventoryEO.getVerifyFlowStatus(); + } + if (StringUtils.isNotEmpty(flowStatus)) { + String designFlowStatusName = ComplianceFlowStatusEnum.getTextByValue(flowStatus, cut); + projectLawsInventoryEO.setDesignFlowStatusName(designFlowStatusName); + } + + //发起人. +// if("design".equals(flowFlag)){ +// projectLawsInventoryEO.get +// }else{ +// +// } + //责任人 + String dutyId = ""; + if("design".equals(flowFlag)){ + dutyId = projectLawsInventoryEO.getDesignDutyId(); + }else{ + dutyId = projectLawsInventoryEO.getVerifyDutyId(); + } + if (StringUtils.isNotEmpty(dutyId)) { + String finalDutyId = dutyId; + String designDutyName = sysUsers.stream().filter(e -> finalDutyId.equals(e.getId())). + map(SysUser::getUsername).collect(Collectors.joining(",")); + projectLawsInventoryEO.setDesignDutyIdName(designDutyName); + } else { + projectLawsInventoryEO.setDesignDutyIdName(""); + } + + //交付物模板 + String deliverableTemplate = ""; + if("design".equals(flowFlag)){ + deliverableTemplate = projectLawsInventoryEO.getDesignDeliverableTemplate(); + }else{ + deliverableTemplate = projectLawsInventoryEO.getVerifyDeliverableTemplate(); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())) { + String fileName = this.editService.getFileName(projectLawsInventoryEO, fileInfos, projectLawsInventoryEO.getDesignDeliverableTemplate()); + if (org.apache.commons.lang3.StringUtils.isNotBlank(fileName)) { + projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName); + } + } + //交付物类型 + String deliverableType = ""; + if("design".equals(flowFlag)){ + deliverableType = projectLawsInventoryEO.getDesignDeliverableType(); + }else{ + deliverableType = projectLawsInventoryEO.getVerifyDeliverableType(); + } + if (StringUtils.isNotBlank(deliverableType)) { + List designDeliverableTypeList = Arrays.asList(deliverableType.split(",")); + String name = getTreeName(cut, categoryList, designDeliverableTypeList); + projectLawsInventoryEO.setDesignDeliverableTypeName(name); + } + + //责任领域 + String dutyTerritory = projectLawsInventoryEO.getDutyTerritory(); + if (StringUtils.isNotEmpty(dutyTerritory)) { + String dutyTerritory_dictText = disposeShowDictItemValue(sysDictItems, dutyTerritory, cut, ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()); + projectLawsInventoryEO.setDutyTerritory_dictText(dutyTerritory_dictText); + } + //交付物说明 + String remark = ""; + if("design".equals(flowFlag)){ + remark = projectLawsInventoryEO.getDesignRemark(); + }else{ + remark = projectLawsInventoryEO.getVerifyRemark(); + } + } + } + return projectLawsInventoryEOList; + } + + }