划转修改

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

@@ -116,11 +116,12 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 
 
 			UpdateSocialFoundVo updateSocialFoundVo = new UpdateSocialFoundVo();
-			updateSocialFoundVo.setEmpIdcard(tEmpChangeInfo.getEmpIdcard());
-			updateSocialFoundVo.setSettleDomainCode(tEmpChangeInfo.getDeptNo());
-			updateSocialFoundVo.setSettleDomainId(tEmpChangeInfo.getDeptId());
-			updateSocialFoundVo.setUnitId(tEmpChangeInfo.getUnitId());
-			updateSocialFoundVo.setUnitName(tEmpChangeInfo.getNewDept());
+			updateSocialFoundVo.setEmpIdcard(updateTEmployeeProject.getEmpIdcard());
+			updateSocialFoundVo.setSettleDomainCode(updateTEmployeeProject.getDeptNo());
+			updateSocialFoundVo.setSettleDomainId(updateTEmployeeProject.getDeptId());
+			updateSocialFoundVo.setSettleDomainName(updateTEmployeeProject.getDeptName());
+			updateSocialFoundVo.setUnitId(updateTEmployeeProject.getUnitId());
+			updateSocialFoundVo.setUnitName(updateTEmployeeProject.getUnitName());
 			updateSocialFoundVo.setSocialCreateMonth(tEmpChangeInfo.getChangeStartMonth());
 			socialDaprUtils.updatePaymentSocialAndFound(updateSocialFoundVo);
 			socialDaprUtils.updateForSocialAndFound(updateSocialFoundVo);
@@ -244,6 +245,7 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 				updateSocialFoundVo.setSettleDomainId(tEmployeeProject.getDeptId());
 				updateSocialFoundVo.setUnitId(tEmployeeProject.getUnitId());
 				updateSocialFoundVo.setUnitName(tEmployeeProject.getUnitName());
+				updateSocialFoundVo.setSettleDomainName(tEmployeeProject.getDeptName());
 				updateSocialFoundVo.setSocialCreateMonth(tEmployeeProject.getChangeStartMonth());
 				socialDaprUtils.updatePaymentSocialAndFound(updateSocialFoundVo);
 				socialDaprUtils.updateForSocialAndFound(updateSocialFoundVo);

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/SocialDaprUtils.java

@@ -64,7 +64,7 @@ public class SocialDaprUtils {
 	 * @return
 	 **/
 	public void updateForSocialAndFound(UpdateSocialFoundVo infoVo) {
-		HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tpaymentinfo/inner/updateForSocialAndFound", JSON.toJSONString(infoVo), UpdateSocialFoundVo.class, SecurityConstants.FROM_IN);
+		HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/tforecastlibrary/inner/updateForSocialAndFound", JSON.toJSONString(infoVo), UpdateSocialFoundVo.class, SecurityConstants.FROM_IN);
 	}
 
 	/**

yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml

@@ -1093,8 +1093,9 @@
 		SETTLE_DOMAIN_CODE = #{infoVo.settleDomainCode},
 		SETTLE_DOMAIN_ID = #{infoVo.settleDomainId}
 		where
-			(SALARY_SOCIAL_FLAG = '0' or SALARY_FUND_FLAG = '0') and PUSH_STATUS = '1' and EMP_IDCARD = #{infoVo.empIdcard}
-			and (SOCIAL_CREATE_MONTH >= #{infoVo.socialCreateMonth} or PROVIDENT_CREATE_MONTH >= #{infoVo.socialCreateMonth})
+			(SALARY_SOCIAL_FLAG = '0' and SOCIAL_CREATE_MONTH >= #{infoVo.socialCreateMonth}) or
+			(SALARY_FUND_FLAG = '0' and PROVIDENT_CREATE_MONTH >= #{infoVo.socialCreateMonth})
+			and PUSH_STATUS = '1' and EMP_IDCARD = #{infoVo.empIdcard}
 	</update>
 
 	<!-- 更改社保推送结算状态 -->