Commit aaa6cc97 authored by hcing's avatar hcing

fix(tcm):风险报送接口

parent 8270221d
...@@ -324,7 +324,7 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R ...@@ -324,7 +324,7 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
.ne(!isDisposalUnit && !riskReport.getReportCompanyCode().equals(company.getCompanyCode()), RiskProcesses::getDisposalWayCode, DisposalMethodEnums.REPORT_FOR_WARDE.getCode()) .ne(!isDisposalUnit && !riskReport.getReportCompanyCode().equals(company.getCompanyCode()), RiskProcesses::getDisposalWayCode, DisposalMethodEnums.REPORT_FOR_WARDE.getCode())
.eq(RiskProcesses::getRiskReportSeq, sequenceNbr) .eq(RiskProcesses::getRiskReportSeq, sequenceNbr)
.eq(RiskProcesses::getIsDelete, Boolean.FALSE) .eq(RiskProcesses::getIsDelete, Boolean.FALSE)
.orderByAsc(RiskProcesses::getCreateDate)); .orderByDesc(RiskProcesses::getCreateDate));
RiskReportDto riskReportDto = new RiskReportDto(); RiskReportDto riskReportDto = new RiskReportDto();
BeanUtils.copyProperties(riskReport, riskReportDto); BeanUtils.copyProperties(riskReport, riskReportDto);
// 清除单位code,避免泄露信息 // 清除单位code,避免泄露信息
...@@ -486,7 +486,7 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R ...@@ -486,7 +486,7 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
List<RiskProcesses> riskProcesses = riskReportDto.getRiskProcesses(); List<RiskProcesses> riskProcesses = riskReportDto.getRiskProcesses();
ArrayList<JSONObject> result = new ArrayList<>(); ArrayList<JSONObject> result = new ArrayList<>();
riskProcesses.forEach(x -> result.add(new JSONObject() riskProcesses.forEach(x -> result.add(new JSONObject()
.fluentPut("operate", "【" + x.getDisposalWayName() + "】 * " + x.getOperationUserName() + " * " + x.getOperationCompanyName() + " * " + DateUtil.format(x.getCreateDate(), "yyyy-MM-dd HH:mm:ss")) .fluentPut("operate", "【" + x.getDisposalWayName() + "】 " + x.getOperationUserName() + " " + x.getOperationCompanyName() + " " + DateUtil.format(x.getCreateDate(), "yyyy-MM-dd HH:mm:ss"))
.fluentPut("content", x.getDisposalContent()))); .fluentPut("content", x.getDisposalContent())));
return result; return result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment