接口屏蔽

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java

@@ -16,9 +16,11 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
@@ -630,4 +632,42 @@ public class TPaymentInfo extends BaseEntity {
 	@ExcelProperty("工资公积金结算状态")
 	private String salaryFundFlag;
 
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String ylSameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String dbSameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String sySameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String brSameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String gsSameFlg;
+	/**
+	 * 是否导入重复标识
+	 */
+	@TableField(exist = false)
+	@ExcelIgnore
+	private String ybSameFlg;
+
+
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java

@@ -70,6 +70,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.text.NumberFormat;
 import java.time.LocalDateTime;
@@ -304,9 +305,9 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		List<String> idList = Common.initStrToList(ids, CommonConstants.COMMA_STRING);
 		TPaymentInfo paymentInfo;
 
+		if (idList != null) {
 			for (String id : idList) {
 				paymentInfo = baseMapper.selectById(id);
-			if (null != paymentInfo && Common.isNotNull(paymentInfo.getId())) {
 				if ((!user.getId().equals(paymentInfo.getCreateBy()) &&
 						!CommonConstants.ONE_STRING.equals(user.getId())) ||
 						CommonConstants.ZERO_STRING.equals(paymentInfo.getPushStatus())) {
@@ -541,6 +542,17 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						for (TPaymentInfo info : paymentInfos) {
 							if (BigDecimalUtils.safeAdd(BigDecimalUtils.isNullToZero(info.getUnitPensionMoney()),
 									BigDecimalUtils.isNullToZero(info.getPersonalPensionMoney())).compareTo(BigDecimal.ZERO) != 0) {
+								if (null != paymentInfoPensionMap.get(info.getSocialPayAddr()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getEmpIdcard()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getSocialPayMonth()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getSocialCreateMonth()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ SocialConstants.YL)) {
+									info.setYlSameFlg("1");
+								}
 								paymentInfoPensionMap.put(info.getSocialPayAddr()
 												+ CommonConstants.DOWN_LINE_STRING
 												+ info.getEmpIdcard()
@@ -554,6 +566,17 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							}
 							if (BigDecimalUtils.safeAdd(BigDecimalUtils.isNullToZero(info.getPersonalBigmailmentMoney()),
 									BigDecimalUtils.isNullToZero(info.getUnitBigmailmentMoney())).compareTo(BigDecimal.ZERO) != 0) {
+								if (null != paymentInfoBigMap.get(info.getSocialPayAddr()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getEmpIdcard()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getSocialPayMonth()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getSocialCreateMonth()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ SocialConstants.DB)) {
+									info.setDbSameFlg("1");
+								}
 								paymentInfoBigMap.put(info.getSocialPayAddr()
 												+ CommonConstants.DOWN_LINE_STRING
 												+ info.getEmpIdcard()
@@ -567,6 +590,17 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							}
 							if (BigDecimalUtils.safeAdd(BigDecimalUtils.isNullToZero(info.getUnitUnemploymentMoney()),
 									BigDecimalUtils.isNullToZero(info.getPersonalUnemploymentMoney())).compareTo(BigDecimal.ZERO) != 0) {
+								if (null != paymentInfoUnEmpMap.get(info.getSocialPayAddr()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getEmpIdcard()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getSocialPayMonth()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getSocialCreateMonth()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ SocialConstants.SY)) {
+									info.setSySameFlg("1");
+								}
 								paymentInfoUnEmpMap.put(info.getSocialPayAddr()
 												+ CommonConstants.DOWN_LINE_STRING
 												+ info.getEmpIdcard()
@@ -579,6 +613,17 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 										, info);
 							}
 							if (BigDecimalUtils.isNullToZero(info.getUnitBirthMoney()).compareTo(BigDecimal.ZERO) != 0) {
+								if (null != paymentInfoBirMap.get(info.getSocialPayAddr()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getEmpIdcard()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getSocialPayMonth()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getSocialCreateMonth()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ SocialConstants.BIR)) {
+									info.setBrSameFlg("1");
+								}
 								paymentInfoBirMap.put(info.getSocialPayAddr()
 												+ CommonConstants.DOWN_LINE_STRING
 												+ info.getEmpIdcard()
@@ -591,6 +636,17 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 										, info);
 							}
 							if (BigDecimalUtils.isNullToZero(info.getUnitInjuryMoney()).compareTo(BigDecimal.ZERO) != 0) {
+								if (null != paymentInfoInjuryMap.get(info.getSocialPayAddr()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getEmpIdcard()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getSocialPayMonth()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getSocialCreateMonth()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ SocialConstants.GS)) {
+									info.setGsSameFlg("1");
+								}
 								paymentInfoInjuryMap.put(info.getSocialPayAddr()
 												+ CommonConstants.DOWN_LINE_STRING
 												+ info.getEmpIdcard()
@@ -604,6 +660,17 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							}
 							if (BigDecimalUtils.safeAdd(BigDecimalUtils.isNullToZero(info.getUnitMedicalMoney()),
 									BigDecimalUtils.isNullToZero(info.getPersonalMedicalMoney())).compareTo(BigDecimal.ZERO) != 0) {
+								if (null != paymentInfoMedicalMap.get(info.getSocialPayAddr()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getEmpIdcard()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getSocialPayMonth()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ info.getSocialCreateMonth()
+										+ CommonConstants.DOWN_LINE_STRING
+										+ SocialConstants.YB)) {
+									info.setYbSameFlg("1");
+								}
 								paymentInfoMedicalMap.put(info.getSocialPayAddr()
 												+ CommonConstants.DOWN_LINE_STRING
 												+ info.getEmpIdcard()
@@ -949,12 +1016,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ SocialConstants.YL);
 
 					//存在社保缴费数据
-					if (null != paymentInfo && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
-							BigDecimalUtils.isNullToZero(infoVo.getUnitPensionMoney()),
+					if (null != paymentInfo && ((null != paymentInfo.getYlSameFlg() && CommonConstants.ONE_STRING.equals(paymentInfo.getYlSameFlg()))
+							|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(BigDecimalUtils.isNullToZero(infoVo.getUnitPensionMoney()),
 							BigDecimalUtils.isNullToZero(infoVo.getPersonalPensionMoney())), BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(paymentInfo.getUnitPensionMoney()),
-							BigDecimalUtils.isNullToZero(paymentInfo.getPersonalPensionMoney()))).compareTo(BigDecimal.ZERO) > 0) {
-						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), SocialConstants.EXIT_TEMPLATE + infoVo.getEmpIdcard()
+							BigDecimalUtils.isNullToZero(paymentInfo.getPersonalPensionMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
+						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的养老缴费数据,请勿重复导入！"));
 						continue;
 					}
@@ -973,12 +1040,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ CommonConstants.DOWN_LINE_STRING
 							+ SocialConstants.SY);
 					//存在社保缴费数据
-					if (null != paymentInfo && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
+					if (null != paymentInfo && ((null != paymentInfo.getSySameFlg() && CommonConstants.ONE_STRING.equals(paymentInfo.getSySameFlg()))
+							|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(infoVo.getUnitUnemploymentMoney()),
 							BigDecimalUtils.isNullToZero(infoVo.getPersonalUnemploymentMoney())), BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(paymentInfo.getUnitUnemploymentMoney()),
-							BigDecimalUtils.isNullToZero(paymentInfo.getPersonalUnemploymentMoney()))).compareTo(BigDecimal.ZERO) > 0) {
-						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), SocialConstants.EXIT_TEMPLATE + infoVo.getEmpIdcard()
+							BigDecimalUtils.isNullToZero(paymentInfo.getPersonalUnemploymentMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
+						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的失业缴费数据,请勿重复导入！"));
 						continue;
 					}
@@ -998,12 +1066,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ SocialConstants.YB);
 
 					//存在社保缴费数据
-					if (null != paymentInfo && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
+					if (null != paymentInfo && ((null != paymentInfo.getYbSameFlg() && CommonConstants.ONE_STRING.equals(paymentInfo.getYbSameFlg()))
+							|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(infoVo.getUnitMedicalMoney()),
 							BigDecimalUtils.isNullToZero(infoVo.getPersonalMedicalMoney())), BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(paymentInfo.getUnitMedicalMoney()),
-							BigDecimalUtils.isNullToZero(paymentInfo.getPersonalMedicalMoney()))).compareTo(BigDecimal.ZERO) > 0) {
-						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), SocialConstants.EXIT_TEMPLATE + infoVo.getEmpIdcard()
+							BigDecimalUtils.isNullToZero(paymentInfo.getPersonalMedicalMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
+						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的医保缴费数据,请勿重复导入！"));
 						continue;
 					}
@@ -1022,12 +1091,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ CommonConstants.DOWN_LINE_STRING
 							+ SocialConstants.DB);
 					//存在社保缴费数据
-					if (null != paymentInfo && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
+					if (null != paymentInfo && ((null != paymentInfo.getDbSameFlg() && CommonConstants.ONE_STRING.equals(paymentInfo.getDbSameFlg()))
+							|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(infoVo.getUnitBigmailmentMoney()),
 							BigDecimalUtils.isNullToZero(infoVo.getPersonalBigmailmentMoney())), BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(paymentInfo.getUnitBigmailmentMoney()),
-							BigDecimalUtils.isNullToZero(paymentInfo.getPersonalBigmailmentMoney()))).compareTo(BigDecimal.ZERO) > 0) {
-						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), SocialConstants.EXIT_TEMPLATE + infoVo.getEmpIdcard()
+							BigDecimalUtils.isNullToZero(paymentInfo.getPersonalBigmailmentMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
+						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的医疗救助金缴费数据,请勿重复导入！"));
 						continue;
 					}
@@ -1045,9 +1115,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ CommonConstants.DOWN_LINE_STRING
 							+ SocialConstants.GS);
 					//存在社保缴费数据
-					if (null != paymentInfo && BigDecimalUtils.safeMultiply(BigDecimalUtils.isNullToZero(infoVo.getUnitInjuryMoney()),
-							BigDecimalUtils.isNullToZero(paymentInfo.getUnitInjuryMoney())).compareTo(BigDecimal.ZERO) > 0) {
-						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), SocialConstants.EXIT_TEMPLATE + infoVo.getEmpIdcard()
+					if (null != paymentInfo && ((null != paymentInfo.getGsSameFlg() && CommonConstants.ONE_STRING.equals(paymentInfo.getGsSameFlg()))
+							|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.isNullToZero(infoVo.getUnitInjuryMoney()),
+							BigDecimalUtils.isNullToZero(paymentInfo.getUnitInjuryMoney())).compareTo(BigDecimal.ZERO) > 0))) {
+						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的单位工伤缴费数据,请勿重复导入！"));
 						continue;
 					}
@@ -1065,9 +1136,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ CommonConstants.DOWN_LINE_STRING
 							+ SocialConstants.BIR);
 					//存在社保缴费数据
