生成收入接口修改

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

@@ -1419,14 +1419,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		return str;
 	}
 
-	public boolean saveCheck(EmployeeXProjectVO employeeXProjectVO, TEmployeeProject tEmployeeProject) {
-		if (employeeXProjectVO.getDeptNo().equals(tEmployeeProject.getDeptNo()) &&
-				employeeXProjectVO.getEmpIdcard().equals(tEmployeeProject.getEmpIdcard())) {
-			return true;
-		}
-		return false;
-	}
-
 	/**
 	 * @Description: 更新社保公积金状态 ： 0 无社保|无公积金 1 处理中 2.部分购买 3.正常 4.已派减
 	 * 派增：

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

@@ -117,6 +117,8 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
 
 	void updatePaymentSocialAndFound(@Param("infoVo") UpdateSocialFoundVo infoVo);
 
+	void updateByIncome(@Param("id")String id);
+
 	/**
 	 * 更新社保推送
 	 * @Author huyc

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

@@ -304,9 +304,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 			tIncomeDetail.setCreateTime(new Date());
 			tIncomeDetail.setDataCreateMonth(DateUtil.addMonth(0));
 			tIncomeDetailService.save(tIncomeDetail);
-			TPaymentInfo paymentInfo = tPaymentInfoMapper.selectById(tIncomeDetail.getSourceId());
-			paymentInfo.setIncomeStatus(CommonConstants.ZERO_STRING);
-			tPaymentInfoMapper.updateById(paymentInfo);
+			tPaymentInfoMapper.updateByIncome(tIncomeDetail.getSourceId());
 			// 不存在，直接新增
 			if (incomeList == null || incomeList.isEmpty()) {
 				BeanUtil.copyProperties(tIncomeDetail, income);

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

@@ -104,6 +104,7 @@
 		<result property="updateBy" column="UPDATE_BY"/>
 		<result property="createName" column="CREATE_NAME"/>
 		<result property="createTime" column="CREATE_TIME"/>
+		<result property="incomeStatus" column="INCOME_STATUS"/>
 	</resultMap>
 	<sql id="Base_Column_List">
 				a.ID,
@@ -1098,6 +1099,14 @@
 			and PUSH_STATUS = '1' and EMP_IDCARD = #{infoVo.empIdcard}
 	</update>
 
+	<!-- 更改薪资公积金结算状态 -->
+	<update id="updateByIncome">
+		update t_payment_info
+		set INCOME_STATUS = '0'
+		where
+			ID = #{id}
+	</update>
+
 	<!-- 更改社保推送结算状态 -->
 	<update id="updatePushStatus">
 		update t_payment_info