工资拉取-社保公积金

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java

@@ -207,6 +207,18 @@ public class TSalaryAccount {
 	@Length(max = 1, message = "公积金优先级0：生成月；1：缴纳月不能超过1个字符")
 	@ExcelProperty("公积金优先级0：生成月；1：缴纳月")
 	private String fundPriority;
+	/**
+	 * 社保类型0：缴费库；1：预估库
+	 */
+	@ExcelAttribute(name = "社保类型0：缴费库；1：预估库")
+	@ExcelProperty("社保类型0：缴费库；1：预估库")
+	private String socialType;
+	/**
+	 * 公积金类型0：缴费库；1：预估库
+	 */
+	@ExcelAttribute(name = "公积金类型0：缴费库；1：预估库")
+	@ExcelProperty("公积金类型0：缴费库；1：预估库")
+	private String fundType;
 	/**
 	 * 年终奖扣税方案0：合并；1：单独
 	 */

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TForecastLibrary.java

@@ -514,6 +514,19 @@ public class TForecastLibrary extends BaseEntity {
 	@ExcelProperty("数据类型：预估/差额")
 	private String diffType;
 
+	/**
+	 * 工资社保结算状态  0: 未结算  1: 待结算  2: 已结算
+	 */
+	@ExcelAttribute(name = "工资社保结算状态", maxLength = 1,isDataId = true,dataType = "settlement_flag")
+	@ExcelProperty("工资社保结算状态")
+	private String salarySocialFlag;
+	/**
+	 * 工资公积金结算状态  0: 未结算  1: 待结算  2: 已结算
+	 */
+	@ExcelAttribute(name = "工资公积金结算状态", maxLength = 1,isDataId = true,dataType = "settlement_flag")
+	@ExcelProperty("工资公积金结算状态")
+	private String salaryFundFlag;
+
 	@TableField(exist = false)
 	private List<String> idList;
 

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TForecastLibraryController.java

@@ -23,6 +23,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary;
 import com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -32,6 +34,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 
 /**
@@ -179,5 +182,69 @@ public class TForecastLibraryController {
 		tForecastLibraryService.everyMonthCreateForecastLibary();
 	}
 
+	/**
+	 * @Description: 薪资获取预估库
+	 * @Author: hgw
+	 * @Date: 2022/8/10 18:06
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo>
+	 **/
+	@Inner
+	@PostMapping("/inner/selectTForecastBySalaryVo")
+	public TPaymentVo selectTForecastBySalaryVo(@RequestBody TPaymentBySalaryVo tPaymentBySalaryVo) {
+		return tForecastLibraryService.selectTForecastBySalaryVo(tPaymentBySalaryVo);
+	}
+
+	//hgw 以下4个方法，薪资变更缴费库预估库结算状态专用
+	/**
+	 * @param idList
+	 * @Description: 社保变为结算
+	 * @Author: hgw
+	 * @Date: 2022/8/16 18:22
+	 * @return: int
+	 **/
+	@Inner
+	@PostMapping("/inner/updateForecastSocialStatusToSettle")
+	public int updateForecastSocialStatusToSettle(@RequestBody List<String> idList) {
+		return tForecastLibraryService.updateForecastSocialStatusToSettle(idList);
+	}
+
+	/**
+	 * @param idList
+	 * @Description: 社保变为未结算
+	 * @Author: hgw
+	 * @Date: 2022/8/16 18:23
+	 * @return: int
+	 **/
+	@Inner
+	@PostMapping("/inner/updateForecastSocialStatusToNoSettle")
+	public int updateForecastSocialStatusToNoSettle(@RequestBody List<String> idList) {
+		return tForecastLibraryService.updateForecastSocialStatusToNoSettle(idList);
+	}
+
+	/**
+	 * @param idList
+	 * @Description: 公积金变为结算
+	 * @Author: hgw
+	 * @Date: 2022/8/16 18:23
+	 * @return: int
+	 **/
+	@Inner
+	@PostMapping("/inner/updateForecastFundStatusToSettle")
+	public int updateForecastFundStatusToSettle(@RequestBody List<String> idList) {
+		return tForecastLibraryService.updateForecastFundStatusToSettle(idList);
+	}
+
+	/**
+	 * @param idList
+	 * @Description: 公积金变为未结算
+	 * @Author: hgw
+	 * @Date: 2022/8/16 18:23
+	 * @return: int
+	 **/
+	@Inner
+	@PostMapping("/inner/updateForecastFundStatusToNoSettle")
+	public int updateForecastFundStatusToNoSettle(@RequestBody List<String> idList) {
+		return tForecastLibraryService.updateForecastFundStatusToNoSettle(idList);
+	}
 
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.java

@@ -223,4 +223,54 @@ public class TPaymentInfoController {
 	public TPaymentVo selectTPaymentBySalaryVo(@RequestBody TPaymentBySalaryVo tPaymentBySalaryVo) {
 		return tPaymentInfoService.selectTPaymentBySalaryVo(tPaymentBySalaryVo);
 	}
+
+	//hgw 以下4个方法，薪资变更缴费库预估库结算状态专用
+	/**
+	 * @param idList
+	 * @Description: 社保变为结算
+	 * @Author: hgw
+	 * @Date: 2022/8/16 18:22
+	 * @return: int
+	 **/
+	@Inner
+	@PostMapping("/inner/updatePaymentSocialStatusToSettle")
+	public int updatePaymentSocialStatusToSettle(@RequestBody List<String> idList) {
+		return tPaymentInfoService.updatePaymentSocialStatusToSettle(idList);
+	}
+	/**
+	 * @param idList
+	 * @Description: 社保变为结算
+	 * @Author: hgw
+	 * @Date: 2022/8/16 18:22
+	 * @return: int
+	 **/
+	@Inner
+	@PostMapping("/inner/updatePaymentSocialStatusToNoSettle")
+	public int updatePaymentSocialStatusToNoSettle(@RequestBody List<String> idList) {
+		return tPaymentInfoService.updatePaymentSocialStatusToNoSettle(idList);
+	}
+	/**
+	 * @param idList
+	 * @Description: 公积金变为结算
+	 * @Author: hgw
+	 * @Date: 2022/8/16 18:22
+	 * @return: int
+	 **/
+	@Inner
+	@PostMapping("/inner/updatePaymentFundStatusToSettle")
+	public int updatePaymentFundStatusToSettle(@RequestBody List<String> idList) {
+		return tPaymentInfoService.updatePaymentFundStatusToSettle(idList);
+	}
+	/**
+	 * @param idList
+	 * @Description: 公积金变为未结算
+	 * @Author: hgw
+	 * @Date: 2022/8/16 18:22
+	 * @return: int
+	 **/
+	@Inner
+	@PostMapping("/inner/updatePaymentFundStatusToNoSettle")
+	public int updatePaymentFundStatusToNoSettle(@RequestBody List<String> idList) {
+		return tPaymentInfoService.updatePaymentFundStatusToNoSettle(idList);
+	}
 }

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

@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TForecastLibraryExportVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -51,4 +52,18 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
 	 **/
 	List<TForecastLibraryExportVo> exportLibrary(@Param("tForecastLibrary") TForecastLibrary tForecastLibrary);
 
+	List<TPaymentBySalaryVo> selectTForecastBySalaryVo(@Param("tPaymentInfo") TPaymentBySalaryVo tPaymentInfo);
+
+	/**
+	 * 更新社保结算状态
+	 * @Author hgw
+	 * @Date 2020-4-13 16:01:59
+	 * @param idList
+	 * @param status
+	 * @return
+	 **/
+	int updateForecastSocialStatusByIdList(@Param("idList") List<String> idList, @Param("status") String status);
+
+	int updateForecastFundStatusByIdList(@Param("idList")List<String> idList, @Param("status") String status);
+
 }

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

@@ -94,4 +94,16 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
 	 **/
 	List<TPaymentBySalaryVo> selectTPaymentBySalaryVo(@Param("tPaymentInfo") TPaymentBySalaryVo tPaymentInfo);
 
+	/**
+	 * 更新社保结算状态
+	 * @Author hgw
+	 * @Date 2020-4-13 16:01:59
+	 * @param idList
+	 * @param status
+	 * @return
+	 **/
+	int updatePaymentSocialStatusByIdList(@Param("idList") List<String> idList, @Param("status") String status);
+
+	int updatePaymentFundStatusByIdList(@Param("idList")List<String> idList, @Param("status") String status);
+
 }

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

