Merge remote-tracking branch 'origin/develop' into develop

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

@@ -406,9 +406,21 @@ public interface CommonConstants {
 	String SIX_STRING = "6";
 	String SEVEN_STRING = "7";
 
-	public static final BigDecimal MONEY_MAX = new BigDecimal("999999.99");
+	/**
+	 * 工资最小不能小于零
+	 */
+	public static final String MONEY_MAX = "9999999.99";
+
+	/**
+	 * 工资最小不能小于零
+	 */
+	public static final String MONEY_MIN = "0";
+
+	public static final int TWENTY_INT = 20;
 
 	public static final String ERROR_MSG_PRFIX = "error=";
 
 	public static final String SUCCESS_MSG_PREFIX = "success=";
+
+	public static final int SIXTY_INT = 60;
 }

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

@@ -55,4 +55,10 @@ public class ValidityConstants {
 
 	/** 全汉字 最多20位 规则 */
 	public static final String CHINESE_PATTERN_20 = "^[\\u4E00-\\u9FA5]{1,20}";
+	/** 最多20位 规则 */
+	public static final String PATTERN_20 = "^.{1,20}$";
+	/** 最多32位 规则 */
+	public static final String PATTERN_32 = "^.{1,32}$";
+	/** 最多50位 规则 */
+	public static final String PATTERN_50 = "^.{1,50}$";
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -308,4 +308,40 @@ public class InsurancesConstants {
 	 */
 	public static final String DEPT_NO_CHANGE_SETTLE_HANDLE_STATUS_ERROR = "当前保单已结算，无法变更所属项目";
 
+	/**
+	 * 退费金额不能为空
+	 */
+	public static final String REFUND_MONEY_NOT_EMPTY = "退费金额不能为空";
+
+	/**
+	 * 退费金额格式不正确
+	 */
+	public static final String REFUND_MONEY_PARSE_ERROR = "退费金额格式不正确";
+
+	/**
+	 * 退费金额不能小于零
+	 */
+	public static final String  REFUND_MONEY_MIN_ERROR= "退费金额不能小于零";
+
+	/**
+	 * 退费金额不能大于999999.99
+	 */
+	public static final String REFUND_MONEY_MAX_ERROR = "退费金额不能大于999999.99";
+
+	/**
+	 * 姓名不能超过20个字符
+	 */
+	public static final String EMP_NAME_MAX_LENGTH_ERROR = "姓名不能超过20个字符";
+
+	/**
+	 * 员工减员记录不存在
+	 */
+	public static final String REFUND_IS_NULL = "员工减员记录不存在";
+
+	/**
+	 * 已更新保单减员退费，不能再次更新
+	 */
+	public static final String REFUND_MONEY_IS_NOT_NULL = "已更新保单减员退费，不能再次更新";
+
+
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceOperate.java

@@ -15,7 +15,6 @@ import java.util.Date;
  * @date 2022-07-25 14:20:16
  */
 @Data
-@TableName("t_insurance_operate")
 @Schema(description = "商险操作表")
 public class TInsuranceOperate implements Serializable {
     /**

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceRefund.java

+package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 减员信息表
+ * @TableName t_insurance_refund
+ */
+@Data
+@Tag(name = "减员信息表")
+public class TInsuranceRefund implements Serializable {
+    /**
+     * 主键id
+     */
+    private String id;
+
+    /**
+     * 保单信息主键
+     */
+    private String insDetailId;
+
+    /**
+     * 减员状态
+     */
+    private Integer reduceHandleStatus;
+
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "员工姓名")
+	private String empName;
+
+	/**
+	 * 员工身份证号
+	 */
+	@Schema(description = "员工身份证号")
+	private String empIdcardNo;
+
+	/**
+	 * 保单编号
+	 */
+	@Schema(description = "保单编号")
+	private String policyNo;
+
+    /**
+     * 退费金额
+     */
+    private BigDecimal refundMoney;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 减员创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 减员创建人
+     */
+    private String createBy;
+
+    /**
+     * 减员创建人姓名
+     */
+    private String createName;
+
+	/**
+	 * 是否删除 0未删除/1删除
+	 */
+	@Schema(description = "是否删除 0否/1是")
+	private Integer deleteFlag;
+
+
+	private static final long serialVersionUID = 1L;
+
+
+}
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceRefundDetail.java

+package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-07-26 15:28:49
+ */
+@Data
+public class TInsuranceRefundDetail implements Serializable {
+	/**
+	 * 主键id
+	 */
+	private String id;
+
+	/**
+	 * 保单信息主键
+	 */
+	private String insDetailId;
+
+	/**
+	 * 减员状态
+	 */
+	private Integer reduceHandleStatus;
+
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "员工姓名")
+	private String empName;
+
+	/**
+	 * 员工身份证号
+	 */
+	@Schema(description = "员工身份证号")
+	private String empIdcardNo;
+
+	/**
+	 * 保单编号
+	 */
+	@Schema(description = "保单编号")
+	private String policyNo;
+
+	/**
+	 * 退费金额
+	 */
+	private BigDecimal refundMoney;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	/**
+	 * 减员创建时间
+	 */
+	private LocalDateTime createTime;
+
+	/**
+	 * 减员创建人
+	 */
+	private String createBy;
+
+	/**
+	 * 减员创建人姓名
+	 */
+	private String createName;
+
+	/**
+	 * 是否删除 0未删除/1删除
+	 */
+	@Schema(description = "是否删除 0否/1是")
+	private Integer deleteFlag;
+
+
+	private static final long serialVersionUID = 1L;
+
+}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java

@@ -201,6 +201,7 @@ public class ValidityUtil {
         }
         return str.matches(ValidityConstants.CHINESE_PATTERN) ;
     }
