Skip to content

Y
yifu-mvp
Commit a18f1a57 authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.5' into MVP1.5

parents 43354f0c 145e3bf9
Hide whitespace changes
Inline Side-by-side
Showing with 267 additions and 64 deletions
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @ a18f1a57
......@@ -1668,6 +1668,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
.eq(TSalaryAccount::getEmpIdcard,a.getEmpIdcard())
.eq(TSalaryAccount::getFormType,CommonConstants.THREE_STRING)
.eq(TSalaryAccount::getSalaryMonth,a.getSalaryMonth())
.eq(TSalaryAccount::getInvoiceTitle,a.getInvoiceTitle())
.eq(TSalaryAccount::getDeleteFlag,CommonConstants.ZERO_INT));
// 本次实发
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentSocialPush.java 0 → 100644
View file @ a18f1a57
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* 社保合并推送id记录表
*
* @author huyc
* @date 2023-2-9 16:11:24
*/
@Data
@TableName("t_send_ekp_error")
@Schema(description = "社保合并推送id记录表")
public class TPaymentSocialPush {
@TableId(type = IdType.ASSIGN_ID)
@Schema(description = "主键")
private String id;
@Schema(description = "社保明细id拼接字符")
private String paymentIds;
@Schema(description = "结算状态0 已结算 1 未结算")
private Integer status;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentSocialPushController.java 0 → 100644
View file @ a18f1a57
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 社保合并推送id记录表
*
* @author huyc
* @date 2023-2-9 16:11:24
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/tpaymentsocialpush")
@Tag(name = "社保合并推送id记录表")
public class TPaymentSocialPushController {
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentSocialPushMapper.java 0 → 100644
View file @ a18f1a57
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentSocialPush;
import org.apache.ibatis.annotations.Mapper;
/**
* error存储
*
* @author hgw
* @date 2022-9-7 16:28:46
*/
@Mapper
public interface TPaymentSocialPushMapper extends BaseMapper<TPaymentSocialPush> {
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPaymentSocialPushService.java 0 → 100644
View file @ a18f1a57
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package com.yifu.cloud.plus.v1.yifu.social.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentSocialPush;
/**
* 收入明细表
*
* @author huyc
* @date 2023-2-9 16:11:24
*/
public interface TPaymentSocialPushService extends IService<TPaymentSocialPush> {
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ a18f1a57
......@@ -1266,39 +1266,27 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
private void initAddHandleItem(TDispatchImportVo excel, TSocialFundInfo socialFund, TDispatchInfo dispatch, SysBaseSetInfo socialSet, boolean injury) {
StringBuffer temp = new StringBuffer();
if (Common.isEmpty(socialFund)){
if (Common.isNotNull(excel.getSocialHousehold())){
if (Common.isEmpty(socialFund.getPensionHandle())
|| CommonConstants.TWO_STRING.equals(socialFund.getPensionHandle())
|| CommonConstants.THREE_STRING.equals(socialFund.getPensionHandle())){
if (Common.isNotNull(excel.getSocialHousehold())) {
if (Common.isNotNull(excel.getPensionStart())) {
temp.append(DispatchConstants.DISPATCH_PENSION);
}
if (Common.isEmpty(socialFund.getMedicalHandle())
|| CommonConstants.TWO_STRING.equals(socialFund.getMedicalHandle())
|| CommonConstants.THREE_STRING.equals(socialFund.getMedicalHandle())){
temp.append(DispatchConstants.DISPATCH_MEDICAL);
}
if (Common.isNotNull(excel.getMedicalStart())) {
temp.append(DispatchConstants.DISPATCH_MEDICAL);
}
if (Common.isEmpty(socialFund.getBirthHandle())
|| CommonConstants.TWO_STRING.equals(socialFund.getBirthHandle())
|| CommonConstants.THREE_STRING.equals(socialFund.getBirthHandle())){
if (Common.isNotNull(excel.getBirthStart())) {
temp.append(DispatchConstants.DISPATCH_BIRTH);
}
if (Common.isEmpty(socialFund.getWorkInjuryHandle())
|| CommonConstants.TWO_STRING.equals(socialFund.getWorkInjuryHandle())
|| CommonConstants.THREE_STRING.equals(socialFund.getWorkInjuryHandle())){
if (Common.isNotNull(excel.getWorkInjuryStart())) {
temp.append(DispatchConstants.DISPATCH_INJURY);
}
if (Common.isEmpty(socialFund.getUnemployHandle())
|| CommonConstants.TWO_STRING.equals(socialFund.getUnemployHandle())
|| CommonConstants.THREE_STRING.equals(socialFund.getUnemployHandle())){
if (Common.isNotNull(excel.getUnemployStart())) {
temp.append(DispatchConstants.DISPATCH_UNEMP);
}
if ((Common.isEmpty(socialFund.getBigailmentHandle())
|| CommonConstants.TWO_STRING.equals(socialFund.getBigailmentHandle())
|| CommonConstants.THREE_STRING.equals(socialFund.getBigailmentHandle()))
&& CommonConstants.ZERO_STRING.equals(socialSet.getIsIllness())) {
if (Common.isNotNull(excel.getBigailmentStart())
&& CommonConstants.ZERO_STRING.equals(socialSet.getIsIllness())) {
temp.append(DispatchConstants.DISPATCH_BIGMAILMENT);
}
}
if (Common.isNotNull(excel.getProvidentHousehold())){
temp.append(DispatchConstants.DISPATCH_FUND);
}
......@@ -2697,7 +2685,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
continue;
}
// 自定义校验
if (validReduce(errorMessageList,excelVOTemp, socialFundMap,socialFund, excel)){
if (validReduce(errorMessageList,excelVOTemp, socialFundMap,socialFund, excel)){
continue;
}
if (Common.isNotNull(empVoMap)) {
......@@ -3152,6 +3140,31 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
boolean flagTemp = false;
// 派增审核不通过 失败项重新派单审核不通过 或 派减审核不通过 恢复为部分办理失败
flagTemp = Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId())
&& (CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())
|| ((CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness()))
))
&& !(
(CommonConstants.ONE_STRING.equals(sf.getPensionHandle()) || CommonConstants.FOUR_STRING.equals(sf.getPensionHandle()))
&& (CommonConstants.ONE_STRING.equals(sf.getMedicalHandle()) || CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle()))
&& (CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle()) || CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle()))
&& (CommonConstants.ONE_STRING.equals(sf.getBirthHandle()) || CommonConstants.FOUR_STRING.equals(sf.getBirthHandle()))
&& (CommonConstants.ONE_STRING.equals(sf.getUnemployHandle()) || CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle()))
&& ((CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())));
// 派增审核通过 要更新 人员档案 项目档案 合同的状态信息
if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){
R<Boolean> res = null;
......@@ -3160,41 +3173,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
if (CommonConstants.ONE_INT == flag){
res = archivesDaprUtil.updateEmpInfo(dis.getEmpIdcard(),dis.getSettleDomainCode(),dis.getContractId(),CommonConstants.ONE_STRING,remarkTemp);
// 派增审核不通过 失败项重新派单审核不通过 恢复为部分办理失败
flagTemp = Common.isNotNull(sf) && Common.isNotNull(dis.getSocialId())
&& (CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())
|| ((CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness()))
))
&& !(
(CommonConstants.ONE_STRING.equals(sf.getPensionHandle()) || CommonConstants.FOUR_STRING.equals(sf.getPensionHandle()))
&& (CommonConstants.ONE_STRING.equals(sf.getMedicalHandle()) || CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle()))
&& (CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle()) || CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle()))
&& (CommonConstants.ONE_STRING.equals(sf.getBirthHandle()) || CommonConstants.FOUR_STRING.equals(sf.getBirthHandle()))
&& (CommonConstants.ONE_STRING.equals(sf.getUnemployHandle()) || CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle()))
&& ((CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle()) || CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())));
if (flagTemp){
sf.setSocialStatus(CommonConstants.FOUR_STRING);
sf.setSocialAddStatus(CommonConstants.THREE_STRING);
}
}
if (Common.isEmpty(res) || CommonConstants.SUCCESS != res.getCode()){
ServiceUtil.runTimeExceptionDiy("更新人员档案、项目档案、合同状态异常：" + (Common.isNotNull(res)?res.getMsg():CommonConstants.EMPTY_STRING));
}
}
if (CommonConstants.ONE_INT == flag && flagTemp){
sf.setSocialStatus(CommonConstants.FOUR_STRING);
sf.setSocialAddStatus(CommonConstants.THREE_STRING);
}
//新增审核记录信息
auditInfo.setEmpIdcard(dis.getEmpIdcard());
auditInfo.setDispatchInfoId(dis.getId());
......@@ -3381,14 +3368,29 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
|| CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())))
&& !(CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
&& CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
&& CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
&& CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
&& CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getPensionHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getBirthHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle())
|| ((CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness()))
))
&& !((CommonConstants.ONE_STRING.equals(sf.getPensionHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getPensionHandle()))
&& (CommonConstants.ONE_STRING.equals(sf.getMedicalHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getMedicalHandle()))
&& (CommonConstants.ONE_STRING.equals(sf.getWorkInjuryHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getWorkInjuryHandle()))
&& (CommonConstants.ONE_STRING.equals(sf.getBirthHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getBirthHandle()))
&& (CommonConstants.ONE_STRING.equals(sf.getUnemployHandle())
|| CommonConstants.FOUR_STRING.equals(sf.getUnemployHandle()))
&& (CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ZERO_STRING.equals(sf.getIsIllness())));
|| CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle())
|| Common.isEmpty(sf.getBigailmentHandle()))
);
if (!CommonConstants.TWO_STRING.equals(dis.getStatus())) {
errorList.add(new ErrorMessage(-1, "派单审核通过后才可以办理：" + dis.getEmpName()));
continue;
......@@ -3402,6 +3404,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
socialInfo = socialMapper.selectById(dis.getSocialId());
socialTypeRemark = getHandleRemark(socialType, socialInfo,dis.getType());
// 无更新直接跳过
if (Common.isEmpty(socialTypeRemark.toString())) {
continue;
}
} else {
socialInfo = null;
}
......@@ -3963,8 +3969,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
|| CommonConstants.FOUR_STRING.equals(sf.getBirthHandle()))
&& (Common.isEmpty(sf.getBigailmentHandle())
|| CommonConstants.ONE_STRING.equals(sf.getBigailmentHandle())
|| (CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ONE_STRING.equals(socialInfo.getIsIllness())))
|| CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))
) {
// 全部成功（或者为空--兼容历史数据问题）：全部成功
socialInfo.setHandleStatus(CommonConstants.ONE_STRING);
......@@ -3981,8 +3986,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
&& (Common.isEmpty(sf.getBirthHandle()) || CommonConstants.TWO_STRING.equals(sf.getBirthHandle()))
&& (Common.isEmpty(sf.getBigailmentHandle())
|| CommonConstants.TWO_STRING.equals(sf.getBigailmentHandle())
|| (CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle())
&& CommonConstants.ONE_STRING.equals(socialInfo.getIsIllness())))
|| CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()))
) {
// 全部失败（或者为空）：全部失败
socialInfo.setHandleStatus(CommonConstants.TWO_STRING);
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentSocialPushMapper.xml 0 → 100644
View file @ a18f1a57
<?xml version="1.0" encoding="UTF-8"?>
<!--
~
~ Copyright (c) 2018-2025, lengleng All rights reserved.
~
~ Redistribution and use in source and binary forms, with or without
~ modification, are permitted provided that the following conditions are met:
~
~ Redistributions of source code must retain the above copyright notice,
~ this list of conditions and the following disclaimer.
~ Redistributions in binary form must reproduce the above copyright
~ notice, this list of conditions and the following disclaimer in the
~ documentation and/or other materials provided with the distribution.
~ Neither the name of the yifu4cloud.com developer nor the names of its
~ contributors may be used to endorse or promote products derived from
~ this software without specific prior written permission.
~ Author: lengleng (wangiegie@gmail.com)
~
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yifu.cloud.plus.v1.yifu.social.mapper.TPaymentSocialPushMapper">
<resultMap id="tSendEkpErrorMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentSocialPush">
<id property="id" column="ID"/>
<result property="paymentIds" column="PAYMENT_IDS"/>
<result property="status" column="STATUS"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
a.PAYMENT_IDS,
a.STATUS
</sql>
<sql id="tPaymentSocialPush_where">
<if test="tPaymentSocialPush != null">
<if test="tPaymentSocialPush.id != null and tPaymentSocialPush.id.trim() != ''">
AND a.ID = #{tSendEkpError.id}
</if>
<if test="tPaymentSocialPush.paymentIds != null and tPaymentSocialPush.paymentIds.trim() != ''">
AND a.PAYMENT_IDS = #{tPaymentSocialPush.paymentIds}
</if>
<if test="tPaymentSocialPush.status == null">
AND a.STATUS = #{tPaymentSocialPush.status}
</if>
</if>
</sql>
</mapper>
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