Commit 08a0ad97 authored by fangxinjiang's avatar fangxinjiang

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

parents d109508f 997f4abc
...@@ -2471,13 +2471,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -2471,13 +2471,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//当两次发票号不一致时 //当两次发票号不一致时
if (Common.isNotNull(success.getInvoiceNo()) && !success.getInvoiceNo().equals(detail.getInvoiceNo())){ if (Common.isNotNull(success.getInvoiceNo()) && !success.getInvoiceNo().equals(detail.getInvoiceNo())){
invoiceNoFlag = true; invoiceNoFlag = true;
invoiceNoInfo = ";变更前发票号:" + detail.getInvoiceNo() + ";变更后发票号:" + success.getInvoiceNo(); invoiceNoInfo = ";变更前发票号:" + (Common.isEmpty(detail.getInvoiceNo()) ? "":detail.getInvoiceNo())
+ ";变更后发票号:" + success.getInvoiceNo();
detail.setInvoiceNo(success.getInvoiceNo()); detail.setInvoiceNo(success.getInvoiceNo());
} }
//当两次保单号不一致时 //当两次保单号不一致时
if (Common.isNotNull(success.getPolicyNo()) && !success.getPolicyNo().equals(detail.getPolicyNo())){ if (Common.isNotNull(success.getPolicyNo()) && !success.getPolicyNo().equals(detail.getPolicyNo())){
policeNoFlag = true; policeNoFlag = true;
policeNoInfo = ";变更前保单号:" + detail.getPolicyNo() + ";变更后保单号:" + success.getPolicyNo(); policeNoInfo = ";变更前保单号:" + (Common.isEmpty(detail.getPolicyNo()) ? "":detail.getPolicyNo())
+ ";变更后保单号:" + success.getPolicyNo();
detail.setPolicyNo(success.getPolicyNo()); detail.setPolicyNo(success.getPolicyNo());
} }
detailList.add(detail); detailList.add(detail);
......
...@@ -44,7 +44,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils; ...@@ -44,7 +44,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
import com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils; import com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils;
import com.yifu.cloud.plus.v1.yifu.social.constants.HouseConfigConstants; import com.yifu.cloud.plus.v1.yifu.social.constants.HouseConfigConstants;
import com.yifu.cloud.plus.v1.yifu.social.entity.*; import com.yifu.cloud.plus.v1.yifu.social.entity.*;
import com.yifu.cloud.plus.v1.yifu.social.mapper.SysBaseSetInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoMapper; import com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.*; import com.yifu.cloud.plus.v1.yifu.social.service.*;
import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialHouseholdExportVo; import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialHouseholdExportVo;
...@@ -530,6 +529,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -530,6 +529,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
holdInfo.setAuditUser(hold.getAuditUser()); holdInfo.setAuditUser(hold.getAuditUser());
holdInfo.setHandleUser(hold.getHandleUser()); holdInfo.setHandleUser(hold.getHandleUser());
holdInfo.setAreaCode(hold.getAreaCode()); holdInfo.setAreaCode(hold.getAreaCode());
holdInfo.setAddRosterTempYgs(hold.getAddRosterTempYgs());
holdInfo.setAddRosterTempYsd(hold.getAddRosterTempYsd());
holdInfo.setReduceRosterTempYgs(hold.getReduceRosterTempYgs());
holdInfo.setReduceRosterTempYsd(hold.getReduceRosterTempYsd());
if (Common.isNotNull(hold.getResList()) && hold.getResList().size() > 0) { if (Common.isNotNull(hold.getResList()) && hold.getResList().size() > 0) {
hold.getResList().forEach(e -> { hold.getResList().forEach(e -> {
e.setReasonKey(null); e.setReasonKey(null);
...@@ -1541,6 +1544,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -1541,6 +1544,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isEmpty(oldInfo.getCity()) && Common.isEmpty(info.getCity())) { if (Common.isEmpty(oldInfo.getCity()) && Common.isEmpty(info.getCity())) {
oldInfo.setCity(info.getCity()); oldInfo.setCity(info.getCity());
} }
oldInfo.setAddRosterTempYgs(info.getAddRosterTempYgs());
oldInfo.setAddRosterTempYsd(info.getAddRosterTempYsd());
oldInfo.setReduceRosterTempYgs(info.getReduceRosterTempYgs());
oldInfo.setReduceRosterTempYsd(info.getReduceRosterTempYsd());
//判断户的省市县是否一致,不一致,则更新对应户基数配置的区域信息 //判断户的省市县是否一致,不一致,则更新对应户基数配置的区域信息
boolean changeFlag = false; boolean changeFlag = false;
if (!oldInfo.getProvince().equals(info.getProvince()) if (!oldInfo.getProvince().equals(info.getProvince())
......
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