From 631e9396302e355814ae127e916d89e933ec760b Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 11 Dec 2023 09:45:59 +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 | 15 ++++++++ .../service/IProcessEsInspectService.java | 8 +++++ .../impl/ProcessEsInspectServiceImpl.java | 35 +++++++++++++++++-- 3 files changed, 55 insertions(+), 3 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 6168e8b4..cc8e4166 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 @@ -8,6 +8,7 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; import com.jero.modules.activiti.process.esinspect.service.IProcessEsInspectService; import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; +import com.jero.modules.oss.entity.OSSFile; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -73,6 +74,20 @@ public class ProcessEsInspectController extends JeroController queryFileByInspectId(String inspectId) { + return Result.OK(processEsInspectService.queryFileByInspectId(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 a77c9ca5..6e61f344 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; import com.jero.modules.activiti.process.esinspect.vo.ProcessEsInspectVO; +import com.jero.modules.oss.entity.OSSFile; import javax.servlet.http.HttpServletRequest; import java.util.List; @@ -91,4 +92,11 @@ public interface IProcessEsInspectService extends IService { * @return */ List queryByList(ProcessEsInspectVO processEsInspectVO); + + /** + * 企标稽查流程业务表-企标稽查文件查询 + * @param inspectId + * @return + */ + OSSFile queryFileByInspectId(String inspectId); } 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 8dbe9b7c..e6cd8748 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 @@ -14,9 +14,12 @@ import com.jero.modules.activiti.process.esinspect.entity.ProcessEsInspect; 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.service.EnterpriseStandardInspectContentService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectRectifyPlanService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectReportService; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.system.service.ISysUserService; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; @@ -25,6 +28,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import java.util.List; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; /** @@ -42,17 +47,20 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl() - .eq(ProcessEsInspect::getInspectId, s) - .eq(ProcessEsInspect::getProjectId, processEsInspect.getProjectId())); + .eq(ProcessEsInspect::getInspectId, s) + .eq(ProcessEsInspect::getProjectId, processEsInspect.getProjectId())); if (count > 0) { if (LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())){ throw new JeroBootException("不能重复添加!"); @@ -178,6 +186,27 @@ 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(); + } + } + } + return null; + } + @NotNull private static QueryWrapper getProcessEsInspectVOQueryWrapper(ProcessEsInspectVO processEsInspectVO) { QueryWrapper queryWrapper = new QueryWrapper<>();