Commit a5a18e13 authored by fangxinjiang's avatar fangxinjiang

Merge branch 'MVP1.5' into develop

parents 04e03c06 cad73302
......@@ -24,7 +24,10 @@ import java.io.Serializable;
*/
@Data
public class UpProjectSocialFundVo implements Serializable {
// 社保状态 社保状态(字典): 0 无社保 1 处理中 2.部分购买 3.正常 4.已派减
/**
* @Author fxj
* @Description 社保状态 社保状态(字典): 0 无社保 1 处理中 2.部分购买 3.正常 4.已派减
**/
@Schema(name = "社保状态(字典): 0 无社保 1 处理中 2.部分购买 3.正常 4.已派减")
String socialStatus;
// 公积金状态 社保状态(字典): 0 无社保 1 处理中 2.正常 3.已派减
......
......@@ -102,6 +102,20 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
*/
int updateStatusById(@Param("tPaymentInfo")TPaymentInfo tPaymentInfo);
/**
* 更新结算状态
* @param sUpdateList 缴费库
* @return
*/
int updateBatchByIdList(@Param("details")List<TPaymentInfo> sUpdateList);
/**
* 更新结算状态
* @param sUpdateList 缴费库
* @return
*/
int updateBatchByIdList1(@Param("details")List<TPaymentInfo> sUpdateList);
/**
* 通过ID获取缴费库 及社保、公积金明细
* @param id
......
......@@ -3858,12 +3858,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
){
vo.setSocialStatus(CommonConstants.ZERO_STRING);
}
// 待办理或办理中或部分办理失败或审核不通过部分办理成功或派减办理中为 处理中
if (CommonConstants.ZERO_STRING.equals(sf.getSocialStatus())
|| CommonConstants.TWO_STRING.equals(sf.getSocialStatus())
|| CommonConstants.ELEVEN_STRING.equals(sf.getSocialStatus())){
vo.setSocialStatus(CommonConstants.ONE_STRING);
}
// 部分办理失败或审核不通过部分办理成功或派减部分办理失败 为 部分购买
if (CommonConstants.FOUR_STRING.equals(sf.getSocialStatus())
|| CommonConstants.TWELVE_STRING.equals(sf.getSocialStatus())
......@@ -3884,6 +3878,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
){
vo.setSocialStatus(CommonConstants.TWO_STRING);
}
// 待办理或办理中或部分办理失败或审核不通过部分办理成功或派减办理中为 处理中
if (CommonConstants.ZERO_STRING.equals(sf.getSocialStatus())
|| CommonConstants.TWO_STRING.equals(sf.getSocialStatus())
|| CommonConstants.ELEVEN_STRING.equals(sf.getSocialStatus())){
vo.setSocialStatus(CommonConstants.ONE_STRING);
}
if (CommonConstants.NINE_STRING.equals(sf.getSocialStatus())){
// 如果办理失败 全部派减失败为正常购买
if (CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())
......
......@@ -3348,8 +3348,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
public Boolean updateSocialSettleStatus(List<EkpSocialViewVo> viewVoList) {
if (!viewVoList.isEmpty()) {
TForecastLibrary library;
List<TPaymentInfo> sUpdateList = new ArrayList<>();
List<TPaymentInfo> zSpdateList = new ArrayList<>();
TPaymentSocialPush socialPush;
TPaymentInfo paymentInfo;
try {
......@@ -3366,11 +3364,11 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
if (CommonConstants.ZERO_STRING.equals(viewVo.getPayFlag())) {
tPaymentInfo.setIncomeSettleFlag(viewVo.getIncomeSettleFlag());
tPaymentInfo.setIncomeCollectFlag(viewVo.getIncomeCollectFlag());
sUpdateList.add(tPaymentInfo);
baseMapper.updateStatusById(tPaymentInfo);
} else {
tPaymentInfo.setPaySettleFlag(viewVo.getPaySettleFlag());
tPaymentInfo.setPayCollectFlag(viewVo.getPayCollectFlag());
zSpdateList.add(tPaymentInfo);
baseMapper.updateStatusById(tPaymentInfo);
}
log.info("缴费库实缴费用状态更新");
......@@ -3408,12 +3406,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
}
}
if (!sUpdateList.isEmpty()) {
this.updateBatchById(sUpdateList);
}
if (!zSpdateList.isEmpty()) {
this.updateBatchById(zSpdateList);
}
} catch (Exception e) {
log.error("更新社保结算状态失败", e);
return false;
......
......@@ -1270,6 +1270,22 @@
where ID = #{tPaymentInfo.id}
</update>
<update id="updateBatchByIdList">
<foreach collection="details" index="index" item="item" separator=";">
update t_payment_info set INCOME_SETTLE_FLAG = #{item.incomeSettleFlag},
INCOME_COLLECT_FLAG = #{item.incomeCollectFlag}
where ID = #{item.id}
</foreach>
</update>
<update id="updateBatchByIdList1">
<foreach collection="details" index="index" item="item" separator=";">
update t_payment_info set PAY_SETTLE_FLAG = #{item.paySettleFlag},
PAY_COLLECT_FLAG = #{item.payCollectFlag}
where ID = #{item.id}
</foreach>
</update>
<!--tPaymentInfo 按ID查收缴费库包含社保和公积金明细的数据查询-->
<select id="getAllInfoById" resultMap="tPaymentAllInfoMap">
SELECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment