Commit ea93fa69 authored by hcing's avatar hcing

fix(tcm):风险报送接口

parent aaa6cc97
...@@ -331,8 +331,22 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R ...@@ -331,8 +331,22 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R
riskReportDto.setRiskDisposalUnitCode(null); riskReportDto.setRiskDisposalUnitCode(null);
riskReportDto.setReportCompanyCode(null); riskReportDto.setReportCompanyCode(null);
// 清除单位名称中的code(个人主体) // 清除单位名称中的code(个人主体)
riskReportDto.setRiskCompanyName(ValidationUtil.isEmpty(riskReportDto.getRiskCompanyName()) ? null : riskReportDto.getRiskCompanyName().split("_")[1]); riskReportDto.setRiskCompanyName(
riskReportDto.setReportCompanyName(ValidationUtil.isEmpty(riskReportDto.getReportCompanyName()) ? null : riskReportDto.getReportCompanyName().split("_")[1]); Optional.ofNullable(riskReportDto.getRiskCompanyName())
.filter(s -> !ValidationUtil.isEmpty(s))
.map(s -> s.split("_"))
.filter(arr -> arr.length > 1)
.map(arr -> arr[1])
.orElse(riskReportDto.getRiskCompanyName())
);
riskReportDto.setReportCompanyName(
Optional.ofNullable(riskReportDto.getReportCompanyName())
.filter(s -> !ValidationUtil.isEmpty(s))
.map(s -> s.split("_"))
.filter(arr -> arr.length > 1)
.map(arr -> arr[1])
.orElse(riskReportDto.getReportCompanyName())
);
riskReportDto.setRiskProcesses(riskProcesses); riskReportDto.setRiskProcesses(riskProcesses);
if (riskReport.getRiskCompanySeq() != null) { if (riskReport.getRiskCompanySeq() != null) {
riskReportDto.setRiskCompany(riskReport.getRiskCompanySeq() + "_" + riskReport.getRiskCompanyName()); riskReportDto.setRiskCompany(riskReport.getRiskCompanySeq() + "_" + riskReport.getRiskCompanyName());
......
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