MVP1.4-B端社保、档案

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

@@ -3390,17 +3390,22 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		HashMap<String,PaymentBusinessPageVo> pageVoHashMap = new HashMap<>();
 		if (Common.isNotNull(paymentAllInfoVoList)){
 			PaymentBusinessPageVo pageVo;
+			String payMonth;
 			for (TPaymentInfoVo infoVo:paymentAllInfoVoList){
-				pageVo = pageVoHashMap.get(infoVo.getSocialPayMonth());
-				if (null == pageVo){
-					pageVo = new PaymentBusinessPageVo();
+				payMonth = infoVo.getSocialPayMonth();
+				if (Common.isEmpty(payMonth)) {
+					payMonth = infoVo.getProvidentPayMonth();
 				}
-				if (Common.isNotNull(infoVo.getSocialPayMonth())){
-					pageVo.setMonth(infoVo.getSocialPayMonth());
+				if (Common.isNotNull(payMonth)){
+					pageVo = pageVoHashMap.get(payMonth);
+					if (null == pageVo){
+						pageVo = new PaymentBusinessPageVo();
+					}
+					pageVo.setMonth(payMonth);
+					// 处理合计
+					initPaymentSum(pageVo,false, infoVo);
+					pageVoHashMap.put(payMonth,pageVo);
 				}
-				// 处理合计
-				initPaymentSum(pageVo,false, infoVo);
-				pageVoHashMap.put(infoVo.getSocialPayMonth(),pageVo);
 			}
 		}
 		if (Common.isNotNull(pageVoHashMap)){