|
|
@@ -359,63 +359,27 @@ public class InvReceivableServiceImpl implements InvReceivableService {
|
|
|
pageRequest.setPageNum(invSourceQueryVo.getPageNum());
|
|
|
pageRequest.setPageSize(invSourceQueryVo.getPageSize());
|
|
|
Page page = PageRequest.buildPageRequest(pageRequest);
|
|
|
- LambdaQueryWrapper<InvSource> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- if(invSourceQueryVo.getLicenseno() != null && !"".equals(invSourceQueryVo.getLicenseno())){
|
|
|
- queryWrapper.eq(InvSource::getLicenseno,invSourceQueryVo.getLicenseno());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getJqPolicyId() != null && !"".equals(invSourceQueryVo.getJqPolicyId())){
|
|
|
- queryWrapper.eq(InvSource::getJqPolicyId,invSourceQueryVo.getJqPolicyId());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getSyPolicyId() != null && !"".equals(invSourceQueryVo.getSyPolicyId())){
|
|
|
- queryWrapper.eq(InvSource::getSyPolicyId,invSourceQueryVo.getSyPolicyId());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getNonCarPolicyId() != null && !"".equals(invSourceQueryVo.getNonCarPolicyId())){
|
|
|
- queryWrapper.eq(InvSource::getNonCarPolicyId,invSourceQueryVo.getNonCarPolicyId());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getInsuranceId() != null && !"".equals(invSourceQueryVo.getInsuranceId())){
|
|
|
- queryWrapper.in(InvSource::getInsuranceId,invSourceQueryVo.getInsuranceId());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getRisk() != null && !"".equals(invSourceQueryVo.getRisk())){
|
|
|
- queryWrapper.eq(InvSource::getRisk,invSourceQueryVo.getRisk());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getInsuredName() != null && !"".equals(invSourceQueryVo.getInsuredName())){
|
|
|
- queryWrapper.like(InvSource::getInsuredName,invSourceQueryVo.getInsuredName());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getClearingTime() != null && !"".equals(invSourceQueryVo.getClearingTime())){
|
|
|
- String[] split = invSourceQueryVo.getClearingTime().split(",");
|
|
|
- queryWrapper.between(InvSource::getClearingTime,split[0],split[1]);
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getSigningTime() != null && !"".equals(invSourceQueryVo.getSigningTime())){
|
|
|
- String[] split = invSourceQueryVo.getSigningTime().split(",");
|
|
|
- queryWrapper.between(InvSource::getSigningTime,split[0],split[1]);
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getInsuranceDept() != null && !"".equals(invSourceQueryVo.getInsuranceDept())){
|
|
|
- queryWrapper.eq(InvSource::getInsuranceDept,invSourceQueryVo.getInsuranceDept());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getClearingState() != null && !"".equals(invSourceQueryVo.getClearingState()))
|
|
|
+ if(invSourceQueryVo.getSigningTime() != null && !"".equals(invSourceQueryVo.getSigningTime()))
|
|
|
{
|
|
|
- queryWrapper.eq(InvSource::getClearingState,invSourceQueryVo.getClearingState());
|
|
|
+ String[] split = invSourceQueryVo.getSigningTime().split(",");
|
|
|
+ invSourceQueryVo.setSigningTimeStartTime(split[0]);
|
|
|
+ invSourceQueryVo.setSigningTimeEndTime(split[1]);
|
|
|
}
|
|
|
- if(invSourceQueryVo.getInsuranceClearingState() != null && !"".equals(invSourceQueryVo.getInsuranceClearingState()))
|
|
|
+ if(invSourceQueryVo.getClearingTime() != null && !"".equals(invSourceQueryVo.getClearingTime()))
|
|
|
{
|
|
|
- queryWrapper.eq(InvSource::getInsuranceClearingState,invSourceQueryVo.getInsuranceClearingState());
|
|
|
+ String[] split1 = invSourceQueryVo.getClearingTime().split(",");
|
|
|
+ invSourceQueryVo.setClearingTimeStartTime(split1[0]);
|
|
|
+ invSourceQueryVo.setClearingTimeEndTime(split1[1]);
|
|
|
}
|
|
|
- Page pageData = invSourceMapper.selectPage(page, queryWrapper);
|
|
|
+
|
|
|
+
|
|
|
+ Page<InvSource> pageData = invSourceMapper.getRecivablePage(page, invSourceQueryVo);
|
|
|
List<InvSource> records = pageData.getRecords();
|
|
|
records.forEach(x->{
|
|
|
- if("0".equals(x.getClearingState())){
|
|
|
- x.setClearingState("未结算");
|
|
|
- }else if("1".equals(x.getClearingState()))
|
|
|
- {
|
|
|
- x.setClearingState("已结算");
|
|
|
- }
|
|
|
-
|
|
|
- if("0".equals(x.getInsuranceClearingState())){
|
|
|
- x.setInsuranceClearingState("未结算");
|
|
|
- }else if("1".equals(x.getInsuranceClearingState()))
|
|
|
- {
|
|
|
- x.setInsuranceClearingState("已结算");
|
|
|
- }
|
|
|
+ x.setClearingState("0".equals(x.getClearingState()) ? "未结算" : "1".equals(x.getClearingState()) ? "已结算" :
|
|
|
+ "2".equals(x.getClearingState()) ? "孤儿单" : x.getClearingState());
|
|
|
+ x.setInsuranceClearingState("0".equals(x.getInsuranceClearingState()) ? "未结算" :
|
|
|
+ "1".equals(x.getInsuranceClearingState()) ? "已结算" : x.getInsuranceClearingState());
|
|
|
});
|
|
|
pageData.setRecords(records);
|
|
|
return pageData;
|
|
|
@@ -423,54 +387,20 @@ public class InvReceivableServiceImpl implements InvReceivableService {
|
|
|
|
|
|
@Override
|
|
|
public List<InvSource> getRecivableList(InvSourceQueryVo invSourceQueryVo) {
|
|
|
- LambdaQueryWrapper<InvSource> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- if(invSourceQueryVo.getLicenseno() != null && !"".equals(invSourceQueryVo.getLicenseno())){
|
|
|
- queryWrapper.eq(InvSource::getLicenseno,invSourceQueryVo.getLicenseno());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getJqPolicyId() != null && !"".equals(invSourceQueryVo.getJqPolicyId())){
|
|
|
- queryWrapper.eq(InvSource::getJqPolicyId,invSourceQueryVo.getJqPolicyId());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getSyPolicyId() != null && !"".equals(invSourceQueryVo.getSyPolicyId())){
|
|
|
- queryWrapper.eq(InvSource::getSyPolicyId,invSourceQueryVo.getSyPolicyId());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getNonCarPolicyId() != null && !"".equals(invSourceQueryVo.getNonCarPolicyId())){
|
|
|
- queryWrapper.eq(InvSource::getNonCarPolicyId,invSourceQueryVo.getNonCarPolicyId());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getInsuranceId() != null && !"".equals(invSourceQueryVo.getInsuranceId())){
|
|
|
- queryWrapper.in(InvSource::getInsuranceId,invSourceQueryVo.getInsuranceId());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getRisk() != null && !"".equals(invSourceQueryVo.getRisk())){
|
|
|
- queryWrapper.eq(InvSource::getRisk,invSourceQueryVo.getRisk());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getInsuredName() != null && !"".equals(invSourceQueryVo.getInsuredName())){
|
|
|
- queryWrapper.like(InvSource::getInsuredName,invSourceQueryVo.getInsuredName());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getClearingTime() != null && !"".equals(invSourceQueryVo.getClearingTime())){
|
|
|
- String[] split = invSourceQueryVo.getClearingTime().split(",");
|
|
|
- queryWrapper.between(InvSource::getClearingTime,split[0],split[1]);
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getInsuranceDept() != null && !"".equals(invSourceQueryVo.getInsuranceDept())){
|
|
|
- queryWrapper.eq(InvSource::getInsuranceDept,invSourceQueryVo.getInsuranceDept());
|
|
|
- }
|
|
|
- if(invSourceQueryVo.getSigningTime() != null && !"".equals(invSourceQueryVo.getSigningTime())){
|
|
|
- String[] split = invSourceQueryVo.getSigningTime().split(",");
|
|
|
- queryWrapper.between(InvSource::getSigningTime,split[0],split[1]);
|
|
|
- }
|
|
|
- List<InvSource> pageData = invSourceMapper.selectList(queryWrapper);
|
|
|
- pageData.forEach(x->{
|
|
|
- if("0".equals(x.getClearingState())){
|
|
|
- x.setClearingState("未结算");
|
|
|
- }else if("1".equals(x.getClearingState()))
|
|
|
- {
|
|
|
- x.setClearingState("已结算");
|
|
|
- }
|
|
|
+ String[] split = invSourceQueryVo.getSigningTime().split(",");
|
|
|
+ invSourceQueryVo.setSigningTimeStartTime(split[0]);
|
|
|
+ invSourceQueryVo.setSigningTimeEndTime(split[1]);
|
|
|
|
|
|
- if("0".equals(x.getInsuranceClearingState())){
|
|
|
- x.setInsuranceClearingState("未结算");
|
|
|
- }else if("1".equals(x.getInsuranceClearingState()))
|
|
|
- {
|
|
|
- x.setInsuranceClearingState("已结算");
|
|
|
- }
|
|
|
+ String[] split1 = invSourceQueryVo.getClearingTime().split(",");
|
|
|
+ invSourceQueryVo.setClearingTimeStartTime(split1[0]);
|
|
|
+ invSourceQueryVo.setClearingTimeEndTime(split1[1]);
|
|
|
+
|
|
|
+ List<InvSource> pageData = invSourceMapper.getRecivableList(invSourceQueryVo);
|
|
|
+ pageData.forEach(x->{
|
|
|
+ x.setClearingState("0".equals(x.getClearingState()) ? "未结算" : "1".equals(x.getClearingState()) ? "已结算" :
|
|
|
+ "2".equals(x.getClearingState()) ? "孤儿单" : x.getClearingState());
|
|
|
+ x.setInsuranceClearingState("0".equals(x.getInsuranceClearingState()) ? "未结算" :
|
|
|
+ "1".equals(x.getInsuranceClearingState()) ? "已结算" : x.getInsuranceClearingState());
|
|
|
});
|
|
|
return pageData;
|
|
|
}
|
|
|
@@ -725,8 +655,8 @@ public class InvReceivableServiceImpl implements InvReceivableService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public int dataMatching() {
|
|
|
- Integer data = invSourceMapper.dataMatching();
|
|
|
+ public List<String> dataMatching() {
|
|
|
+ List<String> data = invSourceMapper.dataMatching();
|
|
|
return data;
|
|
|
}
|
|
|
|