-					if (null != paymentInfo && BigDecimalUtils.safeMultiply(BigDecimalUtils.isNullToZero(infoVo.getUnitBirthMoney()),
-							BigDecimalUtils.isNullToZero(paymentInfo.getUnitBirthMoney())).compareTo(BigDecimal.ZERO) > 0) {
-						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), SocialConstants.EXIT_TEMPLATE + infoVo.getEmpIdcard()
+					if (null != paymentInfo && ((null != paymentInfo.getBrSameFlg() && CommonConstants.ONE_STRING.equals(paymentInfo.getBrSameFlg()))
+							|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.isNullToZero(infoVo.getUnitBirthMoney()),
+							BigDecimalUtils.isNullToZero(paymentInfo.getUnitBirthMoney())).compareTo(BigDecimal.ZERO) > 0))) {
+						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
 								+ "的单位生育缴费数据,请勿重复导入！"));
 						continue;
 					}
@@ -1574,6 +1646,17 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 						if (BigDecimalUtils.safeAdd(BigDecimalUtils.isNullToZero(info.getUnitPensionMoney()),
 								BigDecimalUtils.isNullToZero(info.getPersonalPensionMoney())).compareTo(BigDecimal.ZERO) != 0) {
+							if (null != paymentInfoMedicalMap.get(info.getSocialPayAddr()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getEmpIdcard()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getSocialPayMonth()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getSocialCreateMonth()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ PaymentConstants.PENSION_RISK)) {
+								info.setYbSameFlg("1");
+							}
 							paymentInfoPensionMap.put(info.getSocialPayAddr()
 											+ CommonConstants.DOWN_LINE_STRING
 											+ info.getEmpIdcard()
@@ -1587,6 +1670,17 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						}
 						if (BigDecimalUtils.safeAdd(BigDecimalUtils.isNullToZero(info.getUnitUnemploymentMoney()),
 								BigDecimalUtils.isNullToZero(info.getPersonalUnemploymentMoney())).compareTo(BigDecimal.ZERO) != 0) {
+							if (null != paymentInfoUnEmpMap.get(info.getSocialPayAddr()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getEmpIdcard()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getSocialPayMonth()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getSocialCreateMonth()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ PaymentConstants.UNEMPLOYEEMENT_RISK)) {
+								info.setSySameFlg("1");
+							}
 							paymentInfoUnEmpMap.put(info.getSocialPayAddr()
 											+ CommonConstants.DOWN_LINE_STRING
 											+ info.getEmpIdcard()
@@ -1599,6 +1693,17 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 									, info);
 						}
 						if (BigDecimalUtils.isNullToZero(info.getUnitInjuryMoney()).compareTo(BigDecimal.ZERO) != 0) {
+							if (null != paymentInfoInjuryMap.get(info.getSocialPayAddr()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getEmpIdcard()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getSocialPayMonth()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getSocialCreateMonth()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ PaymentConstants.INJURY_RISK)) {
+								info.setGsSameFlg("1");
+							}
 							paymentInfoInjuryMap.put(info.getSocialPayAddr()
 											+ CommonConstants.DOWN_LINE_STRING
 											+ info.getEmpIdcard()
@@ -1612,6 +1717,17 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						}
 						if (BigDecimalUtils.safeAdd(BigDecimalUtils.isNullToZero(info.getUnitMedicalMoney()),
 								BigDecimalUtils.isNullToZero(info.getPersonalMedicalMoney())).compareTo(BigDecimal.ZERO) != 0) {
+							if (null != paymentInfoMedicalMap.get(info.getSocialPayAddr()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getEmpIdcard()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getSocialPayMonth()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getSocialCreateMonth()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ PaymentConstants.MEDICAL)) {
+								info.setYlSameFlg("1");
+							}
 							paymentInfoMedicalMap.put(info.getSocialPayAddr()
 											+ CommonConstants.DOWN_LINE_STRING
 											+ info.getEmpIdcard()
@@ -1625,6 +1741,17 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						}
 						if (BigDecimalUtils.safeAdd(BigDecimalUtils.isNullToZero(info.getPersonalBigmailmentMoney()),
 								BigDecimalUtils.isNullToZero(info.getUnitBigmailmentMoney())).compareTo(BigDecimal.ZERO) != 0) {
+							if (null != paymentInfoBigMap.get(info.getSocialPayAddr()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getEmpIdcard()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getSocialPayMonth()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ info.getSocialCreateMonth()
+									+ CommonConstants.DOWN_LINE_STRING
+									+ SocialConstants.DB)) {
+								info.setDbSameFlg("1");
+							}
 							paymentInfoBigMap.put(info.getSocialPayAddr()
 											+ CommonConstants.DOWN_LINE_STRING
 											+ info.getEmpIdcard()
@@ -1857,13 +1984,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ CommonConstants.DOWN_LINE_STRING
 							+ PaymentConstants.PENSION_RISK);
 					//存在社保缴费数据
-					if (null != payExists && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
+					if (null != payExists && ((null != payExists.getYbSameFlg() && CommonConstants.ONE_STRING.equals(payExists.getYbSameFlg()))
+							|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(infoVo.getPersonalMoney()),
 							BigDecimalUtils.isNullToZero(infoVo.getUnitMoney())), BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(payExists.getUnitPensionMoney()),
-							BigDecimalUtils.isNullToZero(payExists.getPersonalPensionMoney()))).compareTo(BigDecimal.ZERO) > 0) {
-						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), SocialConstants.EXIT_TEMPLATE
-								+ infoVo.getEmpIdcard() + "的养老缴费数据,请勿重复导入！"));
+							BigDecimalUtils.isNullToZero(payExists.getPersonalPensionMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
+						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+								+ "的养老缴费数据,请勿重复导入！"));
 						continue;
 					}
 				}
