合同待办处理

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/ExcelAttributeConstants.java

@@ -124,4 +124,6 @@ public class ExcelAttributeConstants {
 
 	//区域字段组合
 	public static final String DEPARTID_PROVINCE_CITY_TOWN = "departId_province_city_town";
+	//派减离职原因
+	public static final String REDUCE_PROJECT_REASON = "reduce_project_reason";
 }

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

@@ -396,4 +396,24 @@ public interface ErrorCodes {
 	 * 新增异常：已存在公积金数据
 	 */
 	String EMP_DISPATCH_FUND_EXISTING = "emp.dispatch.fund.existing";
+	/**
+	 * 派减异常： 未找到社保及公积金信息
+	 */
+	String EMP_DISPATCH_SOCIAL_FUND_NOT_EMPTY = "emp.dispatch.social.fund.not.empty";
+	/**
+	 * 派减异常： 请选择社保停缴日期或公积金停缴日期
+	 */
+	String EMP_DISPATCH_REDUCE_SOCIAL_FUND_NOT_EMPTY = "emp.dispatch.reduce.social.fund.not.empty";
+	/**
+	 * 派减异常： 未找到办理成功的社保状态，或社保派减中，请确认后重试
+	 */
+	String EMP_DISPATCH_REDUCE_SOCIAL_STATUS_ERROR = "emp.dispatch.reduce.social.status.error";
+	/**
+	 * 派减异常： 未找到办理成功的公积金状态，或公积金派减中，请确认后重试
+	 */
+	String EMP_DISPATCH_REDUCE_FUND_STATUS_ERROR = "emp.dispatch.reduce.fund.status.error";
+	/**
+	 * 派减异常： 本次派增已存在对应身份证号的派减记录
+	 */
+	String EMP_DISPATCH_REDUCE_EXISTS = "emp.dispatch.reduce.exists";
 }

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/ErrorMessage.java

@@ -32,6 +32,7 @@ public class ErrorMessage implements Serializable {
 
     public ErrorMessage(Integer lineNum, String message) {
         this.lineNum = lineNum;
+		this.color = "red";
         this.message = message;
     }
     public ErrorMessage(Integer lineNum, String message, String color) {

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

@@ -141,6 +141,16 @@ emp.dispatch.add.project.error=\u65B0\u589E\u5F02\u5E38\uFF1A\u6D3E\u5355\u65B0\
 
 emp.dispatch.fund.existing=\u65B0\u589E\u5F02\u5E38\uFF1A\u5DF2\u5B58\u5728\u516C\u79EF\u91D1\u6570\u636E
 
+emp.dispatch.social.fund.not.empty=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u672A\u627E\u5230\u793E\u4FDD\u53CA\u516C\u79EF\u91D1\u4FE1\u606F
+
+emp.dispatch.reduce.social.fund.not.empty=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u8BF7\u9009\u62E9\u793E\u4FDD\u505C\u7F34\u65E5\u671F\u6216\u516C\u79EF\u91D1\u505C\u7F34\u65E5\u671F
+
+emp.dispatch.reduce.social.status.error=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u672A\u627E\u5230\u529E\u7406\u6210\u529F\u7684\u793E\u4FDD\u72B6\u6001\uFF0C\u6216\u793E\u4FDD\u6D3E\u51CF\u4E2D\uFF0C\u8BF7\u786E\u8BA4\u540E\u91CD\u8BD5
+
+emp.dispatch.reduce.fund.status.error=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u672A\u627E\u5230\u529E\u7406\u6210\u529F\u7684\u516C\u79EF\u91D1\u72B6\u6001\uFF0C\u6216\u516C\u79EF\u91D1\u6D3E\u51CF\u4E2D\uFF0C\u8BF7\u786E\u8BA4\u540E\u91CD\u8BD5
+
+emp.dispatch.reduce.exists=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u672C\u6B21\u6D3E\u589E\u5DF2\u5B58\u5728\u5BF9\u5E94\u8EAB\u4EFD\u8BC1\u53F7\u7684\u6D3E\u51CF\u8BB0\u5F55
+
 
 
 

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

+/*
+ *    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.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 派单信息记录表-批量派减
+ *
+ * @author fxj
+ * @date 2022-07-15 11:38:05
+ */
+@Data
+public class TDispatchReduceVo extends RowIndex implements Serializable {
+
+	/**
+	 * 员工姓名
+	 */
+	@Length(max = 50, message = "员工姓名 不能超过50 个字符" )
+	@ExcelAttribute(name = "员工姓名", maxLength = 50, isNotEmpty = true)
+	@Schema(description = "员工姓名" )
+	@ExcelProperty("员工姓名" )
+	private String empName;
+	/**
+	 * 身份证号
+	 */
+	@Length(max = 20, message = "身份证号 不能超过20 个字符" )
+	@ExcelAttribute(name = "身份证号", maxLength = 20, isNotEmpty = true)
+	@Schema(description = "身份证号" )
+	@ExcelProperty("身份证号" )
+	private String empIdcard;
+
+
+	/**
+	 * 社保停缴日期
+	 */
+	@ExcelAttribute(name = "社保停缴日期", isDate = true)
+	@Schema(description = "社保停缴日期：购买社保时必填" )
+	@ExcelProperty("社保停缴日期" )
+	private Date socialReduceDate;
+
+	/**
+	 * 公积金停缴日期
+	 */
+	@ExcelAttribute(name = "公积金停缴日期", isDate = true)
+	@Schema(description = "公积金停缴日期" )
+	@ExcelProperty("公积金停缴日期" )
+	private Date fundReduceDate;
+
+	/**
+	 * 离职日期
+	 */
+	@ExcelAttribute(name = "离职日期", isDate = true)
+	@Schema(description = "离职日期" )
+	@ExcelProperty("离职日期" )
+	private Date leaveDate;
+
+	/**
+	 * 减少原因
+	 */
+	@ExcelAttribute(name = "减少原因",isNotEmpty = true, isDataId = true,dataType = ExcelAttributeConstants.REDUCE_PROJECT_REASON)
+	@Schema(description = "减少原因" )
+	@ExcelProperty("减少原因" )
+	private String reasonType;
+
+	/**
+	 * 委托备注
+	 */
+	@ExcelAttribute(name = "委托备注")
+	@Schema(description = "委托备注" )
+	@ExcelProperty("委托备注" )
+	private String trustRemark;
+
+}

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

@@ -125,7 +125,7 @@ public class TDispatchInfoController {
     @DeleteMapping("/{id}" )
     @PreAuthorize("@pms.hasPermission('demo_tdispatchinfo_del')" )
     public R<Boolean> removeById(@PathVariable String id) {
-        return R.ok(tDispatchInfoService.removeById(id));
+        return tDispatchInfoService.removeByIdDiy(id);
     }
 
     /**
@@ -167,6 +167,6 @@ public class TDispatchInfoController {
 	@PostMapping("/importListReduce")
 	//@PreAuthorize("@pms.hasPermission('demo_tdispatchinfo-batch-reduce')")
 	public R<List<ErrorMessage>> importListReduce(@RequestBody MultipartFile file){
-		return tDispatchInfoService.importDiy(file.getInputStream());
+		return tDispatchInfoService.importReduceDiy(file.getInputStream());
 	}
 }

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

@@ -46,4 +46,8 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
     void listExport(HttpServletResponse response, TDispatchInfoSearchVo searchVo);
 
     List<TDispatchInfo> noPageDiy(TDispatchInfoSearchVo searchVo);
+
+    R<List<ErrorMessage>> importReduceDiy(InputStream inputStream);
+
+	R<Boolean> removeByIdDiy(String id);
 }