Commit 20bd06d7 authored by fangxinjiang's avatar fangxinjiang

见费出单逻辑-fxj

parent 9b54f8b0
...@@ -407,11 +407,11 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur ...@@ -407,11 +407,11 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
updateList.add(updatePre); updateList.add(updatePre);
} else { } else {
// 派单成功的 // 派单成功的 在各个口禅
//nonExistingList.add(pre) //nonExistingList.add(pre)
updatePre.setProcessStatus(CommonConstants.THREE_STRING); /*updatePre.setProcessStatus(CommonConstants.THREE_STRING);
updateList.add(updatePre); updateList.add(updatePre)*/;
} }
} }
if (!updateList.isEmpty()) { if (!updateList.isEmpty()) {
......
...@@ -140,6 +140,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -140,6 +140,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
@Resource @Resource
private SocialDaprUtils socialDaprUtils; private SocialDaprUtils socialDaprUtils;
@Resource
private ArchivesDaprUtil archivesDaprUtils;
@Resource @Resource
private MenuUtil menuUtil; private MenuUtil menuUtil;
@Resource @Resource
...@@ -1179,6 +1182,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1179,6 +1182,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if (CommonConstants.ZERO_STRING.equals(insuranceDetailVO.getIsJfcd())){ if (CommonConstants.ZERO_STRING.equals(insuranceDetailVO.getIsJfcd())){
insuranceDetailVO.setPremiumType(CommonConstants.ZERO_INT); insuranceDetailVO.setPremiumType(CommonConstants.ZERO_INT);
} }
//启用BPO结算模式的也是预估
if (null != insuranceDetailVO.getDeptNo()){
TSettleDomainSelectVo settleResult =archivesDaprUtils.selectDeptByNo(insuranceDetailVO.getDeptNo());
if (settleResult != null && CommonConstants.IS_TRUE.equals(settleResult.getBpoEnable()) ) {
insuranceDetailVO.setPremiumType(CommonConstants.ONE_INT);
}
}
long day = LocalDateUtil.betweenDay(insuranceDetailVO.getPolicyStart().toString(),insuranceDetailVO.getPolicyEnd().toString()); long day = LocalDateUtil.betweenDay(insuranceDetailVO.getPolicyStart().toString(),insuranceDetailVO.getPolicyEnd().toString());
long month = LocalDateUtil.betweenMonth(insuranceDetailVO.getPolicyStart().toString(),insuranceDetailVO.getPolicyEnd().toString()); long month = LocalDateUtil.betweenMonth(insuranceDetailVO.getPolicyStart().toString(),insuranceDetailVO.getPolicyEnd().toString());
String defaultSettleId = insuranceDetailVO.getDefaultSettleId(); String defaultSettleId = insuranceDetailVO.getDefaultSettleId();
...@@ -1696,7 +1706,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1696,7 +1706,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
TInsuranceDetail byId; TInsuranceDetail byId;
List<TInsuranceDetail> updList = new ArrayList<>(); List<TInsuranceDetail> updList = new ArrayList<>();
List<TInsuranceReplace> replaceList = new ArrayList<>(); List<TInsuranceReplace> replaceList = new ArrayList<>();
TInsuranceDetail newDetail;
TInsuranceDetail oldDetail;
for (TInsuranceDetail detail : detailList) { for (TInsuranceDetail detail : detailList) {
oldDetail = new TInsuranceDetail();
newDetail = new TInsuranceDetail();
BeanCopyUtils.copyProperties(detail,oldDetail);
BeanCopyUtils.copyProperties(detail,newDetail);
if (detail.getBuyHandleStatus() == CommonConstants.FOUR_INT if (detail.getBuyHandleStatus() == CommonConstants.FOUR_INT
|| detail.getBuyHandleStatus() == CommonConstants.FIVE_INT){ || detail.getBuyHandleStatus() == CommonConstants.FIVE_INT){
InsuranceListVO listVO = new InsuranceListVO(); InsuranceListVO listVO = new InsuranceListVO();
...@@ -1750,6 +1766,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1750,6 +1766,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
detail.setBuyHandleStatus(CommonConstants.FOUR_INT); detail.setBuyHandleStatus(CommonConstants.FOUR_INT);
detail.setPaymentTime(CommonConstants.EMPTY_STRING); detail.setPaymentTime(CommonConstants.EMPTY_STRING);
detail.setPaymentStatus(CommonConstants.ZERO_STRING); detail.setPaymentStatus(CommonConstants.ZERO_STRING);
//添加日志
newDetail.setPaymentTime(CommonConstants.EMPTY_STRING);
newDetail.setPaymentStatus(CommonConstants.ZERO_STRING);
tBusinessOperateService.saveModificationRecord(detail.getId(),oldDetail,newDetail,"投保退回更新缴费状态、缴费时间","EKP系统");
//投保成功后再次投保退回,需要将保单生效日期、是否有效、是否过期置为空 //投保成功后再次投保退回,需要将保单生效日期、是否有效、是否过期置为空
if (detail.getSignFlag() == CommonConstants.ONE_INT){ if (detail.getSignFlag() == CommonConstants.ONE_INT){
detail.setHandledTime(null); detail.setHandledTime(null);
......
...@@ -465,8 +465,8 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP ...@@ -465,8 +465,8 @@ public class TInsurancePreRenewDetailServiceImpl extends ServiceImpl<TInsuranceP
} else { } else {
// 派单成功的 // 派单成功的
updatePre.setProcessStatus(CommonConstants.THREE_STRING); /*updatePre.setProcessStatus(CommonConstants.THREE_STRING);
updateList.add(updatePre); updateList.add(updatePre);*/
} }
} }
if (!updateList.isEmpty()) { if (!updateList.isEmpty()) {
......
...@@ -685,7 +685,7 @@ ...@@ -685,7 +685,7 @@
t_insurance_detail a t_insurance_detail a
where where
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
and (a.BUY_HANDLE_STATUS in (1,2) or (a.BUY_HANDLE_STATUS = 3 and a.IS_EFFECT = 0 and a.IS_OVERDUE = 0)) and (a.BUY_HANDLE_STATUS in (1,2,6) or (a.BUY_HANDLE_STATUS = 3 and a.IS_EFFECT = 0 and a.IS_OVERDUE = 0))
AND EMP_IDCARD_NO = #{empIdCard} AND EMP_IDCARD_NO = #{empIdCard}
</select> </select>
...@@ -718,7 +718,7 @@ ...@@ -718,7 +718,7 @@
left join t_employee_insurance_pre b on a.id = b.insurances_id left join t_employee_insurance_pre b on a.id = b.insurances_id
where where
a.DELETE_FLAG = 0 a.DELETE_FLAG = 0
and (a.BUY_HANDLE_STATUS in (1,2) or (a.BUY_HANDLE_STATUS = 3 and a.IS_EFFECT = 0 and a.IS_OVERDUE = 0)) and (a.BUY_HANDLE_STATUS in (1,2,6) or (a.BUY_HANDLE_STATUS = 3 and a.IS_EFFECT = 0 and a.IS_OVERDUE = 0))
AND EMP_IDCARD_NO = #{empIdCard} and b.id is null AND EMP_IDCARD_NO = #{empIdCard} and b.id is null
group by a.id group by a.id
</select> </select>
......
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