@@ -1894,13 +2022,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ CommonConstants.DOWN_LINE_STRING
 							+ PaymentConstants.UNEMPLOYEEMENT_RISK);
 					//存在社保缴费数据
-					if (null != payExists && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
+					if (null != payExists && ((null != payExists.getSySameFlg() && CommonConstants.ONE_STRING.equals(payExists.getSySameFlg()))
+							|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(infoVo.getPersonalMoney()),
 							BigDecimalUtils.isNullToZero(infoVo.getUnitMoney())), BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(payExists.getUnitUnemploymentMoney()),
-							BigDecimalUtils.isNullToZero(payExists.getPersonalUnemploymentMoney()))).compareTo(BigDecimal.ZERO) > 0) {
-						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), SocialConstants.EXIT_TEMPLATE
-								+ infoVo.getEmpIdcard() + "的失业缴费数据,请勿重复导入！"));
+							BigDecimalUtils.isNullToZero(payExists.getPersonalUnemploymentMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
+						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+								+ "的失业缴费数据,请勿重复导入！"));
 						continue;
 					}
 				}
@@ -1932,13 +2061,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ PaymentConstants.MEDICAL);
 
 					//存在社保缴费数据
-					if (null != payExists && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
+					if (null != payExists && ((null != payExists.getYlSameFlg() && CommonConstants.ONE_STRING.equals(payExists.getYlSameFlg()))
+							|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(infoVo.getUnitMedicalMoney()),
 							BigDecimalUtils.isNullToZero(infoVo.getPersonalMedicalMoney())), BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(payExists.getUnitMedicalMoney()),
-							BigDecimalUtils.isNullToZero(payExists.getPersonalMedicalMoney()))).compareTo(BigDecimal.ZERO) > 0) {
-						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), SocialConstants.EXIT_TEMPLATE
-								+ infoVo.getEmpIdcard() + "的医保缴费数据,请勿重复导入！"));
+							BigDecimalUtils.isNullToZero(payExists.getPersonalMedicalMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
+						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+								+ "的医保缴费数据,请勿重复导入！"));
 						continue;
 					}
 				}
