Commit 97118be9 authored by hcing's avatar hcing

feat(tcm):风险报送详情流水接口

parent 3cb3608b
...@@ -121,6 +121,12 @@ ...@@ -121,6 +121,12 @@
<if test="dto.riskDisposalUnit != null and dto.riskDisposalUnit != ''"> <if test="dto.riskDisposalUnit != null and dto.riskDisposalUnit != ''">
AND temp."risk_disposal_unit_name" LIKE CONCAT('%', #{dto.riskDisposalUnit}, '%') AND temp."risk_disposal_unit_name" LIKE CONCAT('%', #{dto.riskDisposalUnit}, '%')
</if> </if>
<if test="dto.reportUserName != null and dto.reportUserName != ''">
AND temp."report_user_name" LIKE CONCAT('%', #{dto.reportUserName}, '%')
</if>
<if test="dto.reportUserPhone != null and dto.reportUserPhone != ''">
AND temp."report_user_phone" LIKE CONCAT('%', #{dto.reportUserPhone}, '%')
</if>
</where> </where>
) as t ) as t
ORDER BY t."create_date" DESC ORDER BY t."create_date" DESC
......
...@@ -481,7 +481,7 @@ public class RiskReportServiceImpl extends BaseService<RiskReport, RiskReport, R ...@@ -481,7 +481,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()) .fluentPut("operate", "【" + x.getDisposalWayName() + "】 * " + x.getOperationUserName() + " * " + x.getOperationCompanyName() + " * " + x.getCreateDate())
.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