优化修改

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/UpProjectSocialFundVo.java

@@ -44,4 +44,6 @@ public class UpProjectSocialFundVo implements Serializable {
 	String fileTown;
 	// 档案地-手机号码
 	String mobile;
+	//是否同步终止合同、减项、减档 0 是 1 否
+	String changeContractAndEmployee;
 }

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java

@@ -571,4 +571,12 @@ public interface ErrorCodes {
 	 * 社保办理：该数据已处理，请勿重复操作
 	 */
 	String SOCIAL_IMPORT_SAME_INFO = "social.import.same.info";
+	/**
+	 * 派减异常： 存在正常的公积金，是否同步终止合同、减项、减档不能为是
+	 */
+	String EMP_DISPATCH_FUND_NOT_EMPTY_CHANGE = "emp.dispatch.fund.not.empty.change";
+	/**
+	 * 派减异常： 单减公积金，是否同步终止合同、减项、减档不能为是
+	 */
+	String EMP_DISPATCH_FUND_NOT_EMPTY_SIGNLE = "emp.dispatch.fund.not.empty.signle";
 }

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -223,6 +223,9 @@ social_import_handle_not_empty=\u793E\u4FDD\u529E\u7406\u5931\u8D25\uFF0C\u5FC5\
 social.import.handle.not.exits=\u65E0\u529E\u7406\u6743\u9650\u6216\u65E0\u53EF\u9700\u8981\u529E\u7406\u7684\u793E\u4FDD\u6570\u636E
 social.import.same.info=\u8BE5\u6570\u636E\u5DF2\u5904\u7406\uFF0C\u8BF7\u52FF\u91CD\u590D\u64CD\u4F5C
 
+emp.dispatch.fund.not.empty.change=\u5B58\u5728\u6B63\u5E38\u7684\u516C\u79EF\u91D1\uFF0C\u662F\u5426\u540C\u6B65\u7EC8\u6B62\u5408\u540C\u3001\u51CF\u9879\u3001\u51CF\u6863\u4E0D\u80FD\u4E3A\u662F
+emp.dispatch.fund.not.empty.signle=\u5355\u51CF\u516C\u79EF\u91D1\uFF0C\u662F\u5426\u540C\u6B65\u7EC8\u6B62\u5408\u540C\u3001\u51CF\u9879\u3001\u51CF\u6863\u4E0D\u80FD\u4E3A\u662F
+
 
 
 

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

@@ -455,6 +455,14 @@ public class TDispatchInfo extends BaseEntity {
 	@ExcelProperty("审核意见" )
 	private String auditRemark;
 
+	/**
+	 * 0 是 1 否
+	 */
+	@Length(max = 1, message = "是否同步终止合同、减项、减档不能超过1个字符")
+	@ExcelAttribute(name = "是否同步终止合同、减项、减档", maxLength = 1)
+	@Schema(description = "是否同步终止合同、减项、减档", name = "changeContractAndEmployee")
+	private String changeContractAndEmployee;
+
 	/**
 	 * 公积金办理备注
 	 */

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchReduceVo.java

@@ -127,4 +127,12 @@ public class TDispatchReduceVo extends RowIndex implements Serializable {
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("重新派单的ID" )
 	private String isAgainId;
+
+	/**
+	 * 0 是 1 否
+	 */
+	@Length(max = 1, message = "是否同步终止合同、减项、减档不能超过1个字符")
+	@ExcelAttribute(name = "是否同步终止合同、减项、减档", maxLength = 1,readConverterExp = "0=是,1=否")
+	@Schema(description = "是否同步终止合同、减项、减档", name = "changeContractAndEmployee")
+	private String changeContractAndEmployee;
 }

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

@@ -2773,6 +2773,20 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_FUND_NOT_EMPTY)));
 				continue;
 			}
+			//单减社保，判断是否有正常的公积金
+			if (Common.isNotNull(excel.getSocialReduceDate()) && Common.isEmpty(excel.getFundReduceDate())
+					&& (CommonConstants.THREE_STRING.equals(socialFund.getFundStatus())
+					|| CommonConstants.EIGHT_STRING.equals(socialFund.getFundStatus()))
+					&& CommonConstants.ZERO_STRING.equals(excel.getChangeContractAndEmployee())) {
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_FUND_NOT_EMPTY_CHANGE)));
+				continue;
+			}
+			//单减公积金
+			if (Common.isNotNull(excel.getFundReduceDate()) && Common.isEmpty(excel.getSocialReduceDate())
+					&& CommonConstants.ZERO_STRING.equals(excel.getChangeContractAndEmployee())) {
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_FUND_NOT_EMPTY_SIGNLE)));
+				continue;
+			}
 			// 自定义校验
  			if (validReduce(errorMessageList,excelVOTemp, socialFundMap,socialFund, excel)){
 				continue;
@@ -2821,6 +2835,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			dispatch.setCreateName(user.getNickname());
 			dispatch.setOrganName(user.getDeptName());
 		}
+		dispatch.setChangeContractAndEmployee(excel.getChangeContractAndEmployee());
 		dispatch.setCreateTime(LocalDateTime.now());
 		dispatch.setEmpId(socialFund.getEmpId());
 		dispatch.setEmpName(socialFund.getEmpName());
@@ -3910,6 +3925,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 							if (Common.isNotNull(vo.getSocialStatus()) || Common.isNotNull(vo.getFundStatus())){
 								vo.setEmpIdCard(dis.getEmpIdcard());
 								vo.setDepartNo(dis.getSettleDomainCode());
+								//派减审核通过才会处理合同档案状态
+								if (CommonConstants.ONE_INT == flag) {
+									vo.setChangeContractAndEmployee(dis.getChangeContractAndEmployee());
+								}
 								R<Boolean> resUp = archivesDaprUtil.updateProjectSocialFund(vo);
 								if (Common.isEmpty(resUp) || !(CommonConstants.SUCCESS.intValue() == resUp.getCode()) || !resUp.getData().booleanValue()){
 									errorList.add(new ErrorMessage(-1, vo.getEmpIdCard()+DispatchConstants.DISPATCH_SYN_DOC_EXE,CommonConstants.RED,dis.getEmpName()));