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

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeBusinessVo.java

@@ -12,7 +12,6 @@ import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

@@ -1566,7 +1566,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		}
 		// 获取社保和公积金派减信息
 		SocialAndFundReduceVo vo = new SocialAndFundReduceVo();
-		vo.setEmpId(empId);
+		vo.setEmpId(employeeInfo.getEmpId());
 		R<SocialAndFundReduceVo> reduceVoR = HttpDaprUtil.invokeMethodPost(daprSocialProperties.getAppUrl(), daprSocialProperties.getAppId()
 				, "/tdispatchinfo/inner/getSocialAndFundReduceInfo", vo, SocialAndFundReduceVo.class, SecurityConstants.FROM_IN);
 		if (null != reduceVoR && reduceVoR.getData() != null){

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java

@@ -248,7 +248,7 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
 	 * @param empIds
 	 * @return
 	 **/
-	List<TPaymentAllInfoVo> getPaymentAllInfoList(@Param("tPaymentInfo") TPaymentInfo paymentInfo
+	List<TPaymentInfoVo> getPaymentAllInfoList(@Param("tPaymentInfo") TPaymentInfo paymentInfo
 			, @Param("settleDomainIds") List<String> settleDomainIds, @Param("idsStr") List<String> idsStr
 			, @Param("empIds")List<String> empIds);
 

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

@@ -3385,12 +3385,12 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 
 	private void getPaymentBusinessPagesVoList(List<PaymentBusinessPageVo> voList, TPaymentInfo paymentInfo
 			, List<String> settleDomainIds, List<String> empIds) {
-		List<TPaymentAllInfoVo> paymentAllInfoVoList =  baseMapper.getPaymentAllInfoList(paymentInfo, settleDomainIds
+		List<TPaymentInfoVo> paymentAllInfoVoList =  baseMapper.getPaymentAllInfoList(paymentInfo, settleDomainIds
 				, null,empIds);
 		HashMap<String,PaymentBusinessPageVo> pageVoHashMap = new HashMap<>();
 		if (Common.isNotNull(paymentAllInfoVoList)){
 			PaymentBusinessPageVo pageVo;
-			for (TPaymentAllInfoVo infoVo:paymentAllInfoVoList){
+			for (TPaymentInfoVo infoVo:paymentAllInfoVoList){
 				pageVo = pageVoHashMap.get(infoVo.getSocialPayMonth());
 				if (null == pageVo){
 					pageVo = new PaymentBusinessPageVo();
@@ -3438,13 +3438,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	}
 
 	private PaymentBusinessPageVo getPaymentBusinessPageVo(TPaymentInfo paymentInfo) {
-		List<TPaymentAllInfoVo> paymentAllInfoVoList =  baseMapper.getPaymentAllInfoList(paymentInfo, null, null, null);
+		List<TPaymentInfoVo> paymentAllInfoVoList =  baseMapper.getPaymentAllInfoList(paymentInfo, null, null, null);
 		PaymentBusinessPageVo pageVo = new PaymentBusinessPageVo();
 		if (Common.isNotNull(paymentAllInfoVoList)){
 			boolean isRefund;
 			boolean isSocial;
 			boolean  isInjury;
-			for (TPaymentAllInfoVo infoVo:paymentAllInfoVoList){
+			for (TPaymentInfoVo infoVo:paymentAllInfoVoList){
 				if (Common.isNotNull(infoVo.getSocialPayMonth())){
 					pageVo.setMonth(infoVo.getSocialPayMonth());
 				}
@@ -3481,11 +3481,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	 * @param infoVo
 	 * @return
 	 **/
-	private void handleSocialAndRefundMoney(PaymentBusinessPageVo pageVo, boolean isRefund, boolean isSocial, TPaymentAllInfoVo infoVo) {
+	private void handleSocialAndRefundMoney(PaymentBusinessPageVo pageVo, boolean isRefund, boolean isSocial, TPaymentInfoVo infoVo) {
 		if (isSocial && !isRefund){
-			pageVo.setPersonalPensionSet(infoVo.getPersonalPensionSet());
-			pageVo.setPersonalMedicalSet(infoVo.getPersonalMedicalSet());
-			pageVo.setPersonalUnemploymentSet(infoVo.getPersonalUnemploymentSet());
+			pageVo.setPersonalPensionSet(infoVo.getUnitPensionSet());
+			pageVo.setPersonalMedicalSet(infoVo.getUnitMedicalSet());
+			pageVo.setPersonalUnemploymentSet(infoVo.getUnitUnemploymentSet());
 			pageVo.setUnitPensionSet(infoVo.getUnitPensionSet());
 			pageVo.setUnitMedicalSet(infoVo.getUnitMedicalSet());
 			pageVo.setUnitInjurySet(infoVo.getUnitInjurySet());
@@ -3510,7 +3510,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	 * @param infoVo
 	 * @return
 	 **/
-	private void handleRefundMoney(PaymentBusinessPageVo pageVo, boolean isRefund, TPaymentAllInfoVo infoVo) {
+	private void handleRefundMoney(PaymentBusinessPageVo pageVo, boolean isRefund, TPaymentInfoVo infoVo) {
 		if (isRefund){
 			pageVo.setPersonalRefund(BigDecimalUtils.safeAdd(pageVo.getPersonalRefund(),
 					infoVo.getPersonalPensionMoney(),
@@ -3539,7 +3539,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	 * @param infoVo
 	 * @return
 	 **/
-	private void handleSocialAndInjuryMoney(PaymentBusinessPageVo pageVo, boolean isRefund, boolean isInjury, TPaymentAllInfoVo infoVo) {
+	private void handleSocialAndInjuryMoney(PaymentBusinessPageVo pageVo, boolean isRefund, boolean isInjury, TPaymentInfoVo infoVo) {
 		if (isInjury){
 			pageVo.setInjuryAloneSet(infoVo.getUnitInjurySet());
 			pageVo.setInjuryAloneMoney(BigDecimalUtils.safeAdd(pageVo.getInjuryAloneMoney(),infoVo.getUnitInjuryMoney()));
@@ -3577,7 +3577,7 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	 * @param infoVo
 	 * @return
 	 **/
-	private void initPaymentSum(PaymentBusinessPageVo pageVo,boolean isRefund, TPaymentAllInfoVo infoVo) {
+	private void initPaymentSum(PaymentBusinessPageVo pageVo,boolean isRefund, TPaymentInfoVo infoVo) {
 		if (!isRefund){
 			pageVo.setFundPersonalSum(BigDecimalUtils.safeAdd(pageVo.getFundPersonalSum(), infoVo.getPersonalProvidentSum()));
 			pageVo.setFundUnitSum(BigDecimalUtils.safeAdd(pageVo.getFundUnitSum(), infoVo.getUnitProvidentSum()));

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

@@ -361,7 +361,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
 	 * @return
 	 **/
 	private void initSocialAddStatus(SocialAddAndReduceVo socialAddAndReduceVo, TDispatchInfo dispatchInfo) {
-		//new:社保办理状态 0 未办理 1 全部办理成功(原-已办理) 2 全部办理失败（原-办理失败） 3已派减 4办理中 （20210609派单拆分新增fxj） 5部分办理失败 （20210609派单拆分新增fxj）
+		//new:社保派增办理状态  0 派单开始  1  办理中 2 办理成功 3 办理失败 4 部分办理成功
 		if (CommonConstants.ZERO_STRING.equals(dispatchInfo.getStatus())
 				|| CommonConstants.ONE_STRING.equals(dispatchInfo.getStatus())
 				|| CommonConstants.THREE_STRING.equals(dispatchInfo.getStatus())) {
@@ -379,7 +379,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
 			socialAddAndReduceVo.setSocialAddStatus(CommonConstants.THREE_STRING);
 		}
 		// 部分办理失败
-		if (CommonConstants.FIVE_STRING.equals(dispatchInfo.getSocialHandleStatus())) {
+		if (CommonConstants.THREE_STRING.equals(dispatchInfo.getSocialHandleStatus())) {
 			socialAddAndReduceVo.setSocialAddStatus(CommonConstants.FOUR_STRING);
 		}
 	}
@@ -411,6 +411,7 @@ public class TSocialInfoServiceImpl extends ServiceImpl<TSocialInfoMapper, TSoci
 	 * @return
 	 **/
 	private void initSocialReduceStatus(SocialAddAndReduceVo socialAddAndReduceVo, TDispatchInfo dispatchInfo) {
+		// 社保派减办理状态 0 派单开始  1  办理中 2 办理成功 3 办理失败
 		if (CommonConstants.ZERO_STRING.equals(dispatchInfo.getStatus())
 				|| CommonConstants.ONE_STRING.equals(dispatchInfo.getStatus())
 				|| CommonConstants.THREE_STRING.equals(dispatchInfo.getStatus())) {