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

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/controller/ProcessEsInspectController.java

@@ -75,13 +75,13 @@ public class ProcessEsInspectController extends JeroController<ProcessEsInspect,
 	}
 
 	 /**
-	  * 企标稽查文件查询
+	  * 企标文件查询
 	  *
 	  * @param inspectId
 	  * @return
 	  */
-	 @AutoLog(value = "企标稽查流程业务表-企标稽查文件查询")
+	 @AutoLog(value = "企标稽查流程业务表-企标文件查询")
-	 @ApiOperation(value="企标稽查流程业务表-企标稽查文件查询", notes="企标稽查流程业务表-企标稽查文件查询")
+	 @ApiOperation(value="企标稽查流程业务表-企标文件查询", notes="企标稽查流程业务表-企标文件查询")
 	 @GetMapping(value = "/queryFileByInspectId")
 	 @Translation
 	 public Result<OSSFile> queryFileByInspectId(String inspectId) {

laws-modules/src/main/java/com/jero/modules/activiti/process/esinspect/service/IProcessEsInspectService.java

@@ -94,7 +94,7 @@ public interface IProcessEsInspectService extends IService<ProcessEsInspect> {
     List<ProcessEsInspectVO> queryByList(ProcessEsInspectVO processEsInspectVO);
 
 	/**
-	 * 企标稽查流程业务表-企标稽查文件查询
+	 * 企标稽查流程业务表-企标文件查询
 	 * @param inspectId
 	 * @return
 	 */

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<ProcessEsInspectMap
 	private final EnterpriseStandardInspectReportService enterpriseStandardInspectReportService;
 	private final ISysUserService sysUserService;
 	private final IOSSFileService ossFileService;
+	private final EnterpriseStandardInspectService enterpriseStandardInspectService;
+	private final ILawsEnterpriseStandardService lawsEnterpriseStandardService;
 
 	public ProcessEsInspectServiceImpl(ProcessEsInspectMapper processEsInspectMapper,
 									   EnterpriseStandardInspectContentService enterpriseStandardInspectContentService,
 									   EnterpriseStandardInspectRectifyPlanService enterpriseStandardInspectRectifyPlanService,
 									   EnterpriseStandardInspectReportService enterpriseStandardInspectReportService,
 									   ISysUserService sysUserService,
-									   IOSSFileService ossFileService) {
+									   IOSSFileService ossFileService,
+									   EnterpriseStandardInspectService enterpriseStandardInspectService,
+									   ILawsEnterpriseStandardService lawsEnterpriseStandardService) {
 		this.processEsInspectMapper = processEsInspectMapper;
 		this.enterpriseStandardInspectContentService = enterpriseStandardInspectContentService;
 		this.enterpriseStandardInspectRectifyPlanService = enterpriseStandardInspectRectifyPlanService;
 		this.enterpriseStandardInspectReportService = enterpriseStandardInspectReportService;
 		this.sysUserService = sysUserService;
 		this.ossFileService = ossFileService;
+		this.enterpriseStandardInspectService = enterpriseStandardInspectService;
+		this.lawsEnterpriseStandardService = lawsEnterpriseStandardService;
 	}
 
 
@@ -189,7 +199,12 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl<ProcessEsInspectMap
 	@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));
+		EnterpriseStandardInspect enterpriseStandardInspect = enterpriseStandardInspectService.getById(inspectId);
+		LawsEnterpriseStandard lawsEnterpriseStandard = lawsEnterpriseStandardService.getOne(
+				new LambdaQueryWrapper<LawsEnterpriseStandard>()
+						.eq(LawsEnterpriseStandard::getStandardNumber, enterpriseStandardInspect.getInspectNo()), false);
+		if (!Objects.isNull(lawsEnterpriseStandard)){
+			List<OSSFile> list = ossFileService.list(new LambdaQueryWrapper<OSSFile>().eq(OSSFile::getStandardId, lawsEnterpriseStandard.getId()));
 			// 发布稿>修改单>报批稿>送审稿>征求意见稿>草稿
 			if (!list.isEmpty()){
 				String[] fileTypeArr = {FieldCommon.FILE_PUBLISH_OF_ORIGINAL, FieldCommon.FILE_MODIFICATION_LIST,
@@ -204,6 +219,7 @@ public class ProcessEsInspectServiceImpl extends ServiceImpl<ProcessEsInspectMap
 					}
 				}
 			}
+		}
 		return new OSSFile();
 	}