Commit 3132739c authored by fangxinjiang's avatar fangxinjiang

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

parents c34973fc 685056be
...@@ -703,6 +703,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -703,6 +703,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
} }
} }
} else { } else {
employeeRegistrationPre.setInsuranceIsBuy("");
// 2:保存时不存在商险类型,判断是否有不可删除的数据,有则拒绝: // 2:保存时不存在商险类型,判断是否有不可删除的数据,有则拒绝:
if (oldList != null && !oldList.isEmpty()) { if (oldList != null && !oldList.isEmpty()) {
for (TEmployeeInsurancePre oldInsurance: oldList) { for (TEmployeeInsurancePre oldInsurance: oldList) {
......
...@@ -246,8 +246,12 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -246,8 +246,12 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
// 是否修改了商险 // 是否修改了商险
boolean isModifyInsurance = false; boolean isModifyInsurance = false;
TEmployeeInsurancePre oldInsurance; TEmployeeInsurancePre oldInsurance;
String differenceInsuranceKey;
TEmployeePreLogDetail detailInsuranceLog; TEmployeePreLogDetail detailInsuranceLog;
String differenceInsuranceKey;
//如果服务类型包含商险处理商险明细数据
newInfo.setId(empPreId);
if (Common.isNotNull(newInfo.getServerItem()) && newInfo.getServerItem().contains("商险")) {
//是否已购买商险单独加日志
if (Common.isEmpty(isBuyOld) || (Common.isNotNull(isBuyOld) && !isBuyOld.equals(isBuyNew))) { if (Common.isEmpty(isBuyOld) || (Common.isNotNull(isBuyOld) && !isBuyOld.equals(isBuyNew))) {
//单独记录是否已购买商险的变更记录 //单独记录是否已购买商险的变更记录
differenceInsuranceKey = "insuranceIsBuy"; differenceInsuranceKey = "insuranceIsBuy";
...@@ -262,9 +266,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -262,9 +266,6 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
isModifyInsurance = true; isModifyInsurance = true;
detailList.add(detailInsuranceLog); detailList.add(detailInsuranceLog);
} }
//如果服务类型包含商险处理商险明细数据
newInfo.setId(empPreId);
if (Common.isNotNull(newInfo.getServerItem()) && newInfo.getServerItem().contains("商险")) {
if (!newInfo.getExitInsuranceInfoList().isEmpty()) { if (!newInfo.getExitInsuranceInfoList().isEmpty()) {
newInfo.getExitInsuranceInfoList().forEach(insurancePreVo -> insurancePreVo.setRegisterId(empPreId)); newInfo.getExitInsuranceInfoList().forEach(insurancePreVo -> insurancePreVo.setRegisterId(empPreId));
} }
......
...@@ -472,10 +472,14 @@ public class InsurancesConstants { ...@@ -472,10 +472,14 @@ public class InsurancesConstants {
* 商险已结算,无法登记保单保费 * 商险已结算,无法登记保单保费
*/ */
public static final String SETTLE_HANDLE_THREE_NOT_REGISTERED = "商险已结算,无法登记保单保费"; public static final String SETTLE_HANDLE_THREE_NOT_REGISTERED = "商险已结算,无法登记保单保费";
/**
* 商险支出中,无法登记保单保费
*/
public static final String PAY_SETTLE_ONE_NOT_REGISTERED = "商险支出中,无法登记保单保费";
/** /**
* 商险已支出,无法登记保单保费 * 商险已支出,无法登记保单保费
*/ */
public static final String PAY_SETTLE_NOT_REGISTERED = "商险已支出,无法登记保单保费"; public static final String PAY_SETTLE_TWO_NOT_REGISTERED = "商险已支出,无法登记保单保费";
/** /**
* 保单号不存在或已过期 * 保单号不存在或已过期
*/ */
......
...@@ -4123,14 +4123,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -4123,14 +4123,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
} }
// 商险已支出,无法登记保单保费 // 商险已支出,无法登记保单保费
if(Common.isNotNull(settleStatus.getPayStatus()) && InsurancesConstants.SETTLE_TWO.equals(settleStatus.getPayStatus())) { if(Common.isNotNull(settleStatus.getPayStatus())) {
param.setErrorMessage(InsurancesConstants.PAY_SETTLE_NOT_REGISTERED); //保费更新或者保单号发票号更新
if (InsurancesConstants.SETTLE_TWO.equals(settleStatus.getPayStatus())) {
param.setErrorMessage(InsurancesConstants.PAY_SETTLE_TWO_NOT_REGISTERED);
continue;
}
if (InsurancesConstants.SETTLE_ONE.equals(settleStatus.getPayStatus())) {
param.setErrorMessage(InsurancesConstants.PAY_SETTLE_ONE_NOT_REGISTERED);
continue; continue;
} }
} }
} }
} }
} }
}
param.setErrorMessage(CommonConstants.RESULT_DATA_SUCESS); param.setErrorMessage(CommonConstants.RESULT_DATA_SUCESS);
param.setFlag(CommonConstants.ZERO_STRING); param.setFlag(CommonConstants.ZERO_STRING);
//所有校验通过后设置查到的结果 //所有校验通过后设置查到的结果
......
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