@@ -1971,12 +2101,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ PaymentConstants.INJURY_RISK);
 
 					//存在社保缴费数据
-					if (null != payExists && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
+					if (null != payExists && ((null != payExists.getGsSameFlg() && CommonConstants.ONE_STRING.equals(payExists.getGsSameFlg()))
+							|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
 									BigDecimalUtils.isNullToZero(infoVo.getPersonalMoney()),
 									BigDecimalUtils.isNullToZero(infoVo.getUnitMoney())),
-							BigDecimalUtils.isNullToZero(payExists.getUnitInjuryMoney())).compareTo(BigDecimal.ZERO) > 0) {
-						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), SocialConstants.EXIT_TEMPLATE
-								+ infoVo.getEmpIdcard() + "的单位工伤缴费数据,请勿重复导入！"));
+							BigDecimalUtils.isNullToZero(payExists.getUnitInjuryMoney())).compareTo(BigDecimal.ZERO) > 0))) {
+						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+								+ "的单位工伤缴费数据,请勿重复导入！"));
 						continue;
 					}
 				}
@@ -2009,13 +2140,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							+ SocialConstants.DB);
 
 					//存在社保缴费数据
-					if (null != payExists && BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
+					if (null != payExists && ((null != payExists.getDbSameFlg() && CommonConstants.ONE_STRING.equals(payExists.getDbSameFlg()))
+							|| (BigDecimalUtils.safeMultiply(BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(infoVo.getUnitBigailmentMoney()),
 							BigDecimalUtils.isNullToZero(infoVo.getPersonalBigailmentMoney())), BigDecimalUtils.safeAdd(
 							BigDecimalUtils.isNullToZero(payExists.getUnitBigmailmentMoney()),
-							BigDecimalUtils.isNullToZero(payExists.getPersonalBigmailmentMoney()))).compareTo(BigDecimal.ZERO) > 0) {
-						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), SocialConstants.EXIT_TEMPLATE
-								+ infoVo.getEmpIdcard() + "的医疗救助金缴费数据,请勿重复导入！"));
+							BigDecimalUtils.isNullToZero(payExists.getPersonalBigmailmentMoney()))).compareTo(BigDecimal.ZERO) > 0))) {
+						errorMessageList.add(new ErrorMessage(infoVo.getRowIndex(), "已存在对应员工身份证" + infoVo.getEmpIdcard()
+								+ "的医疗救助金缴费数据,请勿重复导入！"));
 						continue;
 					}
 				}