@@ -21,11 +21,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 预估费用
@@ -104,4 +107,19 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
 	 **/
 	void everyMonthCreateForecastLibary();
 
+	/**
+	 * @param tPaymentBySalaryVo
+	 * @Description: 获取预估库数据
+	 * @Author: hgw
+	 * @Date: 2022/8/16 17:46
+	 * @return: com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo
+	 **/
+	TPaymentVo selectTForecastBySalaryVo(TPaymentBySalaryVo tPaymentBySalaryVo);
+
+	// 以下4个方法，薪资变更缴费库预估库结算状态专用
+	int updateForecastSocialStatusToSettle(List<String> idList);
+	int updateForecastSocialStatusToNoSettle(List<String> idList);
+	int updateForecastFundStatusToSettle(List<String> idList);
+	int updateForecastFundStatusToNoSettle(List<String> idList);
+
 }

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

@@ -122,4 +122,11 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
 	 **/
 	TPaymentVo selectTPaymentBySalaryVo(TPaymentBySalaryVo tPaymentBySalaryVo);
 
+	// 以下4个方法，薪资变更缴费库预估库结算状态专用
+	int updatePaymentSocialStatusToSettle(List<String> idList);
+	int updatePaymentSocialStatusToNoSettle(List<String> idList);
+	int updatePaymentFundStatusToSettle(List<String> idList);
+	int updatePaymentFundStatusToNoSettle(List<String> idList);
+
+
 }

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

