Commit cd26edff authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.5.1' into MVP1.5.1

parents 545bcb2c 9910a63d
...@@ -157,7 +157,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -157,7 +157,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
List<String> sourceIdCardList = new ArrayList<>(); List<String> sourceIdCardList = new ArrayList<>();
List<String> replaceIdList = new ArrayList<>(); List<String> replaceIdList = new ArrayList<>();
List<TInsuranceDetail> changeList = new ArrayList<>(); List<TInsuranceDetail> changeList = new ArrayList<>();
list.stream().forEach(e -> { list.forEach(e -> {
if (!LocalDateUtil.isOverdueDate(e.getPolicyEnd().toString())){ if (!LocalDateUtil.isOverdueDate(e.getPolicyEnd().toString())){
e.setIsOverdue(CommonConstants.ONE_INT); e.setIsOverdue(CommonConstants.ONE_INT);
e.setUpdateTime(LocalDateTime.now()); e.setUpdateTime(LocalDateTime.now());
...@@ -248,9 +248,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -248,9 +248,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
insuranceList = baseMapper.getInsuranceListPage(page,param); insuranceList = baseMapper.getInsuranceListPage(page,param);
// 购买月数 // 购买月数
if (CollectionUtils.isNotEmpty(insuranceList.getRecords())){ if (CollectionUtils.isNotEmpty(insuranceList.getRecords())){
insuranceList.getRecords().stream().forEach(e ->{ insuranceList.getRecords().forEach(e -> e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString())));
e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString()));
});
} }
return insuranceList; return insuranceList;
} }
...@@ -273,19 +271,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -273,19 +271,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if (Common.isNotNull(param.getAuthSql()) && param.getAuthSql().contains("1=2 CONCAT")) { if (Common.isNotNull(param.getAuthSql()) && param.getAuthSql().contains("1=2 CONCAT")) {
param.setAuthSql(param.getAuthSql().replace("1=2 CONCAT", "CONCAT")); param.setAuthSql(param.getAuthSql().replace("1=2 CONCAT", "CONCAT"));
} }
List<InsuranceListVO> insuranceList; List<InsuranceListVO> insuranceList = baseMapper.getInsuranceList(param);
insuranceList = baseMapper.getInsuranceList(param);
// 购买月数 // 购买月数
if (CollectionUtils.isNotEmpty(insuranceList)){ if (CollectionUtils.isNotEmpty(insuranceList)){
/*if(insuranceList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){ insuranceList.forEach(e -> e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString())));
return R.failed(InsurancesConstants.EXPORT_TOO_LONG); TInsuranceOperate tInsuranceOperate;
}*/
insuranceList.stream().forEach(e ->{
e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString()));
});
for (InsuranceListVO listVO : insuranceList) { for (InsuranceListVO listVO : insuranceList) {
if (CommonConstants.FOUR_INT == listVO.getBuyHandleStatus()) { if (CommonConstants.FOUR_INT == listVO.getBuyHandleStatus()) {
TInsuranceOperate tInsuranceOperate = tInsuranceOperateService.getOne(Wrappers.<TInsuranceOperate>query().lambda() tInsuranceOperate = tInsuranceOperateService.getOne(Wrappers.<TInsuranceOperate>query().lambda()
.eq(TInsuranceOperate::getInsuranceDetailId,listVO.getId()) .eq(TInsuranceOperate::getInsuranceDetailId,listVO.getId())
.eq(TInsuranceOperate::getDisplayFlag,CommonConstants.ONE_INT) .eq(TInsuranceOperate::getDisplayFlag,CommonConstants.ONE_INT)
.orderByDesc(TInsuranceOperate::getCreateTime) .orderByDesc(TInsuranceOperate::getCreateTime)
...@@ -325,9 +318,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -325,9 +318,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
IPage<InsuranceListVO> insuranceList = baseMapper.getInsuranceHandleListPage(page,param); IPage<InsuranceListVO> insuranceList = baseMapper.getInsuranceHandleListPage(page,param);
// 购买月数 // 购买月数
if (CollectionUtils.isNotEmpty(insuranceList.getRecords())){ if (CollectionUtils.isNotEmpty(insuranceList.getRecords())){
insuranceList.getRecords().stream().forEach(e ->{ insuranceList.getRecords().forEach(e -> e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString())));
e.setBuyMonth(LocalDateUtil.betweenMonth(e.getPolicyStart().toString(),e.getPolicyEnd().toString()));
});
} }
return insuranceList; return insuranceList;
} }
...@@ -526,7 +517,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -526,7 +517,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//保费都默认是0 //保费都默认是0
newDetail.setActualPremium(new BigDecimal("0.00")); newDetail.setActualPremium(new BigDecimal("0.00"));
newDetail.setEstimatePremium(new BigDecimal("0.00")); newDetail.setEstimatePremium(new BigDecimal("0.00"));
Boolean insert = this.save(newDetail); boolean insert = this.save(newDetail);
//替换记录 //替换记录
if (insert){ if (insert){
TInsuranceReplace replace = new TInsuranceReplace(); TInsuranceReplace replace = new TInsuranceReplace();
......
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