@@ -2653,14 +2785,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				}
 			}
 		}
-		for (String key : map.keySet()) {
+		for (Map.Entry<String,Integer> entry : map.entrySet()) {
 			TSendEkpError error = new TSendEkpError();
 			error.setCreateTime(new Date());
 			error.setCreateDay(DateUtil.getThisDay());
 			error.setType(CommonConstants.THREE_STRING);
-			error.setLinkId(idMap.get(key));
-			error.setTitle(key);
-			error.setNums(map.get(key));
+			error.setLinkId(idMap.get(entry.getKey()));
+			error.setTitle(entry.getKey());
+			error.setNums(entry.getValue());
 			tSendEkpErrorService.save(error);
 		}
 		//更新推送状态
@@ -2825,14 +2957,14 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				}
 			}
 		}
-		for (String key : map.keySet()) {
+		for (Map.Entry<String,Integer> entry : map.entrySet()) {
 			TSendEkpError error = new TSendEkpError();
 			error.setCreateTime(new Date());
 			error.setCreateDay(DateUtil.getThisDay());
 			error.setType(CommonConstants.THREE_STRING);
-			error.setLinkId(idMap.get(key));
-			error.setTitle(key);
-			error.setNums(map.get(key));
+			error.setLinkId(idMap.get(entry.getKey()));
+			error.setTitle(entry.getKey());
+			error.setNums(entry.getValue());
 			tSendEkpErrorService.save(error);
 		}
 		//更新推送状态
@@ -2895,9 +3027,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				// 含有社保，则计算收入
 				if (Common.isNotNull(settleDomain.getManageServerItem()) && ((settleDomain.getManageServerItem().contains(CommonConstants.ONE_STRING)
 						&& CommonConstants.ONE_STRING.equals(socialFundFlag)) || (settleDomain.getManageServerItem().contains(CommonConstants.TWO_STRING)
-						&& CommonConstants.TWO_STRING.equals(socialFundFlag)))) {
+						&& CommonConstants.TWO_STRING.equals(socialFundFlag))) && CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag())) {
 					//预估模式
-					if (CommonConstants.ZERO_STRING.equals(settleDomain.getManagementTag())) {
 					if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
 						//预估模式只有按人次和人数收费
 						if (!exitFlag) {
@@ -2916,11 +3047,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 							if (CommonConstants.ONE_STRING.equals(socialFundFlag)) {
 								gMoney = BigDecimalUtils.safeMultiply(paymentInfo.getSocialSum(),
 										settleDomain.getManagementFee().divide(new BigDecimal("100"),
-													CommonConstants.FIVE_INT, BigDecimal.ROUND_HALF_UP));
+												CommonConstants.FIVE_INT, RoundingMode.HALF_UP));
 							} else {
 								gMoney = BigDecimalUtils.safeMultiply(paymentInfo.getProvidentSum(),
 										settleDomain.getManagementFee().divide(new BigDecimal("100"),
-													CommonConstants.FIVE_INT, BigDecimal.ROUND_HALF_UP));
+												CommonConstants.FIVE_INT, RoundingMode.HALF_UP));
 							}
 						}
 						if (!exitFlag || isSum == 1) {
@@ -2930,12 +3061,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						}
 					}
 				}
