Commit 7638d8a2 authored by hongguangwu's avatar hongguangwu

MVP1.7.9-去除空

parent 3c8571cd
...@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain; import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
...@@ -2195,7 +2196,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2195,7 +2196,12 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
while (true) { while (true) {
pageInfo = new Page<>(page, pageSize); pageInfo = new Page<>(page, pageSize);
batch = socialFundInfoMapper.selectPage(pageInfo, batch = socialFundInfoMapper.selectPage(pageInfo,
Wrappers.<TSocialFundInfo>query().lambda()).getRecords(); Wrappers.<TSocialFundInfo>query().lambda()
.and(obj -> obj.isNotNull(TSocialFundInfo::getSettleDomainCode)
.or()
.isNotNull(TSocialFundInfo::getSettleDomainCodeFund)
)
).getRecords();
if (batch == null || batch.isEmpty()) { if (batch == null || batch.isEmpty()) {
break; // 明确退出条件 break; // 明确退出条件
......
...@@ -958,249 +958,251 @@ public class DoJointSocialTask { ...@@ -958,249 +958,251 @@ public class DoJointSocialTask {
List<EkpPushSocialParam> insertList = new ArrayList<>(); List<EkpPushSocialParam> insertList = new ArrayList<>();
try { try {
for (TForecastLibrary library : unPushInfo) { for (TForecastLibrary library : unPushInfo) {
//获取项目信息 if (Common.isNotNull(library.getDeptNo())) {
settleDomain = selectVoMap.get(library.getDeptNo()); //获取项目信息
if (Common.isEmpty(settleDomain)) { settleDomain = selectVoMap.get(library.getDeptNo());
// 抛出异常错误,通过邮件提醒处理 if (Common.isEmpty(settleDomain)) {
log.error("获取结算主体("+library.getDeptNo()+")异常,请检查传参和档案服务状态!"); // 抛出异常错误,通过邮件提醒处理
continue; log.error("获取结算主体(" + library.getDeptNo() + ")异常,请检查传参和档案服务状态!");
//ServiceUtil.runTimeExceptionDiy("获取结算主体异常,请检查传参和档案服务状态!"); continue;
} //ServiceUtil.runTimeExceptionDiy("获取结算主体异常,请检查传参和档案服务状态!");
if (CommonConstants.ZERO_STRING.equals(settleDomain.getSocialType())) { }
continue; if (CommonConstants.ZERO_STRING.equals(settleDomain.getSocialType())) {
} continue;
socialParam = new EkpPushSocialParam(); }
//员工姓名 socialParam = new EkpPushSocialParam();
socialParam.setFd_3adfe8c79989d4(library.getEmpName()); //员工姓名
//员工身份证 socialParam.setFd_3adfe8c79989d4(library.getEmpName());
socialParam.setFd_3adfe8c7e4cf7a(library.getEmpIdcard()); //员工身份证
//单位养老金额 socialParam.setFd_3adfe8c7e4cf7a(library.getEmpIdcard());
if (Common.isNotNull(library.getUnitPensionFee())) { //单位养老金额
socialParam.setFd_3af9ec80a9de7a(library.getUnitPensionFee().toString()); if (Common.isNotNull(library.getUnitPensionFee())) {
} else { socialParam.setFd_3af9ec80a9de7a(library.getUnitPensionFee().toString());
socialParam.setFd_3af9ec80a9de7a(CommonConstants.EMPTY_STRING);
}
//单位医疗金额
if (Common.isNotNull(library.getUnitMedicalFee())) {
socialParam.setFd_3af9eba5899c90(library.getUnitMedicalFee().toString());
} else {
socialParam.setFd_3af9eba5899c90(CommonConstants.EMPTY_STRING);
}
//单位工伤金额
if (Common.isNotNull(library.getUnitWorkInjuryFee())) {
socialParam.setFd_3af9eba684f592(library.getUnitWorkInjuryFee().toString());
} else {
socialParam.setFd_3af9eba684f592(CommonConstants.EMPTY_STRING);
}
//单位失业金额
if (Common.isNotNull(library.getUnitUnemploymentFee())) {
socialParam.setFd_3af9eba5f6e19e(library.getUnitUnemploymentFee().toString());
} else {
socialParam.setFd_3af9eba5f6e19e(CommonConstants.EMPTY_STRING);
}
//单位生育金额
if (Common.isNotNull(library.getUnitBirthFee())) {
socialParam.setFd_3af9eba71c0138(library.getUnitBirthFee().toString());
} else {
socialParam.setFd_3af9eba71c0138(CommonConstants.EMPTY_STRING);
}
//单位大病金额
if (Common.isNotNull(library.getUnitBitailmentFee())) {
socialParam.setFd_3af9eba863c0ee(library.getUnitBitailmentFee().toString());
} else {
socialParam.setFd_3af9eba863c0ee(CommonConstants.EMPTY_STRING);
}
//个人养老金额
if (Common.isNotNull(library.getPersonalPensionFee())) {
socialParam.setFd_3af9ebbd791662(library.getPersonalPensionFee().toString());
} else {
socialParam.setFd_3af9ebbd791662(CommonConstants.EMPTY_STRING);
}
//个人医疗金额
if (Common.isNotNull(library.getPersonalMedicalFee())) {
socialParam.setFd_3af9ebbdd9797e(library.getPersonalMedicalFee().toString());
} else {
socialParam.setFd_3af9ebbdd9797e(CommonConstants.EMPTY_STRING);
}
//单位社保合计
if (Common.isNotNull(library.getUnitSocialSum())) {
socialParam.setFd_3adfeb4e8064a8(library.getUnitSocialSum().toString());
} else {
socialParam.setFd_3adfeb4e8064a8(CommonConstants.EMPTY_STRING);
}
//个人社保合计
if (Common.isNotNull(library.getPersonalSocialSum())) {
socialParam.setFd_3adfeb52a4d2e2(library.getPersonalSocialSum().toString());
} else {
socialParam.setFd_3adfeb52a4d2e2(CommonConstants.EMPTY_STRING);
}
//预估个人大病救助
if (Common.isNotNull(library.getPersonalBigailmentFee())) {
socialParam.setFd_3af9ebbf3e8be2(library.getPersonalBigailmentFee().toString());
} else {
socialParam.setFd_3af9ebbf3e8be2(CommonConstants.EMPTY_STRING);
}
//预估个人失业
if (Common.isNotNull(library.getPersonalUnemploymentFee())) {
socialParam.setFd_3af9ebbe29ce1c(library.getPersonalUnemploymentFee().toString());
} else {
socialParam.setFd_3af9ebbe29ce1c(CommonConstants.EMPTY_STRING);
}
//结算状态
if (Common.isNotNull(library.getSalarySocialFlag())) {
if (CommonConstants.ONE_STRING.equals(library.getSalarySocialFlag())) {
socialParam.setFd_3add9ea428879a(CommonConstants.SALARY_ISFLAG);
} else { } else {
socialParam.setFd_3add9ea428879a(CommonConstants.SALARY_UNFLAG); socialParam.setFd_3af9ec80a9de7a(CommonConstants.EMPTY_STRING);
} }
} else { //单位医疗金额
socialParam.setFd_3add9ea428879a(CommonConstants.EMPTY_STRING); if (Common.isNotNull(library.getUnitMedicalFee())) {
} socialParam.setFd_3af9eba5899c90(library.getUnitMedicalFee().toString());
//社保缴纳月份 } else {
if (Common.isNotNull(library.getSocialPayMonth())) { socialParam.setFd_3af9eba5899c90(CommonConstants.EMPTY_STRING);
socialParam.setFd_3adfe8cf632700(dateStringInsert(library.getSocialPayMonth())); }
} else { //单位工伤金额
socialParam.setFd_3adfe8cf632700(CommonConstants.EMPTY_STRING); if (Common.isNotNull(library.getUnitWorkInjuryFee())) {
} socialParam.setFd_3af9eba684f592(library.getUnitWorkInjuryFee().toString());
//社保生成月份 } else {
if (Common.isNotNull(library.getSocialCreateMonth())) { socialParam.setFd_3af9eba684f592(CommonConstants.EMPTY_STRING);
socialParam.setFd_3adfe8cb96c41e(library.getSocialCreateMonth()); }
} else { //单位失业金额
socialParam.setFd_3adfe8cb96c41e(CommonConstants.EMPTY_STRING); if (Common.isNotNull(library.getUnitUnemploymentFee())) {
} socialParam.setFd_3af9eba5f6e19e(library.getUnitUnemploymentFee().toString());
//订单类型 } else {
socialParam.setFd_3add9dd7833db8(SocialConstants.DIFF_TYPE_ONE); socialParam.setFd_3af9eba5f6e19e(CommonConstants.EMPTY_STRING);
//是否有预估 }
socialParam.setFd_3add9de0be85e4(CommonConstants.IS_TRUE); //单位生育金额
//与工资合并结算 if (Common.isNotNull(library.getUnitBirthFee())) {
socialParam.setFd_3add9e1a670144(CommonConstants.IS_FALSE); socialParam.setFd_3af9eba71c0138(library.getUnitBirthFee().toString());
//项目编码 } else {
socialParam.setFd_3adfe8c70d3fd4(library.getDeptNo()); socialParam.setFd_3af9eba71c0138(CommonConstants.EMPTY_STRING);
//项目名称 }
socialParam.setFd_3adfe8c8468e54(library.getDeptName()); //单位大病金额
//项目编码-原 fxj 20240527 add if (Common.isNotNull(library.getUnitBitailmentFee())) {
socialParam.setFd_3cfe2da7e35daa(library.getDeptNo()); socialParam.setFd_3af9eba863c0ee(library.getUnitBitailmentFee().toString());
//项目名称-原 fxj 20240527 add } else {
socialParam.setFd_3cfe2db5015d6e(library.getDeptName()); socialParam.setFd_3af9eba863c0ee(CommonConstants.EMPTY_STRING);
//单号 }
socialParam.setFd_3adfe95c169c48(CommonConstants.EMPTY_STRING); //个人养老金额
//客户编码 if (Common.isNotNull(library.getPersonalPensionFee())) {
if (Common.isNotNull(settleDomain.getCustomerNo())) { socialParam.setFd_3af9ebbd791662(library.getPersonalPensionFee().toString());
socialParam.setFd_3adfe8c73cb5a4(settleDomain.getCustomerNo()); } else {
} else { socialParam.setFd_3af9ebbd791662(CommonConstants.EMPTY_STRING);
socialParam.setFd_3adfe8c73cb5a4(CommonConstants.EMPTY_STRING); }
} //个人医疗金额
//客户名称 if (Common.isNotNull(library.getPersonalMedicalFee())) {
if (Common.isNotNull(settleDomain.getCustomerName())) { socialParam.setFd_3af9ebbdd9797e(library.getPersonalMedicalFee().toString());
socialParam.setFd_3adfe8c81a0e42(settleDomain.getCustomerName()); } else {
} else { socialParam.setFd_3af9ebbdd9797e(CommonConstants.EMPTY_STRING);
socialParam.setFd_3adfe8c81a0e42(CommonConstants.EMPTY_STRING); }
} //单位社保合计
//是否为BPO业务 if (Common.isNotNull(library.getUnitSocialSum())) {
if (Common.isNotNull(settleDomain.getBpoFlag())) { socialParam.setFd_3adfeb4e8064a8(library.getUnitSocialSum().toString());
socialParam.setFd_3b178dfcf9e3e6(settleDomain.getBpoFlag()); } else {
} else { socialParam.setFd_3adfeb4e8064a8(CommonConstants.EMPTY_STRING);
socialParam.setFd_3b178dfcf9e3e6(CommonConstants.EMPTY_STRING); }
} //个人社保合计
//社保户 if (Common.isNotNull(library.getPersonalSocialSum())) {
if (Common.isNotNull(library.getSocialHouseholdName())) { socialParam.setFd_3adfeb52a4d2e2(library.getPersonalSocialSum().toString());
socialParam.setFd_3aeafa25916e82(library.getSocialHouseholdName()); } else {
} else { socialParam.setFd_3adfeb52a4d2e2(CommonConstants.EMPTY_STRING);
socialParam.setFd_3aeafa25916e82(CommonConstants.EMPTY_STRING); }
} //预估个人大病救助
//结算月份 if (Common.isNotNull(library.getPersonalBigailmentFee())) {
socialParam.setFd_3adfe8cff746bc(CommonConstants.EMPTY_STRING); socialParam.setFd_3af9ebbf3e8be2(library.getPersonalBigailmentFee().toString());
//单位差异 } else {
socialParam.setFd_3adfeb53c70f72(CommonConstants.EMPTY_STRING); socialParam.setFd_3af9ebbf3e8be2(CommonConstants.EMPTY_STRING);
//个人差异 }
socialParam.setFd_3adfeb5413fb44(CommonConstants.EMPTY_STRING); //预估个人失业
//应收 if (Common.isNotNull(library.getPersonalUnemploymentFee())) {
socialParam.setFd_3adfeb7b624f06(CommonConstants.EMPTY_STRING); socialParam.setFd_3af9ebbe29ce1c(library.getPersonalUnemploymentFee().toString());
//收款状态 } else {
socialParam.setFd_3add9eaeed2560(CommonConstants.EMPTY_STRING); socialParam.setFd_3af9ebbe29ce1c(CommonConstants.EMPTY_STRING);
//结算单号 }
socialParam.setFd_3adfeb830523b6(CommonConstants.EMPTY_STRING); //结算状态
//收款单号 if (Common.isNotNull(library.getSalarySocialFlag())) {
socialParam.setFd_3adfeb8489e6c2(CommonConstants.EMPTY_STRING); if (CommonConstants.ONE_STRING.equals(library.getSalarySocialFlag())) {
//应支出 socialParam.setFd_3add9ea428879a(CommonConstants.SALARY_ISFLAG);
socialParam.setFd_3adfeb7bd97464(CommonConstants.EMPTY_STRING); } else {
//支出结算状态 socialParam.setFd_3add9ea428879a(CommonConstants.SALARY_UNFLAG);
socialParam.setFd_3add9edfbc6f7e(CommonConstants.EMPTY_STRING); }
//付款状态 } else {
socialParam.setFd_3add9eed23894a(CommonConstants.EMPTY_STRING); socialParam.setFd_3add9ea428879a(CommonConstants.EMPTY_STRING);
//支出缴纳单号 }
socialParam.setFd_3adfeb83a704c8(CommonConstants.EMPTY_STRING); //社保缴纳月份
//实缴单位生育 if (Common.isNotNull(library.getSocialPayMonth())) {
socialParam.setFd_3af9ee3afb34c2(CommonConstants.EMPTY_STRING); socialParam.setFd_3adfe8cf632700(dateStringInsert(library.getSocialPayMonth()));
//付款单号 } else {
socialParam.setFd_3adfeb84175f28(CommonConstants.EMPTY_STRING); socialParam.setFd_3adfe8cf632700(CommonConstants.EMPTY_STRING);
//实缴个人合计 }
socialParam.setFd_3af9ee3cb6d4fa(CommonConstants.EMPTY_STRING); //社保生成月份
//预估合计 if (Common.isNotNull(library.getSocialCreateMonth())) {
if (Common.isNotNull(library.getSumAll())) { socialParam.setFd_3adfe8cb96c41e(library.getSocialCreateMonth());
socialParam.setFd_3af9ed7e813b86(library.getSumAll().toString()); } else {
} else { socialParam.setFd_3adfe8cb96c41e(CommonConstants.EMPTY_STRING);
socialParam.setFd_3af9ed7e813b86(CommonConstants.EMPTY_STRING); }
} //订单类型
//实缴单位合计 socialParam.setFd_3add9dd7833db8(SocialConstants.DIFF_TYPE_ONE);
socialParam.setFd_3af9ee3c0bf286(CommonConstants.EMPTY_STRING); //是否有预估
//实缴个人补缴利息 socialParam.setFd_3add9de0be85e4(CommonConstants.IS_TRUE);
socialParam.setFd_3af9ee3d634946(CommonConstants.EMPTY_STRING); //与工资合并结算
//实缴单位医疗 socialParam.setFd_3add9e1a670144(CommonConstants.IS_FALSE);
socialParam.setFd_3af9ee39dea6a8(CommonConstants.EMPTY_STRING); //项目编码
//预估个人补缴利息 socialParam.setFd_3adfe8c70d3fd4(library.getDeptNo());
if (Common.isNotNull(library.getPersonalInterestFee())) { //项目名称
socialParam.setFd_3af9ebbecc4aa8(library.getPersonalInterestFee().toString()); socialParam.setFd_3adfe8c8468e54(library.getDeptName());
} else { //项目编码-原 fxj 20240527 add
socialParam.setFd_3af9ebbecc4aa8(CommonConstants.EMPTY_STRING); socialParam.setFd_3cfe2da7e35daa(library.getDeptNo());
} //项目名称-原 fxj 20240527 add
//预估单位补缴利息 socialParam.setFd_3cfe2db5015d6e(library.getDeptName());
if (Common.isNotNull(library.getUnitInterestFee())) { //单号
socialParam.setFd_3af9eba7c3da5e(library.getUnitInterestFee().toString()); socialParam.setFd_3adfe95c169c48(CommonConstants.EMPTY_STRING);
} else { //客户编码
socialParam.setFd_3af9eba7c3da5e(CommonConstants.EMPTY_STRING); if (Common.isNotNull(settleDomain.getCustomerNo())) {
} socialParam.setFd_3adfe8c73cb5a4(settleDomain.getCustomerNo());
//实缴单位养老 } else {
socialParam.setFd_3af9ee3938170a(CommonConstants.EMPTY_STRING); socialParam.setFd_3adfe8c73cb5a4(CommonConstants.EMPTY_STRING);
//实缴个人失业 }
socialParam.setFd_3af9ee3db44d96(CommonConstants.EMPTY_STRING); //客户名称
//实缴单位补缴利息 if (Common.isNotNull(settleDomain.getCustomerName())) {
socialParam.setFd_3af9ee3b5ddae8(CommonConstants.EMPTY_STRING); socialParam.setFd_3adfe8c81a0e42(settleDomain.getCustomerName());
//实缴单位大病救助 } else {
socialParam.setFd_3af9ee3ba76f54(CommonConstants.EMPTY_STRING); socialParam.setFd_3adfe8c81a0e42(CommonConstants.EMPTY_STRING);
//实缴单位工伤 }
socialParam.setFd_3af9ee3aa9c84a(CommonConstants.EMPTY_STRING); //是否为BPO业务
//实缴合计 if (Common.isNotNull(settleDomain.getBpoFlag())) {
socialParam.setFd_3af9ee3c6bfc74(CommonConstants.EMPTY_STRING); socialParam.setFd_3b178dfcf9e3e6(settleDomain.getBpoFlag());
//实缴个人医疗 } else {
socialParam.setFd_3af9ee3e066d48(CommonConstants.EMPTY_STRING); socialParam.setFd_3b178dfcf9e3e6(CommonConstants.EMPTY_STRING);
//实缴单位失业 }
socialParam.setFd_3af9ee3a46b7e6(CommonConstants.EMPTY_STRING); //社保户
//实缴个人养老 if (Common.isNotNull(library.getSocialHouseholdName())) {
socialParam.setFd_3af9ee3e513962(CommonConstants.EMPTY_STRING); socialParam.setFd_3aeafa25916e82(library.getSocialHouseholdName());
//实缴个人大病救助 } else {
socialParam.setFd_3af9ee3d0ba3b6(CommonConstants.EMPTY_STRING); socialParam.setFd_3aeafa25916e82(CommonConstants.EMPTY_STRING);
//我司到款单位 }
socialParam.setFd_3b01953871b8be(CommonConstants.EMPTY_STRING); //结算月份
//社保id socialParam.setFd_3adfe8cff746bc(CommonConstants.EMPTY_STRING);
socialParam.setFd_3b0afbe1f94a08(library.getId()); //单位差异
// 薪酬申请编号 socialParam.setFd_3adfeb53c70f72(CommonConstants.EMPTY_STRING);
socialParam.setFd_3b3cab77923f44(CommonConstants.EMPTY_STRING); //个人差异
//预估 socialParam.setFd_3adfeb5413fb44(CommonConstants.EMPTY_STRING);
socialParam.setYgFlag(CommonConstants.ONE_STRING); //应收
//创建人姓名 socialParam.setFd_3adfeb7b624f06(CommonConstants.EMPTY_STRING);
if (Common.isNotNull(library.getCreateName())) { //收款状态
socialParam.setFd_3b438e33f37378(library.getCreateName()); socialParam.setFd_3add9eaeed2560(CommonConstants.EMPTY_STRING);
} else { //结算单号
socialParam.setFd_3b438e33f37378(CommonConstants.EMPTY_STRING); socialParam.setFd_3adfeb830523b6(CommonConstants.EMPTY_STRING);
//收款单号
socialParam.setFd_3adfeb8489e6c2(CommonConstants.EMPTY_STRING);
//应支出
socialParam.setFd_3adfeb7bd97464(CommonConstants.EMPTY_STRING);
//支出结算状态
socialParam.setFd_3add9edfbc6f7e(CommonConstants.EMPTY_STRING);
//付款状态
socialParam.setFd_3add9eed23894a(CommonConstants.EMPTY_STRING);
//支出缴纳单号
socialParam.setFd_3adfeb83a704c8(CommonConstants.EMPTY_STRING);
//实缴单位生育
socialParam.setFd_3af9ee3afb34c2(CommonConstants.EMPTY_STRING);
//付款单号
socialParam.setFd_3adfeb84175f28(CommonConstants.EMPTY_STRING);
//实缴个人合计
socialParam.setFd_3af9ee3cb6d4fa(CommonConstants.EMPTY_STRING);
//预估合计
if (Common.isNotNull(library.getSumAll())) {
socialParam.setFd_3af9ed7e813b86(library.getSumAll().toString());
} else {
socialParam.setFd_3af9ed7e813b86(CommonConstants.EMPTY_STRING);
}
//实缴单位合计
socialParam.setFd_3af9ee3c0bf286(CommonConstants.EMPTY_STRING);
//实缴个人补缴利息
socialParam.setFd_3af9ee3d634946(CommonConstants.EMPTY_STRING);
//实缴单位医疗
socialParam.setFd_3af9ee39dea6a8(CommonConstants.EMPTY_STRING);
//预估个人补缴利息
if (Common.isNotNull(library.getPersonalInterestFee())) {
socialParam.setFd_3af9ebbecc4aa8(library.getPersonalInterestFee().toString());
} else {
socialParam.setFd_3af9ebbecc4aa8(CommonConstants.EMPTY_STRING);
}
//预估单位补缴利息
if (Common.isNotNull(library.getUnitInterestFee())) {
socialParam.setFd_3af9eba7c3da5e(library.getUnitInterestFee().toString());
} else {
socialParam.setFd_3af9eba7c3da5e(CommonConstants.EMPTY_STRING);
}
//实缴单位养老
socialParam.setFd_3af9ee3938170a(CommonConstants.EMPTY_STRING);
//实缴个人失业
socialParam.setFd_3af9ee3db44d96(CommonConstants.EMPTY_STRING);
//实缴单位补缴利息
socialParam.setFd_3af9ee3b5ddae8(CommonConstants.EMPTY_STRING);
//实缴单位大病救助
socialParam.setFd_3af9ee3ba76f54(CommonConstants.EMPTY_STRING);
//实缴单位工伤
socialParam.setFd_3af9ee3aa9c84a(CommonConstants.EMPTY_STRING);
//实缴合计
socialParam.setFd_3af9ee3c6bfc74(CommonConstants.EMPTY_STRING);
//实缴个人医疗
socialParam.setFd_3af9ee3e066d48(CommonConstants.EMPTY_STRING);
//实缴单位失业
socialParam.setFd_3af9ee3a46b7e6(CommonConstants.EMPTY_STRING);
//实缴个人养老
socialParam.setFd_3af9ee3e513962(CommonConstants.EMPTY_STRING);
//实缴个人大病救助
socialParam.setFd_3af9ee3d0ba3b6(CommonConstants.EMPTY_STRING);
//我司到款单位
socialParam.setFd_3b01953871b8be(CommonConstants.EMPTY_STRING);
//社保id
socialParam.setFd_3b0afbe1f94a08(library.getId());
// 薪酬申请编号
socialParam.setFd_3b3cab77923f44(CommonConstants.EMPTY_STRING);
//预估
socialParam.setYgFlag(CommonConstants.ONE_STRING);
//创建人姓名
if (Common.isNotNull(library.getCreateName())) {
socialParam.setFd_3b438e33f37378(library.getCreateName());
} else {
socialParam.setFd_3b438e33f37378(CommonConstants.EMPTY_STRING);
}
//缴纳地拼接
StringBuilder adress = new StringBuilder();
adress.append(null != library.getSocialProvince() ? RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialProvince()) : "")
.append(null != library.getSocialCity() ? "_" + RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialCity()) : "")
.append(null != library.getSocialTown() ? "_" + RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialTown()) : "");
socialParam.setFd_3b5cc58d1a70fe(adress.toString());
insertList.add(socialParam);
} }
//缴纳地拼接
StringBuilder adress = new StringBuilder();
adress.append(null!= library.getSocialProvince() ? RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialProvince()) : "")
.append(null!= library.getSocialCity() ? "_" + RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialCity()) : "")
.append(null!= library.getSocialTown() ? "_" + RedisUtil.redis.opsForValue().get(CacheConstants.AREA_LABEL + library.getSocialTown()) : "");
socialParam.setFd_3b5cc58d1a70fe(adress.toString());
insertList.add(socialParam);
} }
if (!insertList.isEmpty()) { if (!insertList.isEmpty()) {
R<EkpSocialPushInfoVo> info = ekpDaprUtil.pushSocialInfoToEkp(insertList); R<EkpSocialPushInfoVo> info = ekpDaprUtil.pushSocialInfoToEkp(insertList);
......
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