+
     /**
      * 验证字符串是否全是汉字 最多20位
      *
@@ -215,6 +216,48 @@ public class ValidityUtil {
         return str.matches(ValidityConstants.CHINESE_PATTERN_20) ;
     }
 
+	/**
+	 * 验证字符串 最多20位
+	 *
+	 * @author licancan
+	 * @param str
+	 * @return {@link boolean}
+	 */
+	public static boolean validate20(final String str){
+		if(Common.isEmpty(str)){
+			return Boolean.FALSE;
+		}
+		return str.matches(ValidityConstants.PATTERN_20) ;
+	}
+
+	/**
+	 * 验证字符串 最多32位
+	 *
+	 * @author licancan
+	 * @param str
+	 * @return {@link boolean}
+	 */
+	public static boolean validate32(final String str){
+		if(Common.isEmpty(str)){
+			return Boolean.FALSE;
+		}
+		return str.matches(ValidityConstants.PATTERN_32) ;
+	}
+
+	/**
+	 * 验证字符串 最多50位
+	 *
+	 * @author licancan
+	 * @param str
+	 * @return {@link boolean}
+	 */
+	public static boolean validate50(final String str){
+		if(Common.isEmpty(str)){
+			return Boolean.FALSE;
+		}
+		return str.matches(ValidityConstants.PATTERN_50) ;
+	}
+
     /**
      * 校验用户姓名是否是初始化的值
      *

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundCheck.java

@@ -17,6 +17,12 @@ public class InsuranceRefundCheck implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 主键
+	 */
+	@Schema(description = "主键")
+	private String id;
+
 	/**
 	 * 员工姓名
 	 */
