Skip to content

Y
yifu-mvp
Commit 597999f7 authored by 李灿灿's avatar 李灿灿
Browse files
Options

Merge branch 'develop' into feature-licancan

parents 31a7253d 79755e82
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 31 deletions
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @ 597999f7
......@@ -670,7 +670,7 @@
a.ID_TOWN,a.EMP_REGIS_TYPE,a.FILE_PROVINCE,a.FILE_CITY,a.FILE_TOWN,a.HIGN_EDUCATION,a.FILE_STATUS,
b.CONTRACT_NAME,b.CONTRACT_TYPE,
b.CONTRACT_START,b.CONTRACT_END,b.CONTRACT_TERM,b.CONTRACT_SUB_NAME,b.CONTRACT_ID
b.CONTRACT_START,b.CONTRACT_END,b.CONTRACT_TERM,b.CONTRACT_SUB_NAME,b.CONTRACT_ID,
c.UNIT_NAME,
c.UNIT_NO,c.DEPT_ID,c.DEPT_NAME,c.DEPT_NO,c.POST
......
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java
View file @ 597999f7
......@@ -420,4 +420,8 @@ public interface ErrorCodes {
* 当前社保导入队列不足或者数据量过大，请稍后重试！
*/
String SOCIALINFO_LIST_NUM_LARGE = "socialinfo.list.num.large";
/**
* 派增异常： 自定义缴纳养老基数不可为空
*/
String EMP_DISPATCH_SOCIAL_DIY_NOT_EMPTY = "emp.dispatch.social.diy.not.empty";
}
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @ 597999f7
......@@ -111,9 +111,9 @@ project.person.delete.exit=\u8BE5\u4EBA\u5458\u9879\u76EE\u6863\u6848\u5DF2\u51C
emp.dispatch.contract.not.empty=\u6D3E\u5355\u5458\u5DE5\u5408\u540C\u76F8\u5173\u4FE1\u606F\u4E0D\u53EF\u4E3A\u7A7A
emp.dispatch.social.not.empty=\u6D3E\u5355\u5458\u5DE5\u793E\u4FDD\u76F8\u5173\u4FE1\u606F\u4E0D\u53EF\u4E3A\u7A7A
emp.dispatch.social.not.empty=\u6D3E\u5355\u5458\u5DE5\u793E\u4FDD\u76F8\u5173\u4FE1\u606F\u4E0D\u53EF\u4E3A\u7A7A(\u5907\u6848\u57FA\u6570|\u7F34\u7EB3\u7C7B\u578B|\u517B\u8001\u8D77\u7F34\u65F6\u95F4)
emp.dispatch.fund.not.empty=\u6D3E\u5355\u5458\u5DE5\u516C\u79EF\u91D1\u76F8\u5173\u4FE1\u606F\u4E0D\u53EF\u4E3A\u7A7A
emp.dispatch.fund.not.empty=\u6D3E\u5355\u5458\u5DE5\u516C\u79EF\u91D1\u76F8\u5173\u4FE1\u606F\u4E0D\u53EF\u4E3A\u7A7A(\u8D77\u7F34\u65E5\u671F|\u57FA\u6570|\u6BD4\u4F8B)
emp.dispatch.social.existing=\u65B0\u589E\u5F02\u5E38\uFF1A\u5DF2\u5B58\u5728\u793E\u4FDD\u6570\u636E
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/DispatchConstants.java
View file @ 597999f7
......@@ -26,10 +26,12 @@ public class DispatchConstants {
public static final String DISPATCH_ADD = "派增";
public static final String DISPATCH_REDUCE = "派减";
public static final String DISPATCH_SOCIAL_ADD = "社保派增";
public static final String DISPATCH_SOCIAL_HANDLE_SUCCESS = "办理成功：";
public static final String DISPATCH_SOCIAL_HANDLE_FAIL = "办理失败：";
public static final String DISPATCH_HANDLE_SUCCESS = "办理成功：";
public static final String DISPATCH_HANDLE_FAIL = "办理失败：";
public static final String DISPATCH_FUND_ADD_SUCCESS = "公积金派增办理成功：";
public static final String DISPATCH_FUND_ADD_FAIL = "公积金派增办理失败：";
public static final String DISPATCH_FUND_REDUCE = "公积金派减";
public static final String DISPATCH_SOCIAL_REDUCE = "社保派减";
/**
......
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TAuditInfo.java
View file @ 597999f7
......@@ -56,13 +56,13 @@ public class TAuditInfo implements Serializable {
@ExcelProperty("社保ID" )
private String socialId;
/**
* 审核状态（0wait/1success/2fail）
* 审核状态（0 待审核 1 审核通过 2 审核不通过 3 办理成功 4 办理失败 5 部分办理失败 6派减）
*/
@NotBlank(message = "审核状态（0wait/1success/2fail）不能为空" )
@Length(max = 1, message = "审核状态（0wait/1success/2fail） 不能超过1个字符" )
@ExcelAttribute(name = "审核状态（0wait/1success/2fail）", isNotEmpty = true, errorInfo = "审核状态（0wait/1success/2fail）不能为空", maxLength = 1)
@Schema(description = "审核状态（0wait/1success/2fail）" )
@ExcelProperty("审核状态（0wait/1success/2fail）" )
@NotBlank(message = "审核状态不能为空" )
@Length(max = 1, message = "审核状态 不能超过1个字符" )
@ExcelAttribute(name = "审核状态", isNotEmpty = true, errorInfo = "审核状态不能为空", maxLength = 1)
@Schema(description = "审核状态（0 待审核 1 审核通过 2 审核不通过 3 办理成功 4 办理失败 5 部分办理失败 6派减）" )
@ExcelProperty("审核状态" )
private String auditStatus;
/**
* 审核意见
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java
View file @ 597999f7
......@@ -26,7 +26,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.social.constants.DispatchConstants;
import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
import com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService;
import com.yifu.cloud.plus.v1.yifu.social.vo.DispatchDetailVo;
......
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ 597999f7
......@@ -57,12 +57,10 @@ import org.springframework.stereotype.Service;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import javax.sql.CommonDataSource;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
......@@ -1117,7 +1115,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
List<SysBaseSetInfo> socialBases = baseSetMapper.selectList(Wrappers.<SysBaseSetInfo>query().lambda()
.eq(SysBaseSetInfo::getBaseType, CommonConstants.ZERO_STRING)
.le(SysBaseSetInfo::getApplyStartDate, now)
.ge(SysBaseSetInfo::getApplyEndDate, now)
.in(SysBaseSetInfo::getDepartName,socialholds)
.eq(SysBaseSetInfo::getDeleteFlag, CommonConstants.ZERO_STRING)
.groupBy(SysBaseSetInfo::getDepartName));
......@@ -1346,11 +1343,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
Common.isEmpty(excel.getRecordBase())
|| Common.isEmpty(excel.getPensionStart())
|| Common.isEmpty(excel.getPaymentType())
|| Common.isEmpty(excel.getPensionCardinal())
)) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_NOT_EMPTY)));
return true;
}
if (CommonConstants.ONE_STRING.equals(excel.getPaymentType()) && Common.isEmpty(excel.getPensionCardinal())
){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_DIY_NOT_EMPTY)));
return true;
}
if (Common.isNotNull(excel.getProvidentHousehold()) && (
Common.isEmpty(excel.getProvidentCardinal())
|| Common.isEmpty(excel.getProvidentStart())
......@@ -2020,13 +2021,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
temp.setLength(CommonConstants.ZERO_INT);
temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
temp.append(socialTypeRemark.toString());
temp.append(DispatchConstants.DISPATCH_SOCIAL_HANDLE_SUCCESS);
temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS);
initAuditInfo(auditInfo, ( temp + handleRemark), handleStatus, user, temp.toString());
} else {
temp.setLength(CommonConstants.ZERO_INT);
temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
temp.append(socialTypeRemark.toString());
temp.append(DispatchConstants.DISPATCH_SOCIAL_HANDLE_FAIL);
temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
initAuditInfo(auditInfo, ( temp + handleRemark), handleStatus, user, temp.toString());
}
dis.setSocialHandleStatus(socialInfo.getHandleStatus());
......@@ -2046,9 +2047,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType()) && CommonConstants.ZERO_INT == flag) {
//派增办理通过 改成可派减状态
providentFund.setReduceCan(CommonConstants.dingleDigitStrArray[0]);
sf.setFundAddStatus(CommonConstants.TWO_STRING);
sf.setFundStatus(CommonConstants.THREE_STRING);
} else if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType()) && CommonConstants.ONE_INT == flag) {
//派增办理不通过 改成不可派减状态
providentFund.setReduceCan(CommonConstants.dingleDigitStrArray[1]);
sf.setFundAddStatus(CommonConstants.THREE_STRING);
sf.setFundStatus(CommonConstants.FOUR_STRING);
// 同步预估库数据 TODO
}
fundMapper.updateById(providentFund);
......@@ -2068,11 +2073,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} else if (CommonConstants.ONE_STRING.equals(dis.getType())) {
//社保派减办理
if (CommonConstants.ZERO_STRING.equals(typeSub)) {
if (null != socialInfo && Common.isNotNull(socialInfo.getId())) {
if (Common.isNotNull(socialInfo) && Common.isNotNull(socialInfo.getId())) {
// 社保办理状态补充判断：
this.setSocialHandleStatus(handleStatus, socialType, flag, socialInfo, dis,sf);
//社保派减办理成功才变更社保的办理状态
if (CommonConstants.ZERO_INT == flag) {
socialInfo.setHandleStatus(CommonConstants.THREE_STRING);
......@@ -2080,23 +2083,38 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialInfo.setReduceHandleTime(now);
if (Common.isNotNull(dis.getSocialReduceDate())) {
socialInfo.setSocialReduceDate(dis.getSocialReduceDate());
sf.setSocialReduceDate(dis.getSocialReduceDate());
}
sf.setSocialReduceStatus(CommonConstants.TWO_STRING);
sf.setSocialStatus(CommonConstants.EIGHT_STRING);
// 同步预估库数据 TODO
}
socialInfo.setHandleTime(now);
socialInfo.setHandleUser(user.getId().toString());
if (CommonConstants.dingleDigitStrArray[1].equals(dis.getType()) && CommonConstants.ONE_INT == flag) {
socialInfo.setHandleUser(user.getId());
if (CommonConstants.ONE_INT == flag) {
//派减办理不通过
socialInfo.setReduceCan(CommonConstants.dingleDigitStrArray[0]);//改成可派减状态
// 同步预估库数据
sf.setSocialReduceStatus(CommonConstants.THREE_STRING);
sf.setSocialStatus(CommonConstants.NINE_STRING);
}
socialMapper.updateById(socialInfo);
dis.setSocialHandleRemark(null == handleRemark ? "" : handleRemark);
dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
auditInfo = new TAuditInfo();
auditInfo.setType(CommonConstants.ONE_STRING);
if (CommonConstants.ZERO_INT == flag) {
initAuditInfo(auditInfo, ("社保派减" + socialTypeRemark.toString() + "办理成功：" + handleRemark), handleStatus, user, "");
temp.setLength(CommonConstants.ZERO_INT);
temp.append(DispatchConstants.DISPATCH_SOCIAL_REDUCE);
temp.append(socialTypeRemark.toString());
temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS);
temp.append(handleRemark);
initAuditInfo(auditInfo,temp.toString(), handleStatus, user, temp.toString());
} else {
initAuditInfo(auditInfo, ("社保派减" + socialTypeRemark.toString() + "办理失败：" + handleRemark), handleStatus, user, "");
temp.setLength(CommonConstants.ZERO_INT);
temp.append(DispatchConstants.DISPATCH_SOCIAL_REDUCE);
temp.append(socialTypeRemark.toString());
temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
temp.append(handleRemark);
initAuditInfo(auditInfo,temp.toString(), handleStatus, user, temp.toString());
}
dis.setSocialHandleStatus(handleStatus);
auditInfo.setSocialId(dis.getId());
......@@ -2106,7 +2124,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
//公积金派减办理
} else if (CommonConstants.ONE_STRING.equals(typeSub)) {
if (null != providentFund && Common.isNotNull(providentFund.getId())) {
if (Common.isNotNull(providentFund) && Common.isNotNull(providentFund.getId())) {
//公积金派减办理成功才变更公积金的办理状态
if (CommonConstants.ZERO_INT == flag) {
providentFund.setHandleStatus(CommonConstants.THREE_STRING);
......@@ -2114,14 +2132,19 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
providentFund.setReduceHandleUser(user.getId().toString());
if (Common.isNotNull(dis.getFundReduceDate())) {
providentFund.setFundReduceDate(dis.getFundReduceDate());
sf.setFundReduceDate(dis.getFundReduceDate());
}
// 派减办理成功后，同步预估库数据清理
sf.setFundReduceStatus(CommonConstants.TWO_STRING);
sf.setFundStatus(CommonConstants.SEVEN_STRING);
// 派减办理成功后，同步预估库数据清理 TODO
}
providentFund.setHandleTime(now);
providentFund.setHandleUser(user.getId().toString());
if (CommonConstants.dingleDigitStrArray[1].equals(dis.getType()) && CommonConstants.ONE_INT == flag) {
if (CommonConstants.ONE_INT == flag) {
//派减办理不通过
providentFund.setReduceCan(CommonConstants.dingleDigitStrArray[0]);//改成可派减状态
sf.setSocialReduceStatus(CommonConstants.THREE_STRING);
sf.setSocialStatus(CommonConstants.NINE_STRING);
// 同步预估库数据
}
fundMapper.updateById(providentFund);
......
yifu-social/yifu-social-biz/src/main/resources/mapper/SysBaseSetInfoMapper.xml
View file @ 597999f7
......@@ -356,7 +356,6 @@
<where>
1=1
and a.APPLY_START_DATE <![CDATA[ <= ]]> now()
and a.APPLY_END_DATE >= now()
<if test="fundHolds != null and fundHolds.size > 0">
and a.DEPART_NAME in
<foreach collection="fundHolds" item="item" open="(" close=")" separator="," >
......
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