@@ -29,6 +29,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo;
 import com.yifu.cloud.plus.v1.yifu.social.constants.SocialConstants;
 import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TAgentConfig;
@@ -2067,4 +2069,44 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 		}
 	}
 
+	@Override
+	public TPaymentVo selectTForecastBySalaryVo(TPaymentBySalaryVo tPaymentBySalaryVo) {
+		List<TPaymentBySalaryVo> list = baseMapper.selectTForecastBySalaryVo(tPaymentBySalaryVo);
+		TPaymentVo vo = new TPaymentVo();
+		vo.setPaymentList(list);
+		return vo;
+	}
+
+	@Override
+	public int updateForecastSocialStatusToSettle(List<String> idList) {
+		if (idList != null && !idList.isEmpty()) {
+			return baseMapper.updateForecastSocialStatusByIdList(idList, CommonConstants.ONE_STRING);
+		}
+		return 0;
+	}
+
+	@Override
+	public int updateForecastSocialStatusToNoSettle(List<String> idList) {
+		if (idList != null && !idList.isEmpty()) {
+			return baseMapper.updateForecastSocialStatusByIdList(idList, CommonConstants.ZERO_STRING);
+		}
+		return 0;
+	}
+
+	@Override
+	public int updateForecastFundStatusToSettle(List<String> idList) {
+		if (idList != null && !idList.isEmpty()) {
+			return baseMapper.updateForecastFundStatusByIdList(idList, CommonConstants.ONE_STRING);
+		}
+		return 0;
+	}
+
+	@Override
+	public int updateForecastFundStatusToNoSettle(List<String> idList) {
+		if (idList != null && !idList.isEmpty()) {
+			return baseMapper.updateForecastFundStatusByIdList(idList, CommonConstants.ZERO_STRING);
+		}
+		return 0;
+	}
+
 }

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

@@ -2345,4 +2345,36 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		vo.setPaymentList(list);
 		return vo;
 	}
+
+	@Override
+	public int updatePaymentSocialStatusToSettle(List<String> idList) {
+		if (idList != null && !idList.isEmpty()) {
+			return baseMapper.updatePaymentSocialStatusByIdList(idList, CommonConstants.ONE_STRING);
+		}
+		return 0;
+	}
+
+	@Override
+	public int updatePaymentSocialStatusToNoSettle(List<String> idList) {
+		if (idList != null && !idList.isEmpty()) {
+			return baseMapper.updatePaymentSocialStatusByIdList(idList, CommonConstants.ZERO_STRING);
+		}
+		return 0;
+	}
+
+	@Override
+	public int updatePaymentFundStatusToSettle(List<String> idList) {
+		if (idList != null && !idList.isEmpty()) {
+			return baseMapper.updatePaymentFundStatusByIdList(idList, CommonConstants.ONE_STRING);
+		}
+		return 0;
+	}
+
+	@Override
+	public int updatePaymentFundStatusToNoSettle(List<String> idList) {
+		if (idList != null && !idList.isEmpty()) {
+			return baseMapper.updatePaymentFundStatusByIdList(idList, CommonConstants.ZERO_STRING);
+		}
+		return 0;
+	}
 }

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

@@ -102,6 +102,8 @@
 		<result property="createTime" column="CREATE_TIME"/>
 		<result property="updateBy" column="UPDATE_BY"/>
 		<result property="updateTime" column="UPDATE_TIME"/>
+		<result property="salarySocialFlag" column="SALARY_SOCIAL_FLAG"/>
+		<result property="salaryFundFlag" column="SALARY_FUND_FLAG"/>
 	</resultMap>
 	<!-- 导出 -->
 	<resultMap id="exportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TForecastLibraryExportVo">
@@ -244,6 +246,8 @@
 		a.CREATE_NAME,
 		a.CREATE_TIME,
 		a.UPDATE_BY,
+		a.SALARY_SOCIAL_FLAG,
+		a.SALARY_FUND_FLAG,
 		a.UPDATE_TIME
 	</sql>
 	<sql id="tForecastLibrary_where">
@@ -578,4 +582,84 @@
 			limit #{tForecastLibrary.limitStart},#{tForecastLibrary.limitEnd}
 		</if>
 	</select>
