fix bug
parent
d8e181aaf0
commit
b9670b50f1
|
|
@ -105,6 +105,8 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
|
||||||
@Resource
|
@Resource
|
||||||
private EvalCustomerMapper evalCustomerMapper;
|
private EvalCustomerMapper evalCustomerMapper;
|
||||||
@Resource
|
@Resource
|
||||||
|
private WpsDocQueryService wpsDocQueryService;
|
||||||
|
@Resource
|
||||||
private SafetyMessageGateway safetyMessageGateway;
|
private SafetyMessageGateway safetyMessageGateway;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -364,8 +366,8 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
|
||||||
files.addAll(evalContractQueryService.listProjectFiles(projectId, orgId));
|
files.addAll(evalContractQueryService.listProjectFiles(projectId, orgId));
|
||||||
// 现场踏勘-附件
|
// 现场踏勘-附件
|
||||||
files.addAll(evalSurveyAttachQueryService.listProjectFiles(projectId, orgId));
|
files.addAll(evalSurveyAttachQueryService.listProjectFiles(projectId, orgId));
|
||||||
// 报告编制-报告草稿
|
// 报告编制-报告草稿(查询wps_doc表中项目id最大的一条记录)
|
||||||
files.addAll(evalReportDraftQueryService.listProjectFiles(projectId, orgId));
|
files.addAll(wpsDocQueryService.listProjectFiles(projectId, orgId));
|
||||||
// 内部审核-内审签字
|
// 内部审核-内审签字
|
||||||
files.addAll(evalInternalReviewQueryService.listProjectFiles(projectId, orgId));
|
files.addAll(evalInternalReviewQueryService.listProjectFiles(projectId, orgId));
|
||||||
// 技术审核-技审签字
|
// 技术审核-技审签字
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
package org.qinan.safetyeval.infrastructure.persistence.queryservice;
|
||||||
|
|
||||||
|
import org.qinan.safetyeval.client.co.institution.EvalProjectFileCO;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* WPS文档查询服务
|
||||||
|
*
|
||||||
|
* @author safety-eval
|
||||||
|
*/
|
||||||
|
public interface WpsDocQueryService {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询项目报告编制相关文件(wps_doc 表中按项目id查询id最大的一条记录)
|
||||||
|
*
|
||||||
|
* @param projectId 项目ID
|
||||||
|
* @param orgId 机构ID
|
||||||
|
* @return 项目文件CO列表
|
||||||
|
*/
|
||||||
|
List<EvalProjectFileCO> listProjectFiles(Long projectId, Long orgId);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,43 @@
|
||||||
|
package org.qinan.safetyeval.infrastructure.persistence.queryservice.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import org.qinan.safetyeval.client.co.institution.EvalProjectFileCO;
|
||||||
|
import org.qinan.safetyeval.domain.constant.ProjectStageEnum;
|
||||||
|
import org.qinan.safetyeval.infrastructure.dataobject.WpsDocDO;
|
||||||
|
import org.qinan.safetyeval.infrastructure.mapper.WpsDocMapper;
|
||||||
|
import org.qinan.safetyeval.infrastructure.persistence.queryservice.WpsDocQueryService;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* WPS文档查询服务
|
||||||
|
*
|
||||||
|
* @author safety-eval
|
||||||
|
*/
|
||||||
|
@Service
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class WpsDocQueryServiceImpl implements WpsDocQueryService {
|
||||||
|
|
||||||
|
private final WpsDocMapper wpsDocMapper;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<EvalProjectFileCO> listProjectFiles(Long projectId, Long orgId) {
|
||||||
|
WpsDocDO latestDoc = wpsDocMapper.selectOne(new LambdaQueryWrapper<WpsDocDO>()
|
||||||
|
.eq(WpsDocDO::getProjectId, projectId)
|
||||||
|
.orderByDesc(WpsDocDO::getId)
|
||||||
|
.last("LIMIT 1"));
|
||||||
|
List<EvalProjectFileCO> files = new ArrayList<>();
|
||||||
|
if (latestDoc != null && latestDoc.getDownloadUrl() != null) {
|
||||||
|
EvalProjectFileCO co = new EvalProjectFileCO();
|
||||||
|
co.setProcessName(ProjectStageEnum.REPORT_PREPARATION.getMsg());
|
||||||
|
co.setItemName(ProjectStageEnum.REPORT_PREPARATION.getMsg());
|
||||||
|
co.setProjectDocUrl(latestDoc.getDownloadUrl());
|
||||||
|
co.setMaterialName(latestDoc.getName());
|
||||||
|
files.add(co);
|
||||||
|
}
|
||||||
|
return files;
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue