|
|
@@ -476,22 +476,23 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
|
|
|
orderVoPage.setTotal(total);
|
|
|
|
|
|
List<InsOrders> records = orderVoPage.getRecords();
|
|
|
- List<String> collect = records.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
|
|
|
- Map<String, String> subOrderCountDTO = insAreaCompanyService.getSubOrderCountDTO(collect);
|
|
|
-
|
|
|
- records.forEach(x -> {
|
|
|
-
|
|
|
- if (InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(x.getOrderstatus())) {
|
|
|
- JSONArray risk = x.getRisk();
|
|
|
- List<RiskInfoVo> javaList = risk.toJavaList(RiskInfoVo.class);
|
|
|
- javaList.forEach(RiskInfoVo::expirationTime);
|
|
|
- JSONArray objects = JSON.parseArray(JSON.toJSONString(javaList));
|
|
|
- x.setRisk(objects);
|
|
|
- }
|
|
|
-
|
|
|
- x.setSubOrderStatus(subOrderCountDTO);
|
|
|
- });
|
|
|
+ if(!records.isEmpty()) {
|
|
|
+ List<String> collect = records.stream().map(InsOrders::getOrderno).collect(Collectors.toList());
|
|
|
+ Map<String, String> subOrderCountDTO = insAreaCompanyService.getSubOrderCountDTO(collect);
|
|
|
+
|
|
|
+ records.forEach(x -> {
|
|
|
+
|
|
|
+ if (InsOrderStatusEnum.ACCEPT_INSURANCE.getCode().equals(x.getOrderstatus())) {
|
|
|
+ JSONArray risk = x.getRisk();
|
|
|
+ List<RiskInfoVo> javaList = risk.toJavaList(RiskInfoVo.class);
|
|
|
+ javaList.forEach(RiskInfoVo::expirationTime);
|
|
|
+ JSONArray objects = JSON.parseArray(JSON.toJSONString(javaList));
|
|
|
+ x.setRisk(objects);
|
|
|
+ }
|
|
|
|
|
|
+ x.setSubOrderStatus(subOrderCountDTO);
|
|
|
+ });
|
|
|
+ }
|
|
|
return new BasePageResult<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize(), orderVoPage.getTotal(),
|
|
|
orderVoPage.getPages()
|
|
|
, orderVoPage.getRecords());
|