+
+	<!--洪光武2022-8-10 18:05:42-->
+	<resultMap id="tPaymentBySalaryMap" type="com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo">
+		<id property="id" column="ID"/>
+		<result property="empIdcard" column="EMP_IDCARD"/>
+		<result property="unitBitmailmentFee" column="UNIT_BIGMAILMENT_MONEY"/>
+		<result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/>
+		<result property="personalSocialSum" column="SOCIAL_SECURITY_PERSONAL_SUM"/>
+		<result property="unitFundSum" column="UNIT_PROVIDENT_SUM"/>
+		<result property="personalFundSum" column="PERSONAL_PROVIDENT_SUM"/>
+		<result property="salarySocialFlag" column="SALARY_SOCIAL_FLAG"/>
+		<result property="salaryFundFlag" column="SALARY_FUND_FLAG"/>
+		<result property="socialPayMonth" column="SOCIAL_PAY_MONTH"/>
+		<result property="socialCreateMonth" column="SOCIAL_CREATE_MONTH"/>
+		<result property="providentPayMonth" column="PROVIDENT_PAY_MONTH"/>
+		<result property="providentCreateMonth" column="PROVIDENT_CREATE_MONTH"/>
+		<result property="settleDomainId" column="SETTLE_DOMAIN_ID"/>
+	</resultMap>
+
+	<!-- 薪资获取缴费库 -->
+	<select id="selectTForecastBySalaryVo" resultMap="tPaymentBySalaryMap">
+		SELECT
+			a.id,
+			a.EMP_IDCARD,
+			sum(ifnull(a.UNIT_BITAILMENT_FEE,0)) UNIT_BIGMAILMENT_MONEY,
+			sum(ifnull(a.UNIT_SOCIAL_SUM,0)) UNIT_SOCIAL_SUM,
+			sum(ifnull(a.PERSONAL_SOCIAL_SUM,0)) SOCIAL_SECURITY_PERSONAL_SUM,
+			sum(ifnull(a.UNIT_FUND_SUM,0)) UNIT_PROVIDENT_SUM,
+			sum(ifnull(a.PERSONAL_FUND_SUM,0)) PERSONAL_PROVIDENT_SUM,
+			a.SALARY_SOCIAL_FLAG,
+			a.SALARY_FUND_FLAG,
+			a.SOCIAL_PAY_MONTH,
+			a.SOCIAL_CREATE_MONTH,
+			a.PROVIDENT_PAY_MONTH,
+			a.PROVIDENT_CREATE_MONTH,
+			a.SETTLE_DOMAIN_ID
+		FROM t_forecast_library a
+		<where>
+			1=1
+			<if test="tPaymentInfo != null">
+				<if test="tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''">
+					AND a.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth}
+				</if>
+				<if test="tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''">
+					AND a.SOCIAL_CREATE_MONTH = #{tPaymentInfo.socialCreateMonth}
+				</if>
+				<if test="tPaymentInfo.providentPayMonth != null and tPaymentInfo.providentPayMonth.trim() != ''">
+					AND a.PROVIDENT_PAY_MONTH = #{tPaymentInfo.providentPayMonth}
+				</if>
+				<if test="tPaymentInfo.providentCreateMonth != null and tPaymentInfo.providentCreateMonth.trim() != ''">
+					AND a.PROVIDENT_CREATE_MONTH = #{tPaymentInfo.providentCreateMonth}
+				</if>
+				<if test="tPaymentInfo.settleDomainId != null and tPaymentInfo.settleDomainId.trim() != ''">
+					AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
+				</if>
+			</if>
+		</where>
+		GROUP BY a.EMP_IDCARD
+	</select>
+
+	<!-- 更改薪资社保结算状态 -->
+	<update id="updateForecastSocialStatusByIdList">
+		update t_forecast_library set SALARY_SOCIAL_FLAG = #{status}
+		where
+		ID in
+		<foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</update>
+
+	<!-- 更改薪资公积金结算状态 -->
+	<update id="updateForecastFundStatusByIdList">
+		update t_forecast_library set SALARY_FUND_FLAG = #{status}
+		where
+		ID in
+		<foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</update>
+
 </mapper>

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

@@ -1032,4 +1032,25 @@
 		</where>
 		GROUP BY a.EMP_IDCARD
 	</select>
+
+	<!-- 更改薪资社保结算状态 -->
+	<update id="updatePaymentSocialStatusByIdList">
+		update t_payment_info set SALARY_SOCIAL_FLAG = #{status}
+		where
+		ID in
+		<foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</update>
+
+	<!-- 更改薪资公积金结算状态 -->
+	<update id="updatePaymentFundStatusByIdList">
+		update t_payment_info set SALARY_FUND_FLAG = #{status}
+		where
+		ID in
+		<foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</update>
+
 </mapper>