@@ -26,7 +32,14 @@ public class InsuranceRefundCheck implements Serializable {
 	 * 员工身份证号码
 	 */
 	@Schema(description = "员工身份证号码")
-	private String empIdCardNo;
+	private String empIdcardNo;
+
+	/**
+	 * 保单编号
+	 */
+	@Schema(description = "保单编号")
+	private String policyNo;
+
 	/**
 	 * 保险公司名称
 	 */
@@ -48,12 +61,6 @@ public class InsuranceRefundCheck implements Serializable {
 	@Schema(description = "保单结束日期")
 	private String policyEnd;
 
-	/**
-	 * 退款金额
-	 */
-	@Schema(description = "退款金额")
-	private String refundMoney;
-
 	/**
 	 * 备注
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundListVo.java

@@ -60,6 +60,12 @@ public class InsuranceRefundListVo implements Serializable {
 	@Schema(description = "投保岗位")
 	private String post;
 
+	/**
+	 * 保单编号
+	 */
+	@Schema(description = "保单编号")
+	private String policyNo;
+
 	/**
 	 * 商险购买地省code
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundResultVo.java

@@ -89,6 +89,6 @@ public class InsuranceRefundResultVo implements Serializable {
 	/**
 	 * 错误原因
 	 */
-	@Schema(description = "减员状态 1待减员 2减员中3减员退回")
+	@Schema(description = "错误原因")
 	private String errorMessage;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredListVo.java

@@ -42,6 +42,12 @@ public class InsuredListVo implements Serializable {
 	@Schema(description = "员工身份证号")
 	private String empIdcardNo;
 
+	/**
+	 * 减员状态 1待减员 2减员中3减员退回
+	 */
+	@Schema(description = "减员状态 1待减员 2减员中3减员退回")
+	private Integer reduceHandleStatus;
+
 	/**
 	 * 投保类型， 1新增、3批增、4替换
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuredParam.java

@@ -102,9 +102,7 @@ public class InsuredParam implements Serializable {
 	/**
 	 * 派单日期
 	 */
-	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
 	@Schema(description = "派单日期")
-	@ExcelProperty("派单日期")
-	private LocalDateTime createTime;
+	private String createTime;
 
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/RefundMoneyParam.java

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaji
+ * @description 减员退费导入表
+ * @date 2022-07-25 17:06:31
+ */
+@Data
+@Tag(name = "减员退费导入表")
+public class RefundMoneyParam implements Serializable {
+	private static final long serialVersionUID = -2689686777914935788L;
+
+	/**
+	 * 主键
+	 */
+	@Schema(description = "主键")
+	private String id;
+
+	/**
+	 * 员工姓名
+	 */
+	@Schema(description = "员工姓名")
+	private String empName;
+
+	/**
+	 * 员工身份证号
+	 */
+	@Schema(description = "员工身份证号")
+	private String empIdcardNo;
+
+	/**
+	 * 保单号
+	 */
+	@Schema(description = "保单号")
+	private String policyNo;
+
+	/**
+	 * 退费金额
+	 */
+	@Schema(description = "退费金额")
+	private String refundMoney;
+
+	/**
+	 * 错误原因
+	 */
+	@Schema(description = "错误原因")
+	private String errorMessage;
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

@@ -201,9 +201,9 @@ public class TInsuranceDetailController {
 	 * @date 2022-07-19
 	 * @since v1.0
 	 */
-	@PostMapping("/checkInsuranceRefundList")
-	public R checkInsuranceRefundList(@RequestBody List<InsuranceRefundCheck> insuranceRefundCheckList){
-		return tInsuranceDetailService.checkInsuranceRefundList(insuranceRefundCheckList);
+	@PostMapping("/saveInsuranceRefund")
+	public R saveInsuranceRefund(@RequestBody @Valid @Size(min = 1,message = "导入减员列表不能为空") List<InsuranceRefundCheck> insuranceRefundCheckList){
+		return tInsuranceDetailService.saveInsuranceRefund(insuranceRefundCheckList);
 	}
 
 	/**
@@ -215,7 +215,7 @@ public class TInsuranceDetailController {
 	 */
 	@PostMapping("/settleMonthChange")
 	@Operation(summary = "变更结算月", description = "变更结算月")
-	public R settleMonthChange(@RequestBody List<SettleMonthChangeCheckParam> settleMonthCheckList){
+	public R settleMonthChange(@RequestBody @Valid @Size(min = 1,message = "变更结算月不能为空") List<SettleMonthChangeCheckParam> settleMonthCheckList){
 		return tInsuranceDetailService.settleMonthChange(settleMonthCheckList);
 	}
 
@@ -228,7 +228,7 @@ public class TInsuranceDetailController {
 	 */
 	@PostMapping("/deptChange")
 	@Operation(summary = "变更所属项目", description = "变更所属项目")
-	public R deptChange(@RequestBody List<DeptChangeCheckParam> deptChangeCheckList){
+	public R deptChange(@RequestBody @Valid @Size(min = 1,message = "变更所属项目不能为空")List<DeptChangeCheckParam> deptChangeCheckList){
 		return tInsuranceDetailService.deptChange(deptChangeCheckList);
 	}
 
@@ -351,7 +351,6 @@ public class TInsuranceDetailController {
 		return tInsuranceDetailService.selectByTypeId(id);
 	}
 
-
 	/**
 	 * 出险
 	 *
@@ -365,4 +364,19 @@ public class TInsuranceDetailController {
 		return tInsuranceDetailService.updateIsUse(id);
 	}
 
+	/**
+	 * 更新减员退费
+	 *
+	 * @author zhaji
+	 * @param  paramList 退费列表
+	 * @return {@link R<List< RefundMoneyParam >>}
+	 */
+	@Operation(summary = "更新减员退费", description = "更新减员退费")
+	@PostMapping("/updateRefundMoney")
+	public R updateRefundMoney(@RequestBody @Valid @Size(min = 1,message = "更新减员退费不能为空") List<RefundMoneyParam> paramList) {
+		return tInsuranceDetailService.updateRefundMoney(paramList);
+	}
+
+
+
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefundDetail;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -140,4 +141,13 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 * @return {@link List< TInsuranceDetail>}
 	 */
 	List<TInsuranceDetail> selectDetailListByIds(@Param("idList") String [] idList);
+
+	/**
+	 * 查询保单减员退费信息
+	 *
+	 * @author zhaji
+	 * @param refundDetail
+	 * @return {@link TInsuranceRefundDetail}
+	 */
+	TInsuranceRefundDetail selectRefundDetail(@Param("param") TInsuranceRefundDetail refundDetail);
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceRefundMapper.java

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_refund(减员信息表)】的数据库操作Mapper
+* @createDate 2022-07-25 21:06:36
+* @Entity generator.domain.TInsuranceRefund
+*/
+@Mapper
+public interface TInsuranceRefundMapper extends BaseMapper<TInsuranceRefund> {
+
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceDetailService.java

@@ -129,13 +129,13 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	/***********************减员办理********************************/
 
 	/**
-	 * 减员导入校验
+	 * 减员导入
 	 *
 	 * @author zhaji
 	 * @param insuranceRefundCheckList 减员表
 	 * @return {@link R}
 	 */
-	R checkInsuranceRefundList(List<InsuranceRefundCheck> insuranceRefundCheckList);
+	R saveInsuranceRefund(List<InsuranceRefundCheck> insuranceRefundCheckList);
 
 	/**
 	 * 已投保列表分页查询
@@ -247,4 +247,14 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @return {@link R}
 	 */
 	R updateIsUse(String id);
+
+	/**
+	 * 更新减员退费
+	 *
+	 * @author zhaji
+	 * @param paramList
+	 * @return {@link R}
+	 */
+	R updateRefundMoney(List<RefundMoneyParam> paramList);
+
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceRefundService.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_refund(减员信息表)】的数据库操作Service
+* @createDate 2022-07-25 21:06:36
+*/
+public interface TInsuranceRefundService extends IService<TInsuranceRefund> {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceCompanyServiceImpl.java

@@ -53,6 +53,10 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 		if (!CommonConstants.ZERO_STRING.equals(billingType) && !CommonConstants.ONE_STRING.equals(billingType)){
 			return R.failed("计费方式格式不正确");
 		}
+		String companyName = insuranceCompany.getCompanyName();
+		if (companyName.length()>CommonConstants.SIXTY_INT){
+			return R.failed("保险公司名称过长");
+		}
 		boolean b = companyIsExists(insuranceCompany.getCompanyName());
 		if (!b){
 			insuranceCompany.setCreateBy(user.getId());
@@ -90,6 +94,10 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 			return R.failed("要修改的保险公司不存在或已被删除");
 		}
 		String companyName = one.getCompanyName();
+		String newCompanyName = insuranceCompany.getCompanyName();
+		if (newCompanyName.length()>CommonConstants.SIXTY_INT){
+			return R.failed("要修改的保险公司名称过长");
+		}
 		//如果当前保险公司名称和修改后的名称不同
 		if (!companyName.equals(insuranceCompany.getCompanyName())){
 			//校验旧的保险公司名称是否已存在对应的商险信息

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceRefundServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceRefundMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceRefundService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_refund(减员信息表)】的数据库操作Service实现
+* @createDate 2022-07-25 21:06:36
+*/
+@Service
+public class TInsuranceRefundServiceImpl extends ServiceImpl<TInsuranceRefundMapper, TInsuranceRefund>
+implements TInsuranceRefundService {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceOperateMapper.xml

@@ -2,7 +2,7 @@
 <!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.insurances.entity.TInsuranceOperate">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceOperateMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceRefundMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!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.insurances.mapper.TInsuranceRefundMapper">
+
+    <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund">
+            <id property="id" column="ID" jdbcType="BIGINT"/>
+            <result property="insDetailId" column="INS_DETAIL_ID" jdbcType="BIGINT"/>
+            <result property="reduceHandleStatus" column="REDUCE_HANDLE_STATUS" jdbcType="TINYINT"/>
+			<result property="empName" column="EMP_NAME" jdbcType="VARCHAR"/>
+			<result property="empIdcardNo" column="EMP_IDCARD_NO" jdbcType="VARCHAR"/>
+			<result property="policyNo" column="POLICY_NO" jdbcType="VARCHAR"/>
+            <result property="refundMoney" column="REFUND_MONEY" jdbcType="DECIMAL"/>
+            <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+            <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
+            <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
+            <result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,INS_DETAIL_ID,REDUCE_HANDLE_STATUS,
+        REFUND_MONEY,REMARK,CREATE_TIME,
+        CREATE_BY,CREATE_NAME,EMP_NAME,EMP_IDCARD_NO,POLICY_NO
+	</sql>
+</mapper>

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

@@ -249,26 +249,26 @@ public class TSocialFundInfo extends BaseEntity {
 	@ExcelProperty("公积金缴纳地-县" )
 	private String fundTown;
 	/**
-	 * 社保派增状态：0待审核、1待办理、2办理成功、3部分办理失败、4办理失败
+	 * 社保派增状态：0待审核、1待办理、2办理成功、3部分办理失败、4办理失败 5 审核不通过
 	 */
 	@Length(max = 1, message = "社保派增状态 不能超过1个字符" )
 	@ExcelAttribute(name = "社保派增状态", maxLength = 1)
-	@Schema(description = "社保派增状态：0待审核、1待办理、2办理成功、3部分办理失败、4办理失败" )
+	@Schema(description = "社保派增状态：0待审核、1待办理、2办理成功、3部分办理失败、4办理失败 、5审核不通过" )
 	@ExcelProperty("社保派增状态" )
 	private String socialAddStatus;
 	/**
-	 * 公积金派增状态：0待审核、1待办理、2办理成功、3办理失败
+	 * 公积金派增状态：0待审核、1待办理、2办理成功、3办理失败、4审核不通过
 	 */
 	@Length(max = 1, message = "公积金派增状态 不能超过1个字符" )
 	@ExcelAttribute(name = "公积金派增状态", maxLength = 1)
-	@Schema(description = "公积金派增状态：0待审核、1待办理、2办理成功、3办理失败" )
+	@Schema(description = "公积金派增状态：0待审核、1待办理、2办理成功、3办理失败、4审核不通过" )
 	@ExcelProperty("公积金派增状态" )
 	private String fundAddStatus;
 	/**
-	 * 社保派减状态：0待审核、1待办理、2办理成功、3办理失败
+	 * 社保派减状态：0待审核、1待办理、2办理成功、3办理失败 4审核不通过
 	 */
 	@ExcelAttribute(name = "社保派减状态", maxLength = 1)
-	@Schema(description = "社保派减状态：0待审核、1待办理、2办理成功、3办理失败" )
+	@Schema(description = "社保派减状态：0待审核、1待办理、2办理成功、3办理失败 4审核不通过" )
 	@ExcelProperty("社保派减状态" )
 	private String socialReduceStatus;
 	/**
@@ -964,18 +964,18 @@ public class TSocialFundInfo extends BaseEntity {
 	private BigDecimal personalFundSum;
 
 	/**
-	 * 社保状态：派增（0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败）、派减（6待审核 7待办理 8办理成功 9 办理失败 10 审核不通过）
+	 * 社保状态：派增（0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败 10 审核不通过）、派减（6待审核 7待办理 8办理成功 9 办理失败 ）
 	 */
 	@ExcelAttribute(name = "社保状态", maxLength = 1)
-	@Schema(description = "社保状态：派增（0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败）、派减（6待审核 7待办理 8办理成功 9 办理失败10 审核不通过）" )
+	@Schema(description = "社保状态：派增（0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败 10 审核不通过）、派减（6待审核 7待办理 8办理成功 9 办理失败）" )
 	@ExcelProperty("社保派增状态" )
 	private String socialStatus;
 	/**
-	 * 公积金状态：派增（0待审核、1待办理、3办理成功、4办理失败）、派减（5待审核 6待办理 7 办理成功 8 办理失败 9 审核不通过）
+	 * 公积金状态：派增（0待审核、1待办理、3办理成功、4办理失败9 审核不通过）、派减（5待审核 6待办理 7 办理成功 8 办理失败 ）
 	 */
 	@Length(max = 1, message = "公积金状态 不能超过1个字符" )
 	@ExcelAttribute(name = "公积金状态", maxLength = 1)
-	@Schema(description = "公积金状态：派增（0待审核、1待办理、3办理成功、4办理失败）、派减（5待审核 6待办理 7 办理成功 8 办理失败 9 审核不通过）" )
+	@Schema(description = "公积金状态：派增（0待审核、1待办理、3办理成功、4办理失败9 审核不通过）、派减（5待审核 6待办理 7 办理成功 8 办理失败 ）" )
 	@ExcelProperty("公积金状态" )
 	private String fundStatus;
 

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

@@ -1377,23 +1377,28 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		if (Common.isNotNull(socialFundMap)){
 			socialFund = socialFundMap.get(excel.getEmpIdcard());
 			if (Common.isNotNull(socialFund)){
-				// 社保状态：派增（0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败）、派减（6待审核 7待办理 8办理成功 9 办理失败 10 审核不通过）
+				// 社保状态：派增（0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败）、派减（6待审核 7待办理 8办理成功 9 办理失败 10 审核不通过-增）
 				if (Common.isNotNull(excel.getSocialHousehold())
-						&& (Common.isEmpty(socialFund.getSocialStatus())
-						|| CommonConstants.SIX_STRING.equals(socialFund.getSocialStatus())
+						&& (CommonConstants.SIX_STRING.equals(socialFund.getSocialStatus())
 						|| CommonConstants.SEVEN_STRING.equals(socialFund.getSocialStatus())
 						|| CommonConstants.NINE_STRING.equals(socialFund.getSocialStatus())
-						|| CommonConstants.FIVE_STRING.equals(socialFund.getSocialStatus()))
+						|| CommonConstants.TEN_STRING.equals(socialFund.getSocialStatus())
+						|| CommonConstants.ZERO_STRING.equals(socialFund.getSocialStatus())
+						|| CommonConstants.ONE_STRING.equals(socialFund.getSocialStatus())
+						|| CommonConstants.THREE_STRING.equals(socialFund.getSocialStatus())
+						|| CommonConstants.TWO_STRING.equals(socialFund.getSocialStatus()))
 				){
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_EXISTING)));
 					return true;
 				}
-				// 公积金状态：派增（0待审核、1待办理、3办理成功、4办理失败）、派减（5待审核 6待办理 7 办理成功 8 办理失败 9 审核不通过）
+				// 公积金状态：派增（0待审核、1待办理、3办理成功、4办理失败）、派减（5待审核 6待办理 7 办理成功 8 办理失败 9 审核不通过-增）
 				if (Common.isNotNull(excel.getProvidentHousehold())
 						&& (CommonConstants.FIVE_STRING.equals(socialFund.getFundStatus())
-						&& CommonConstants.SIX_STRING.equals(socialFund.getFundStatus())
-						&& CommonConstants.EIGHT_STRING.equals(socialFund.getFundStatus())
-						&& CommonConstants.FOUR_STRING.equals(socialFund.getFundStatus()))){
+						|| CommonConstants.SIX_STRING.equals(socialFund.getFundStatus())
+						|| CommonConstants.EIGHT_STRING.equals(socialFund.getFundStatus())
+						|| CommonConstants.ZERO_STRING.equals(socialFund.getFundStatus())
+						|| CommonConstants.ONE_STRING.equals(socialFund.getFundStatus())
+						|| CommonConstants.THREE_STRING.equals(socialFund.getFundStatus()))){
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_FUND_EXISTING)));
 					return true;
 				}
@@ -1747,36 +1752,29 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									//派增审核不通过  需要处理预估数据
 								} else if (CommonConstants.ONE_INT == flag.intValue()) {
 									socialInfo.setDeleteFlag(CommonConstants.ONE_STRING);
-									// 作废更新：社保状态、同步预估数据   审核不通过直接作废 TODO
+									// 作废更新：社保状态、同步预估数据   审核不通过直接作废 TODO  预估数据
 									socialInfo.setAuditStatus(CommonConstants.TWO_STRING);
-									clearSocialAddInfo(sf, dis);
-
-
+									sf.setSocialAddStatus(CommonConstants.FOUR_STRING);
+									sf.setSocialStatus(CommonConstants.TEN_STRING);
 								}
+								socialInfo.setAuditTime(new Date());
+								socialInfo.setAuditUser(user.getId());
 							}
 							// 派减审核
 							if (CommonConstants.dingleDigitStrArray[1].equals(dis.getType())){
 								//派增审核通过
 								if (CommonConstants.ZERO_INT == flag.intValue()) {
-									socialInfo.setAuditStatus(CommonConstants.ONE_STRING);
+									socialInfo.setReduceCan(CommonConstants.ONE_STRING);
 									// 待办理
-									sf.setSocialAddStatus(CommonConstants.ONE_STRING);
-									sf.setSocialStatus(CommonConstants.ONE_STRING);
+									sf.setSocialReduceStatus(CommonConstants.ONE_STRING);
+									sf.setSocialStatus(CommonConstants.SEVEN_STRING);
 									//派增审核不通过  需要处理预估数据
 								} else if (CommonConstants.ONE_INT == flag.intValue()) {
-									//派增作废同时删除社保或公积金，派减对应社保公积金状态修改 TODO
-									socialInfo.setDeleteFlag(CommonConstants.ONE_STRING);
-									// 作废更新：社保状态、同步预估数据  8 审核不通过直接作废 TODO
-									if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){
-										socialInfo.setAuditStatus(CommonConstants.TWO_STRING);
-									}
-
+									// 作废更新：社保状态、同步预估数据  8 审核不通过直接作废
+									sf.setSocialReduceStatus(CommonConstants.ONE_STRING_NEGATE);
+									sf.setSocialStatus(CommonConstants.THREE_STRING);
 								}
 							}
-
-
-							socialInfo.setAuditTime(new Date());
-							socialInfo.setAuditUser(user.getId());
 							socialMapper.updateById(socialInfo);
 						}
 					}
@@ -1788,25 +1786,41 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 							remark += "公积金";
 						}
 						providentFund = fundMapper.selectById(dis.getFundId());
-						if (null == providentFund && Common.isNotNull(dis.getFundId())) {
+						if (Common.isNotNull(providentFund)) {
 							errorList.add(new ErrorMessage(-1, "找不到员工公积金派单数据：" + dis.getEmpName()));
 							continue;
 						}
-						if (null != providentFund && Common.isNotNull(dis.getFundId())) {
-							// 审核通过
-							if (CommonConstants.ZERO_INT == flag.intValue()) {
-								if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){
+						if (Common.isNotNull(providentFund)) {
+							//派增
+							if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){
+								// 审核通过
+								if (CommonConstants.ZERO_INT == flag.intValue()) {
 									providentFund.setAuditStatus(CommonConstants.ONE_STRING);
-								}
-							// 审核不通过
-							} else if (CommonConstants.ONE_INT == flag.intValue()) {
-								// 作废更新：公积金状态、同步档案的公积金状态、同步预估数据  fxj 20200928 审核不通过直接作废
-								if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())){
+									sf.setFundAddStatus(CommonConstants.ONE_STRING);
+									sf.setFundStatus(CommonConstants.ONE_STRING);
+									// 审核不通过
+								} else if (CommonConstants.ONE_INT == flag.intValue()) {
+									// 作废更新：公积金状态、同步档案的公积金状态、同步预估数据  TODO
 									providentFund.setAuditStatus(CommonConstants.TWO_STRING);
+									sf.setFundAddStatus(CommonConstants.FOUR_STRING);
+									sf.setFundStatus(CommonConstants.NINE_STRING);
+								}
+								providentFund.setAuditTime(new Date());
+								providentFund.setAuditUser(user.getId());
+							}
+							//派减
+							if (CommonConstants.dingleDigitStrArray[1].equals(dis.getType())){
+								// 审核通过
+								if (CommonConstants.ZERO_INT == flag.intValue()) {
+									sf.setFundReduceStatus(CommonConstants.ONE_STRING);
+									sf.setFundStatus(CommonConstants.EIGHT_STRING);
+									// 审核不通过
+								} else if (CommonConstants.ONE_INT == flag.intValue()) {
+									// 作废更新：公积金状态、同步档案的公积金状态、同步预估数据  TODO
+									sf.setFundReduceStatus(CommonConstants.ONE_STRING_NEGATE);
+									sf.setFundStatus(CommonConstants.THREE_STRING);
 								}
 							}
-							providentFund.setAuditTime(new Date());
-							providentFund.setAuditUser(user.getId());
 							fundMapper.updateById(providentFund);
 
 						}