Commit 5cf23380 by zhangxingmin

push

parent bb53bfbe
...@@ -344,6 +344,7 @@ public class ApiCommissionExpectedController { ...@@ -344,6 +344,7 @@ public class ApiCommissionExpectedController {
public Result<ReceivableReportResponse> receivableReport(@RequestBody CommissionExpectedQueryRequest commissionExpectedQueryRequest) { public Result<ReceivableReportResponse> receivableReport(@RequestBody CommissionExpectedQueryRequest commissionExpectedQueryRequest) {
//保單持有人(中/英、繁简/大小写)、签单人、转介人名称(主)、受保人(中/英、繁简/大小写)、查询保单号列表 //保單持有人(中/英、繁简/大小写)、签单人、转介人名称(主)、受保人(中/英、繁简/大小写)、查询保单号列表
List<String> queryPolicyNoList = new ArrayList<>(); List<String> queryPolicyNoList = new ArrayList<>();
Boolean queryFlag = false;
if (StringUtils.isNotBlank(commissionExpectedQueryRequest.getPolicyHolder()) if (StringUtils.isNotBlank(commissionExpectedQueryRequest.getPolicyHolder())
|| StringUtils.isNotBlank(commissionExpectedQueryRequest.getSigner()) || StringUtils.isNotBlank(commissionExpectedQueryRequest.getSigner())
|| StringUtils.isNotBlank(commissionExpectedQueryRequest.getBrokerName()) || StringUtils.isNotBlank(commissionExpectedQueryRequest.getBrokerName())
...@@ -354,10 +355,12 @@ public class ApiCommissionExpectedController { ...@@ -354,10 +355,12 @@ public class ApiCommissionExpectedController {
commissionExpectedQueryRequest.getSigner(), commissionExpectedQueryRequest.getSigner(),
commissionExpectedQueryRequest.getBrokerName(), commissionExpectedQueryRequest.getBrokerName(),
commissionExpectedQueryRequest.getInsured()); commissionExpectedQueryRequest.getInsured());
queryFlag = true;
} }
log.info("应收款报表=>receivableReport=>queryPolicyNoList:{}",JSON.toJSONString(queryPolicyNoList)); log.info("应收款报表=>receivableReport=>queryPolicyNoList:{}",JSON.toJSONString(queryPolicyNoList));
// 构建查询条件 // 构建查询条件
commissionExpectedQueryRequest.setPolicyNoList(queryPolicyNoList); commissionExpectedQueryRequest.setPolicyNoList(queryPolicyNoList);
commissionExpectedQueryRequest.setQueryFlag(queryFlag);
QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest); QueryWrapper<CommissionExpected> queryWrapper = commissionExpectedService.getQueryWrapper(commissionExpectedQueryRequest);
// 先查询所有符合条件的记录ID(用于统计) // 先查询所有符合条件的记录ID(用于统计)
......
...@@ -105,4 +105,6 @@ public class CommissionExpectedQueryRequest extends PageDto { ...@@ -105,4 +105,6 @@ public class CommissionExpectedQueryRequest extends PageDto {
private List<String> policyNoList; private List<String> policyNoList;
private Boolean queryFlag;
} }
...@@ -638,8 +638,10 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte ...@@ -638,8 +638,10 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
if (CollectionUtils.isNotEmpty(commissionExpectedQueryRequest.getPolicyNoList())) { if (CollectionUtils.isNotEmpty(commissionExpectedQueryRequest.getPolicyNoList())) {
queryWrapper.in(CollectionUtils.isNotEmpty(commissionExpectedQueryRequest.getPolicyNoList()),"policy_no",commissionExpectedQueryRequest.getPolicyNoList()); queryWrapper.in(CollectionUtils.isNotEmpty(commissionExpectedQueryRequest.getPolicyNoList()),"policy_no",commissionExpectedQueryRequest.getPolicyNoList());
}else { }else {
//查询不到数据 if (commissionExpectedQueryRequest.getQueryFlag()) {
queryWrapper.apply("1=0"); //查询不到数据
queryWrapper.apply("1=0");
}
} }
// 范围查询 // 范围查询
......
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