-				}
 				if (Common.isNotNull(settleDomain.getRiskServerItem()) && ((settleDomain.getRiskServerItem().contains(CommonConstants.ONE_STRING)
 						&& CommonConstants.ONE_STRING.equals(socialFundFlag)) || (settleDomain.getRiskServerItem().contains(CommonConstants.TWO_STRING)
-						&& CommonConstants.TWO_STRING.equals(socialFundFlag)))) {
+						&& CommonConstants.TWO_STRING.equals(socialFundFlag))) && CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
 					//预估模式
-					if (CommonConstants.ZERO_STRING.equals(settleDomain.getRiskFundTag())) {
 					if (CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
 						if (!exitFlag) {
 							createIncomeInsurance(paymentInfo, settleDomain, CommonConstants.TWO_STRING,
@@ -2954,11 +3083,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 								if (CommonConstants.ONE_STRING.equals(socialFundFlag)) {
 									money = BigDecimalUtils.safeMultiply(paymentInfo.getSocialSum(),
 											settleDomain.getRiskFundFee().divide(new BigDecimal("100"),
-														CommonConstants.FIVE_INT, BigDecimal.ROUND_HALF_UP));
+													CommonConstants.FIVE_INT, RoundingMode.HALF_UP));
 								} else {
 									money = BigDecimalUtils.safeMultiply(paymentInfo.getProvidentSum(),
 											settleDomain.getRiskFundFee().divide(new BigDecimal("100"),
-														CommonConstants.FIVE_INT, BigDecimal.ROUND_HALF_UP));
+													CommonConstants.FIVE_INT, RoundingMode.HALF_UP));
 								}
 							}
 							if (!exitFlag || isSum == 2) {
@@ -2971,7 +3100,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				}
 			}
 		}
-		}
 		incomeService.saveBathDetail(detailList);
 	}