From 967de5e7736bb511bc34e1c3d98a3d84cb5cd791 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 11 Dec 2023 10:39:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?= =?UTF-8?q?=E6=B5=81=E7=A8=8B):=20=E7=A8=BD=E6=9F=A5=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E6=96=87=E4=BB=B6=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessEsInspectController.java | 6 +-- .../service/IProcessEsInspectService.java | 2 +- .../impl/ProcessEsInspectServiceImpl.java | 42 +++++++++++++------ 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java index cc8e4166..95dd1dd5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java @@ -75,13 +75,13 @@ public class ProcessEsInspectController extends JeroController queryFileByInspectId(String inspectId) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IProcessEsInspectService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IProcessEsInspectService.java index 6e61f344..91ee14fa 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IProcessEsInspectService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IProcessEsInspectService.java @@ -94,7 +94,7 @@ public interface IProcessEsInspectService extends IService { List queryByList(ProcessEsInspectVO processEsInspectVO); /** - * 企标稽查流程业务表-企标稽查文件查询 + * 企标稽查流程业务表-企标文件查询 * @param inspectId * @return */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java index 51ff9739..288547e8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java @@ -15,9 +15,13 @@ import com.jero.modules.activiti.process.esinspect.mapper.ProcessEsInspectMapper import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService; import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; import com.jero.modules.laws.common.constant.FieldCommon; +import com.jero.modules.laws.enterprise.entity.EnterpriseStandardInspect; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService; +import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectService; +import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; +import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.service.ISysUserService; @@ -48,19 +52,25 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl ossFile = new AtomicReference<>(new OSSFile()); - List list = ossFileService.list(new LambdaQueryWrapper().eq(OSSFile::getStandardId, inspectId)); - // 发布稿>修改单>报批稿>送审稿>征求意见稿>草稿 - if (!list.isEmpty()){ - String[] fileTypeArr = {FieldCommon.FILE_PUBLISH_OF_ORIGINAL, FieldCommon.FILE_MODIFICATION_LIST, - FieldCommon.FILE_DRAFT_FOR_REVIEW, FieldCommon.FILE_DRAFT_FOR_APPROVAL, - FieldCommon.FILE_DRAFT_FOR_COMMENT, FieldCommon.FILE_DRAFT}; - for (String fileType : fileTypeArr) { - list.stream().filter(v -> - fileType.equals(v.getStandardFileType())).findFirst() - .ifPresent(ossFile::set); - if (!Objects.isNull(ossFile.get())){ - return ossFile.get(); + EnterpriseStandardInspect enterpriseStandardInspect = enterpriseStandardInspectService.getById(inspectId); + LawsEnterpriseStandard lawsEnterpriseStandard = lawsEnterpriseStandardService.getOne( + new LambdaQueryWrapper() + .eq(LawsEnterpriseStandard::getStandardNumber, enterpriseStandardInspect.getInspectNo()), false); + if (!Objects.isNull(lawsEnterpriseStandard)){ + List list = ossFileService.list(new LambdaQueryWrapper().eq(OSSFile::getStandardId, lawsEnterpriseStandard.getId())); + // 发布稿>修改单>报批稿>送审稿>征求意见稿>草稿 + if (!list.isEmpty()){ + String[] fileTypeArr = {FieldCommon.FILE_PUBLISH_OF_ORIGINAL, FieldCommon.FILE_MODIFICATION_LIST, + FieldCommon.FILE_DRAFT_FOR_REVIEW, FieldCommon.FILE_DRAFT_FOR_APPROVAL, + FieldCommon.FILE_DRAFT_FOR_COMMENT, FieldCommon.FILE_DRAFT}; + for (String fileType : fileTypeArr) { + list.stream().filter(v -> + fileType.equals(v.getStandardFileType())).findFirst() + .ifPresent(ossFile::set); + if (!Objects.isNull(ossFile.get())){ + return ossFile.get(); + } } } }