ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(企标稽查流程): 稽查内容，文件预览

Browse Source
This commit is contained in:
yjz
2023-12-11 09:45:59 +08:00
parent 9449d06f41
commit 631e939630
3 changed files with 55 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java
+15
View File
@@ -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<ProcessEsInspect,
return Result.OK(processEsInspectService.queryByList(processEsInspectVO));
}
/**
* 企标稽查文件查询
*
* @param inspectId
* @return
*/
@AutoLog(value = "企标稽查流程业务表-企标稽查文件查询")
@ApiOperation(value="企标稽查流程业务表-企标稽查文件查询", notes="企标稽查流程业务表-企标稽查文件查询")
@GetMapping(value = "/queryFileByInspectId")
@Translation
public Result<OSSFile> queryFileByInspectId(String inspectId) {
return Result.OK(processEsInspectService.queryFileByInspectId(inspectId));
}
/**
* 添加
*
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IProcessEsInspectService.java
+8
View File
@@ -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<ProcessEsInspect> {
* @return
*/
List<ProcessEsInspectVO> queryByList(ProcessEsInspectVO processEsInspectVO);
/**
* 企标稽查流程业务表-企标稽查文件查询
* @param inspectId
* @return
*/
OSSFile queryFileByInspectId(String inspectId);
}
laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/impl/ProcessEsInspectServiceImpl.java
+32 -3
View File
@@ -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<ProcessEsInspectMap
private final EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService;
private final EnterpriseStandardInspectReportService enterpriseStandardInspectReportService;
private final ISysUserService sysUserService;
private final IOSSFileService ossFileService;
public ProcessEsInspectServiceImpl(ProcessEsInspectMapper processEsInspectMapper,
EnterpriseStandardInspectContentService enterpriseStandardInspectContentService,
EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService,
EnterpriseStandardInspectReportService enterpriseStandardInspectReportService,
ISysUserService sysUserService) {
ISysUserService sysUserService,
IOSSFileService ossFileService) {
this.processEsInspectMapper = processEsInspectMapper;
this.enterpriseStandardInspectContentService = enterpriseStandardInspectContentService;
this.enterpriseStandardInspectRectifyPlanService = enterpriseStandardInspectRectifyPlanService;
this.enterpriseStandardInspectReportService = enterpriseStandardInspectReportService;
this.sysUserService = sysUserService;
this.ossFileService = ossFileService;
}
@@ -97,8 +105,8 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl<ProcessEsInspectMap
for (String s : ids.split(",")) {
int count = count(
new LambdaQueryWrapper<ProcessEsInspect>()
.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<ProcessEsInspectMap
return processEsInspectVOS;
}
@Override
public OSSFile queryFileByInspectId(String inspectId) {
AtomicReference<OSSFile> ossFile = new AtomicReference<>(new OSSFile());
List<OSSFile> list = ossFileService.list(new LambdaQueryWrapper<OSSFile>().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<ProcessEsInspectVO> getProcessEsInspectVOQueryWrapper(ProcessEsInspectVO processEsInspectVO) {
QueryWrapper<ProcessEsInspectVO> queryWrapper = new QueryWrapper<>();