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

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -294,6 +294,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			s.setStatus(SalaryConstants.AUDIT_STATUS[0]);
 			s.setBpoFlag(dept.getBpoFlag());
 			s.setIncomeMonth(sav.getSalaryMonth());
+			s.setBusinessPrimaryType(dept.getBusinessPrimaryType());
+			s.setBusinessSecondType(dept.getBusinessSecondType());
+			s.setBusinessThirdType(dept.getBusinessThirdType());
 			if (configSalary != null) {
 				s.setSetId(configSalary.getId());
 				if (Common.isNotNull(configSalary.getIncomeMonth())) {

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

@@ -1634,6 +1634,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		//地区数据
 		HashMap<String, String> areaMap = new HashMap<>();
 		HashMap<String, String> areaMap2 = new HashMap<>();
+		//公积金唯一性检验条件：身份证编码+公积金缴纳月份
+		HashMap<String, Object> paymentInfoMap = new HashMap<>();
 		R<AreaVo> areaListR = upmsDaprUtils.getAreaListR();
 		if (Common.isNotNull(areaListR)) {
 			AreaVo areaList = areaListR.getData();
@@ -1688,7 +1690,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 				 */
 				private void saveData() {
 					log.info("{}条数据，开始存储数据库！", cachedDataList.size());
-					batchSavePaymentFundInfo(cachedDataList, errorMessageList, batchInsertList, areaMap, areaMap2,domainMap);
+					batchSavePaymentFundInfo(cachedDataList, errorMessageList, batchInsertList, areaMap, areaMap2
+							,domainMap, paymentInfoMap);
 					log.info("存储数据库成功！");
 				}
 			}).sheet().doRead();
@@ -1709,7 +1712,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 	private void batchSavePaymentFundInfo(List<TPaymentInfoVo> list, List<ErrorDetailVO> errorMessageList,
 										  List<TPaymentInfo> batchInsertList,HashMap<String, String> areaMap,
-										  HashMap<String, String> areaMap2,Map<String,TSettleDomainSelectVo> domainMap) {
+										  HashMap<String, String> areaMap2,Map<String,TSettleDomainSelectVo> domainMap,
+										  HashMap<String, Object> paymentInfoMap) {
 		try {
 			if (Common.isNotNull(list)) {
 				TPaymentInfo paymentInfo = null;
@@ -1731,8 +1735,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 				//已存在社保缴费库数据  非删除状态
 				List<TPaymentInfo> paymentInfos = baseMapper.selectListForPaymentImport1(monthList, idcards);
-				//公积金唯一性检验条件：身份证编码+公积金缴纳月份
-				HashMap<String, Object> paymentInfoMap = new HashMap<>();
+
 				if (Common.isNotNull(paymentInfos)) {
 					for (TPaymentInfo info : paymentInfos) {
 						paymentInfoMap.put(info.getProvidentPayAddr()