Browse Source

修改导出问题

whszxyjhyy
ccsens_zhengzhichuan 6 days ago
parent
commit
7c2b2f3d48
  1. 8
      ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java

8
ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsReportServiceImpl.java

@ -2291,22 +2291,22 @@ public class AmsReportServiceImpl implements AmsReportService {
//1. 查询是否已生成对应版本的报告单 //1. 查询是否已生成对应版本的报告单
RmsReport report = rmsReportMapper.selectByPrimaryKey(dto.getReportId()); RmsReport report = rmsReportMapper.selectByPrimaryKey(dto.getReportId());
if (ObjectUtil.isNotNull(report)) { if (ObjectUtil.isNotNull(report)) {
if (dto.getVersion() != null && dto.getVersion() == 0 && report.getAllUrl() != null) { if (dto.getVersion() != null && dto.getVersion() == 0 && StrUtil.isNotEmpty(report.getAllUrl())) {
AmsReportVo.Result result = new AmsReportVo.Result(); AmsReportVo.Result result = new AmsReportVo.Result();
result.setPath(report.getAllUrl()); result.setPath(report.getAllUrl());
return result; return result;
} }
if (dto.getVersion() != null && dto.getVersion() == 1 && report.getUrl() != null) { if (dto.getVersion() != null && dto.getVersion() == 1 && StrUtil.isNotEmpty(report.getUrl())) {
AmsReportVo.Result result = new AmsReportVo.Result(); AmsReportVo.Result result = new AmsReportVo.Result();
result.setPath(report.getUrl()); result.setPath(report.getUrl());
return result; return result;
} }
if (dto.getVersion() != null && dto.getVersion() == 2 && report.getPersionUrl() != null) { if (dto.getVersion() != null && dto.getVersion() == 2 && StrUtil.isNotEmpty(report.getPersionUrl())) {
AmsReportVo.Result result = new AmsReportVo.Result(); AmsReportVo.Result result = new AmsReportVo.Result();
result.setPath(report.getPersionUrl()); result.setPath(report.getPersionUrl());
return result; return result;
} }
if (dto.getVersion() != null && dto.getVersion() == 3 && report.getPositiveUrl() != null) { if (dto.getVersion() != null && dto.getVersion() == 3 && StrUtil.isNotEmpty(report.getPositiveUrl())) {
AmsReportVo.Result result = new AmsReportVo.Result(); AmsReportVo.Result result = new AmsReportVo.Result();
result.setPath(report.getPositiveUrl()); result.setPath(report.getPositiveUrl());
return result; return result;

Loading…
Cancel
Save