Merge remote-tracking branch 'origin/develop' into develop

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-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TStatisticsCurrentReportMapper.java

@@ -39,7 +39,8 @@ public interface TStatisticsCurrentReportMapper extends BaseMapper<TStatisticsCu
     IPage<TStatisticsCurrentReport> getTStatisticsCurrentReportPage(Page<TStatisticsCurrentReport> page, @Param("tStatisticsCurrentReport") TStatisticsCurrentReport tStatisticsCurrentReport);
 
 	int insertStatisticsCurrentReport(@Param("declareMonth") String declareMonth
-			, @Param("lastTwoMonth") String lastTwoMonth, @Param("lastTwoYear") String lastTwoYear);
+			, @Param("lastMonth") String lastMonth, @Param("lastTwoMonth") String lastTwoMonth
+			, @Param("lastTwoYear") String lastTwoYear);
 
 	/**
 	 * @param yearMonth

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

@@ -64,5 +64,5 @@ public interface TStatisticsCurrentReportService extends IService<TStatisticsCur
 	 * @Date: 2022/2/23 15:10
 	 * @return: com.yifu.cloud.v1.common.core.util.R<java.lang.String>
 	 **/
-	R<String> doRefreshStatisticsCurrentReport(String declareMonth, String lastTwoMonth);
+	R<String> doRefreshStatisticsCurrentReport(String declareMonth, String lastMonth, String lastTwoMonth);
 }

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

@@ -159,7 +159,7 @@ public class TStatisticsCurrentReportServiceImpl extends ServiceImpl<TStatistics
 	}
 
 	@Override
-	public R<String> doRefreshStatisticsCurrentReport(String declareMonth, String lastTwoMonth) {
+	public R<String> doRefreshStatisticsCurrentReport(String declareMonth, String lastMonth, String lastTwoMonth) {
 		int firstDelete = baseMapper.deleteByYearMonth(declareMonth);
 		if (firstDelete != -2) {
 			String mons = declareMonth.substring(4, 6);
@@ -167,7 +167,7 @@ public class TStatisticsCurrentReportServiceImpl extends ServiceImpl<TStatistics
 			if ("02".equals(mons)) {
 				lastTwoYear = "-";
 			}
-			baseMapper.insertStatisticsCurrentReport(declareMonth, lastTwoMonth, lastTwoYear);
+			baseMapper.insertStatisticsCurrentReport(declareMonth, lastMonth, lastTwoMonth, lastTwoYear);
 			return R.ok("已生成完毕！");
 		} else {
 			return R.failed("删除本期申报失败！");

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

@@ -66,7 +66,7 @@ public class TStatisticsTaxSalaryTwoServiceImpl extends ServiceImpl<TStatisticsT
 				R<String> taxR = this.doStatisticsTaxSalary(tableName, declareMonth, lastMonth);
 				if (taxR.getCode() == CommonConstants.SUCCESS) {
 					// 刷新对应结算月的 本期申报
-					tStatisticsCurrentReportService.doRefreshStatisticsCurrentReport(declareMonth, lastTwoMonth);
+					tStatisticsCurrentReportService.doRefreshStatisticsCurrentReport(declareMonth, lastMonth, lastTwoMonth);
 				} else {
 					log.error(taxR.getMsg());
 				}

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsCurrentReportMapper.xml

@@ -239,7 +239,7 @@
 				s.UNIT_NAME,
 				s.SPECIAL_DEDU_MONEY,
 				s.sum_baby_money,
-				s.IS_NEW_EMPLOYEE,
+				if (#{lastMonth} = s.CREATE_MONTH,1,0) IS_NEW_EMPLOYEE,
 				s.CREATE_MONTH,
 				s.EMP_PHONE
 			from t_statistics_tax_salary s

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>
 
 	<!-- 更改社保推送结算状态 -->