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

@@ -234,6 +234,9 @@ public interface CommonConstants {
 
     String RESULT_EMPTY = "获取结果为空";
 
+	//错误信息
+	String ERROR_NO_DOMAIN = "无此实体！";
+
 	/**
 	 * @Author fxj
 	 * @Date 2020-03-12 14:48
@@ -339,4 +342,8 @@ public interface CommonConstants {
 	 * 获取登录用户信息失败
 	 **/
 	public static final String USER_FAIL = "获取登录用户信息失败！";
+
+	public static final int SIXTEEN_INT = 16;
+	public static final String FIFTEEN = "15";
+	public static final String NINETEEN = "19";
 }

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

@@ -116,4 +116,7 @@ public class ExcelAttributeConstants {
 	public static final String WORKINFO_TYPE = "workinfo_type";
 	// 项目档案来源
 	public static final String PROJECT_EMP_SOURCE = "project_emp_source";
+
+	//区域字段组合
+	public static final String DEPARTID_PROVINCE_CITY_TOWN = "departId_province_city_town";
 }

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

@@ -5,10 +5,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -241,4 +239,63 @@ public class Common {
 		}
 	}
 
+	public static <T> HashMap<String, T> listToHashMapByKey(List<T> list, String keyPreStr, String filedKey) {
+		HashMap<String, T> hashMap = new HashMap<String,T>();
+		Object key = null;
+		String[] split = null;
+		if (null != list) {
+			if (filedKey.indexOf(CommonConstants.DOWN_LINE_CHAR) > CommonConstants.dingleDigitIntArray[0]) {
+				split = filedKey.split(CommonConstants.DOWN_LINE_STRING);
+				for (T t : list) {
+					key= null;
+					key = getFieldsValue(t, split, key);
+					hashMap.put(keyPreStr +CommonConstants.DOWN_LINE_STRING+ getStringValByObject(key), t);
+				}
+			} else {
+				for (T t : list) {
+					key= null;
+					key = getFieldValueByName(filedKey, t);
+					hashMap.put(keyPreStr +CommonConstants.DOWN_LINE_STRING+ getStringValByObject(key), t);
+				}
+			}
+		}
+		return hashMap;
+	}
+
+	/**
+	 * 从实体中获取多个字段的值并已下划线分割
+	 *
+	 * @param t
+	 * @param split
+	 * @return
+	 * @Author fxj
+	 * @Date 2019-09-24
+	 **/
+	private static <T> Object getFieldsValue(T t, String[] split, Object key) {
+		int i = 0;
+		while (i < split.length) {
+			if (null == key || CommonConstants.EMPTY_STRING.equals(key)) {
+				key = getFieldValueByName(split[i], t);
+			} else {
+				key = key + CommonConstants.DOWN_LINE_STRING + getFieldValueByName(split[i], t);
+			}
+			i++;
+		}
+		return key;
+	}
+
+	/**
+	 * 如果为空或零 返回true  否则 返回false
+	 * @Author fxj
+	 * @Date 2020-12-29
+	 * @param data
+	 * @return
+	 **/
+	public static boolean isNullOrZero(BigDecimal data) {
+		if (null == data ||
+				BigDecimal.ZERO.compareTo(data) == CommonConstants.ZERO_INT){
+			return true;
+		}
+		return false;
+	}
 }

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/UpmsDaprUtils.java

+package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
+
+import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+
+import java.util.List;
+
+/**
+ * @Author fxj
+ * @Date 2022/7/11
+ * @Description
+ * @Version 1.0
+ */
+@Log4j2
+@EnableConfigurationProperties(DaprUpmsProperties.class)
+public class UpmsDaprUtils {
+
+	@Autowired
+	private static DaprUpmsProperties daprUpmsProperties;
+
+	/**
+	 * 获取所有区域数据
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @return
+	 **/
+	public static R<List<SysArea>> getAreaListR() {
+		R<List<SysArea>> areaListR = HttpDaprUtil.invokeMethodPost(daprUpmsProperties.getAppUrl(),daprUpmsProperties.getAppId(),"/area/inner/getSysAreaList","", SysArea.class, SecurityConstants.FROM_IN);
+		if (Common.isEmpty(areaListR)){
+			return R.failed("获取所有区域数据失败！");
+		}
+		return areaListR;
+	}
+}

yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties

-dapr.upms.appUrl=http://yifu-upms.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
+dapr.upms.appUrl=http://localhost:3500/v1.0/invoke/
 dapr.upms.appId=yifu-upms
 dapr.upms.appPort=4000
 dapr.upms.httpPort=3500
@@ -6,11 +6,18 @@ dapr.upms.grpcPort=52000
 dapr.upms.metricsPort=9094
 
 #\u6D4B\u8BD5\u73AF\u5883
-dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
+#dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
 #\u672C\u5730
-#dapr.check.appUrl=http://localhost:3502/v1.0/invoke/
+dapr.check.appUrl=http://localhost:3507/v1.0/invoke/
 dapr.check.appId=yifu-check
-dapr.check.appPort=5022
-dapr.check.httpPort=3502
-dapr.check.grpcPort=52002
-dapr.check.metricsPort=9092
+#dapr.check.appPort=5022
+#dapr.check.httpPort=3502
+#dapr.check.grpcPort=52002
+#dapr.check.metricsPort=9092
\ No newline at end of file
+
+dapr.social.appUrl=http://localhost:3509/v1.0/invoke/
+dapr.social.appId\uFF1B
+dapr.social.appPort=5002
+dapr.social.httpPort=3509
+dapr.social.grpcPort=52003
+dapr.social.metricsPort=9093
\ No newline at end of file

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

+package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+ * @author licancan
+ * @description 商险明细表 t_insurance_detail
+ * @date 2022-07-18 16:20:16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_insurance_detail")
+@Tag(name = "商险明细表")
+public class TInsuranceDetail extends BaseEntity {
+    /**
+     * 主键
+     */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "主键")
+    private String id;
+
+    /**
+     * 员工档案id
+     */
+    private String empId;
+
+    /**
+     * 员工姓名
+     */
+	@NotBlank(message = "员工姓名不能为空")
+	@Length(max = 32, message = "员工姓名不能超过32个字符")
+	@Schema(description = "员工姓名")
+    private String empName;
+
+    /**
+     * 员工身份证号
+     */
+    private String empIdcardNo;
+
+    /**
+     * 项目编码
+     */
+    private String deptNo;
+
+    /**
+     * 保险公司名称(冗余字段)
+     */
+    private String insuranceCompanyName;
+
+    /**
+     * 险种主键
+     */
+    private String insuranceTypeId;
+
+    /**
+     * 购买标准
+     */
+    private String buyStandard;
+
+    /**
+     * 保单编号
+     */
+    private String policyNo;
+
+    /**
+     * 保单开始时间
+     */
+    private Date policyStart;
+
+    /**
+     * 保单结束时间
+     */
+    private Date policyEnd;
+
+    /**
+     * 保单生效日期
+     */
+    private Date policyEffect;
+
+    /**
+     * 办理时间
+     */
+    private Date batchDate;
+
+    /**
+     * 结算月
+     */
+    private String settleMonth;
+
+    /**
+     * 发票号
+     */
+    private String invoiceNo;
+
+    /**
+     * 购买类型， 1新增、3批增、4替换
+     */
+    private Integer buyType;
+
+    /**
+     * 商险购买地省名称
+     */
+    private String businessInsuranceProvName;
+
+    /**
+     * 商险购买地市名称
+     */
+    private String businessInsuranceCityName;
+
+    /**
+     * 商险办理省名称
+     */
+    private String businessInsuranceHandleProvName;
+
+    /**
+     * 商险办理城市名称
+     */
+    private String businessInsuranceHandleCityName;
+
+    /**
+     * 结算类型 (1、单独结算 2、合并结算-和工资一起结算)
+     */
+    private String settleType;
+
+    /**
+     * 实际保费
+     */
+    private BigDecimal actualPremium;
+
+    /**
+     * 预估保费
+     */
+    private BigDecimal estimatePremium;
+
+    /**
+     * 差额（实缴-预估）
+     */
+    private BigDecimal settleBalance;
+
+    /**
+     * 投保办理状态 1待办理 2办理中 3已办理 4投保退回 5 已减员
+     */
+    private Integer buyHandleStatus;
+
+    /**
+     * 结算办理状态 1待结算 2结算中 3已结算
+     */
+    private Integer settleHandleStatus;
+
+    /**
+     * 减员状态 1待减员 2减员中3减员退回
+     */
+    private Integer reduceHandleStatus;
+
+    /**
+     * 是否出险 0未出险 1已出险
+     */
+    private Integer isUse;
+
+    /**
+     * 是否有效 0有效 1无效
+     */
+    private Integer isEffect;
+
+    /**
+     * 是否过期 0未过期 1已过期
+     */
+	@Schema(description = "是否过期 0未过期 1已过期")
+    private Integer isOverdue;
+
+    /**
+     * 是否删除 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-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

+package com.yifu.cloud.plus.v1.yifu.insurances.controller;
+
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author licancan
+ * @description 针对表【t_insurance_detail(商险明细表)】的数据库操作controller
+ * @date 2022-07-18 16:38:48
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/insuranceDetail")
+@Tag(name = "商险相关")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class TInsuranceDetailController {
+	@Resource
+	private TInsuranceDetailService tInsuranceDetailService;
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.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.TInsuranceDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author licancan
+ * @description 针对表【t_insurance_detail(商险明细表)】的数据库操作Mapper
+ * @date 2022-07-18 16:20:16
+ */
+@Mapper
+public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceDetailService.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.TInsuranceDetail;
+
+/**
+ * @author licancan
+ * @description 针对表【t_insurance_detail(商险明细表)】的数据库操作Service
+ * @date 2022-07-18 16:20:16
+ */
+public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceDetailServiceImpl.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.TInsuranceDetail;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceDetailMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author licancan
+ * @description 针对表【t_insurance_detail(商险明细表)】的数据库操作Service实现
+ * @date 2022-07-18 16:20:16
+ */
+@Service
+public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMapper, TInsuranceDetail> implements TInsuranceDetailService {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.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.TInsuranceDetailMapper">
+
+    <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="empId" column="EMP_ID" jdbcType="VARCHAR"/>
+            <result property="empName" column="EMP_NAME" jdbcType="VARCHAR"/>
+            <result property="empIdcardNo" column="EMP_IDCARD_NO" jdbcType="VARCHAR"/>
+            <result property="deptNo" column="DEPT_NO" jdbcType="VARCHAR"/>
+            <result property="insuranceCompanyName" column="INSURANCE_COMPANY_NAME" jdbcType="VARCHAR"/>
+            <result property="insuranceTypeId" column="INSURANCE_TYPE_ID" jdbcType="VARCHAR"/>
+            <result property="buyStandard" column="BUY_STANDARD" jdbcType="VARCHAR"/>
+            <result property="policyNo" column="POLICY_NO" jdbcType="VARCHAR"/>
+            <result property="policyStart" column="POLICY_START" jdbcType="DATE"/>
+            <result property="policyEnd" column="POLICY_END" jdbcType="DATE"/>
+            <result property="policyEffect" column="POLICY_EFFECT" jdbcType="DATE"/>
+            <result property="batchDate" column="BATCH_DATE" jdbcType="TIMESTAMP"/>
+            <result property="settleMonth" column="SETTLE_MONTH" jdbcType="VARCHAR"/>
+            <result property="invoiceNo" column="INVOICE_NO" jdbcType="VARCHAR"/>
+            <result property="buyType" column="BUY_TYPE" jdbcType="TINYINT"/>
+            <result property="businessInsuranceProvName" column="BUSINESS_INSURANCE_PROV_NAME" jdbcType="VARCHAR"/>
+            <result property="businessInsuranceCityName" column="BUSINESS_INSURANCE_CITY_NAME" jdbcType="VARCHAR"/>
+            <result property="businessInsuranceHandleProvName" column="BUSINESS_INSURANCE_HANDLE_PROV_NAME" jdbcType="VARCHAR"/>
+            <result property="businessInsuranceHandleCityName" column="BUSINESS_INSURANCE_HANDLE_CITY_NAME" jdbcType="VARCHAR"/>
+            <result property="settleType" column="SETTLE_TYPE" jdbcType="VARCHAR"/>
+            <result property="actualPremium" column="ACTUAL_PREMIUM" jdbcType="DECIMAL"/>
+            <result property="estimatePremium" column="ESTIMATE_PREMIUM" jdbcType="DECIMAL"/>
+            <result property="settleBalance" column="SETTLE_BALANCE" jdbcType="DECIMAL"/>
+            <result property="buyHandleStatus" column="BUY_HANDLE_STATUS" jdbcType="TINYINT"/>
+            <result property="settleHandleStatus" column="SETTLE_HANDLE_STATUS" jdbcType="TINYINT"/>
+            <result property="reduceHandleStatus" column="REDUCE_HANDLE_STATUS" jdbcType="TINYINT"/>
+            <result property="isUse" column="IS_USE" jdbcType="TINYINT"/>
+            <result property="isEffect" column="IS_EFFECT" jdbcType="TINYINT"/>
+            <result property="isOverdue" column="IS_OVERDUE" jdbcType="TINYINT"/>
+            <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
+            <result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/>
+            <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
+            <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
+            <result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
+            <result property="deleteFlag" column="DELETE_FLAG" jdbcType="TINYINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,EMP_ID,EMP_NAME,
+        EMP_IDCARD_NO,DEPT_NO,INSURANCE_COMPANY_NAME,
+        INSURANCE_TYPE_ID,BUY_STANDARD,POLICY_NO,
+        POLICY_START,POLICY_END,POLICY_EFFECT,
+        BATCH_DATE,SETTLE_MONTH,INVOICE_NO,
+        BUY_TYPE,BUSINESS_INSURANCE_PROV_NAME,BUSINESS_INSURANCE_CITY_NAME,
+        BUSINESS_INSURANCE_HANDLE_PROV_NAME,BUSINESS_INSURANCE_HANDLE_CITY_NAME,SETTLE_TYPE,
+        ACTUAL_PREMIUM,ESTIMATE_PREMIUM,SETTLE_BALANCE,
+        BUY_HANDLE_STATUS,SETTLE_HANDLE_STATUS,REDUCE_HANDLE_STATUS,
+        IS_USE,IS_EFFECT,IS_OVERDUE,
+        CREATE_BY,CREATE_NAME,CREATE_TIME,
+        UPDATE_BY,UPDATE_TIME,DELETE_FLAG
+    </sql>
+</mapper>

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.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.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 缴费库
+ *
+ * @author huyc
+ * @date 2022-07-14 18:53:42
+ */
+@Data
+@TableName("t_payment_info")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "缴费库")
+public class TPaymentInfo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description ="主键")
+    private String id;
+
+    /**
+     * 员工姓名
+     */
+    @ExcelAttribute(name = "员工姓名" )
+    @Schema(description ="员工姓名")
+    @ExcelProperty("员工姓名")
+    private String empName;
+
+    /**
+     * 员工编码
+     */
+    @ExcelAttribute(name = "员工编码" )
+    @Schema(description ="员工编码")
+    @ExcelProperty("员工编码")
+    private String empNo;
+
+    /**
+     * 员工ID
+     */
+    @ExcelAttribute(name = "员工ID" )
+    @Schema(description ="员工ID")
+    @ExcelProperty("员工ID")
+    private String empId;
+
+    /**
+     * 身份证号
+     */
+    @ExcelAttribute(name = "身份证号" )
+    @Schema(description ="身份证号")
+    @ExcelProperty("身份证号")
+    private String empIdcard;
+
+    /**
+     * 单位名称
+     */
+    @ExcelAttribute(name = "单位名称" )
+    @Schema(description ="单位名称")
+    @ExcelProperty("单位名称")
+    private String unitId;
+
+    /**
+     * 项目名称
+     */
+    @ExcelAttribute(name = "项目名称" )
+    @Schema(description ="项目名称")
+    @ExcelProperty("项目名称")
+    private String settleDomainId;
+
+    /**
+     * 社保户
+     */
+    @ExcelAttribute(name = "社保户" )
+    @Schema(description ="社保户")
+    @ExcelProperty("社保户")
+    private String socialHousehold;
+
+    /**
+     * 社保编号
+     */
+    @ExcelAttribute(name = "社保编号" )
+    @Schema(description ="社保编号")
+    @ExcelProperty("社保编号")
+    private String socialSecurityNo;
+
+    /**
+     * 社保缴纳地
+     */
+    @ExcelAttribute(name = "社保缴纳地" )
+    @Schema(description ="社保缴纳地")
+    @ExcelProperty("社保缴纳地")
+    private String socialPayAddr;
+
+    /**
+     * 社保缴纳月份
+     */
+    @ExcelAttribute(name = "社保缴纳月份" )
+    @Schema(description ="社保缴纳月份")
+    @ExcelProperty("社保缴纳月份")
+    private String socialPayMonth;
+
+    /**
+     * 社保生成月份
+     */
+    @ExcelAttribute(name = "社保生成月份" )
+    @Schema(description ="社保生成月份")
+    @ExcelProperty("社保生成月份")
+    private String socialCreateMonth;
+
+    /**
+     * 锁定状态 0 未锁定 1 锁定
+     */
+    @ExcelAttribute(name = "锁定状态 0 未锁定 1 锁定" )
+    @Schema(description ="锁定状态 0 未锁定 1 锁定")
+    @ExcelProperty("锁定状态 0 未锁定 1 锁定")
+    private String lockStatus;
+
+    /**
+     * 社保结算状态  0: 未结算  1: 待结算  2: 已结算
+     */
+    @ExcelAttribute(name = "社保结算状态  0: 未结算  1: 待结算  2: 已结算" )
+    @Schema(description ="社保结算状态  0: 未结算  1: 待结算  2: 已结算")
+    @ExcelProperty("社保结算状态  0: 未结算  1: 待结算  2: 已结算")
+    private String socialSettlementFlag;
+
+    /**
+     * 公积金结算状态
+     */
+    @ExcelAttribute(name = "公积金结算状态" )
+    @Schema(description ="公积金结算状态")
+    @ExcelProperty("公积金结算状态")
+    private String fundSettlementFlag;
+
+    /**
+     * 总合计
+     */
+    @ExcelAttribute(name = "总合计" )
+    @Schema(description ="总合计")
+    @ExcelProperty("总合计")
+    private BigDecimal sumAll;
+
+    /**
+     * 公积金缴纳月份
+     */
+    @ExcelAttribute(name = "公积金缴纳月份" )
+    @Schema(description ="公积金缴纳月份")
+    @ExcelProperty("公积金缴纳月份")
+    private String providentPayMonth;
+
+    /**
+     * 公积金生成月份
+     */
+    @ExcelAttribute(name = "公积金生成月份" )
+    @Schema(description ="公积金生成月份")
+    @ExcelProperty("公积金生成月份")
+    private String providentCreateMonth;
+
+    /**
+     * 公积金户
+     */
+    @ExcelAttribute(name = "公积金户" )
+    @Schema(description ="公积金户")
+    @ExcelProperty("公积金户")
+    private String providentHousehold;
+
+    /**
+     * 公积金缴纳地
+     */
+    @ExcelAttribute(name = "公积金缴纳地" )
+    @Schema(description ="公积金缴纳地")
+    @ExcelProperty("公积金缴纳地")
+    private String providentPayAddr;
+
+    /**
+     * 公积金缴纳地-省
+     */
+    @ExcelAttribute(name = "公积金缴纳地-省" )
+    @Schema(description ="公积金缴纳地-省")
+    @ExcelProperty("公积金缴纳地-省")
+    private String fundProvince;
+
+    /**
+     * 公积金缴纳地-市
+     */
+    @ExcelAttribute(name = "公积金缴纳地-市" )
+    @Schema(description ="公积金缴纳地-市")
+    @ExcelProperty("公积金缴纳地-市")
+    private String fundCity;
+
+    /**
+     * 公积金缴纳地-县
+     */
+    @ExcelAttribute(name = "公积金缴纳地-县" )
+    @Schema(description ="公积金缴纳地-县")
+    @ExcelProperty("公积金缴纳地-县")
+    private String fundTown;
+
+    /**
+     * 社保缴纳地-省
+     */
+    @ExcelAttribute(name = "社保缴纳地-省" )
+    @Schema(description ="社保缴纳地-省")
+    @ExcelProperty("社保缴纳地-省")
+    private String socialProvince;
+
+    /**
+     * 社保缴纳地-市
+     */
+    @ExcelAttribute(name = "社保缴纳地-市" )
+    @Schema(description ="社保缴纳地-市")
+    @ExcelProperty("社保缴纳地-市")
+    private String socialCity;
+
+    /**
+     * 社保缴纳地-县
+     */
+    @ExcelAttribute(name = "社保缴纳地-县" )
+    @Schema(description ="社保缴纳地-县")
+    @ExcelProperty("社保缴纳地-县")
+    private String socialTown;
+
+    /**
+     * 社保ID
+     */
+    @ExcelAttribute(name = "社保ID" )
+    @Schema(description ="社保ID")
+    @ExcelProperty("社保ID")
+    private String socialId;
+
+    /**
+     * 公积金ID
+     */
+    @ExcelAttribute(name = "公积金ID" )
+    @Schema(description ="公积金ID")
+    @ExcelProperty("公积金ID")
+    private String fundId;
+
+    /**
+     * 社保合计
+     */
+    @ExcelAttribute(name = "社保合计" )
+    @Schema(description ="社保合计")
+    @ExcelProperty("社保合计")
+    private BigDecimal socialSum;
+
+    /**
+     * 单位社保合计
+     */
+    @ExcelAttribute(name = "单位社保合计" )
+    @Schema(description ="单位社保合计")
+    @ExcelProperty("单位社保合计")
+    private BigDecimal unitSocialSum;
+
+    /**
+     * 个人社保合计
+     */
+    @ExcelAttribute(name = "个人社保合计" )
+    @Schema(description ="个人社保合计")
+    @ExcelProperty("个人社保合计")
+    private BigDecimal socialSecurityPersonalSum;
+
+    /**
+     * 公积金总合计
+     */
+    @ExcelAttribute(name = "公积金总合计" )
+    @Schema(description ="公积金总合计")
+    @ExcelProperty("公积金总合计")
+    private BigDecimal providentSum;
+
+    /**
+     * 社保核准表ID
+     */
+    @ExcelAttribute(name = "社保核准表ID" )
+    @Schema(description ="社保核准表ID")
+    @ExcelProperty("社保核准表ID")
+    private String socialSettlementId;
+
+    /**
+     * 公积金核准表ID
+     */
+    @ExcelAttribute(name = "公积金核准表ID" )
+    @Schema(description ="公积金核准表ID")
+    @ExcelProperty("公积金核准表ID")
+    private String fundSettlementId;
+
+    /**
+     * 工资社保结算状态  0: 未结算  1:  已结算
+     */
+    @ExcelAttribute(name = "工资社保结算状态  0: 未结算  1:  已结算" )
+    @Schema(description ="工资社保结算状态  0: 未结算  1:  已结算")
+    @ExcelProperty("工资社保结算状态  0: 未结算  1:  已结算")
+    private String salarySocialFlag;
+
+    /**
+     * 工资公积金结算状态  0: 未结算  1: 已结算
+     */
+    @ExcelAttribute(name = "工资公积金结算状态  0: 未结算  1: 已结算" )
+    @Schema(description ="工资公积金结算状态  0: 未结算  1: 已结算")
+    @ExcelProperty("工资公积金结算状态  0: 未结算  1: 已结算")
+    private String salaryFundFlag;
+
+    /**
+     * 就职班组
+     */
+    @ExcelAttribute(name = "就职班组" )
+    @Schema(description ="就职班组")
+    @ExcelProperty("就职班组")
+    private String inauguralTeam;
+
+    /**
+     * 电信编号
+     */
+    @ExcelAttribute(name = "电信编号" )
+    @Schema(description ="电信编号")
+    @ExcelProperty("电信编号")
+    private String telecomNumber;
+
+    /**
+     * 排序字段
+     */
+    @ExcelAttribute(name = "排序字段" )
+    @Schema(description ="排序字段")
+    @ExcelProperty("排序字段")
+    private String sortTime;
+
+    /**
+     * 代理结算id
+     */
+    @ExcelAttribute(name = "代理结算id" )
+    @Schema(description ="代理结算id")
+    @ExcelProperty("代理结算id")
+    private String agentId;
+
+    /**
+     * 财务账单ID
+     */
+    @ExcelAttribute(name = "财务账单ID" )
+    @Schema(description ="财务账单ID")
+    @ExcelProperty("财务账单ID")
+    private String financeBillId;
+
+}

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.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.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 预派单记录
+ *
+ * @author huyc
+ * @date 2022-07-14 18:53:42
+ */
+@Data
+@TableName("t_pre_dispatch_info")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "预派单记录")
+public class TPreDispatchInfo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description ="id")
+    private String id;
+
+    /**
+     * 0 派增  1 派减
+     */
+    @Schema(description ="派单类型:0 派增  1 派减")
+	@NotNull(message = "派单类型不可为空")
+	@Size(max = 2, message = "派单类型不可超过2位")
+    private String type;
+
+    /**
+     * 日期，格式：2020-12-25
+     */
+    @Schema(description ="日期，格式：2020-12-25")
+    private String date;
+
+    /**
+     * 接单分公司
+     */
+    @Schema(description ="接单分公司")
+	@Size(max = 50, message = "接单分公司不可超过50位")
+    private String company;
+
+    /**
+     * 缴费地
+     */
+    @Schema(description ="缴费地")
+	@Size(max = 20, message = "接单分公司不可超过20位")
+    private String payAddress;
+
+    /**
+     * 客户名称
+     */
+    @Schema(description ="客户名称")
+	@Size(max = 50, message = "客户名称不可超过50位")
+	private String customerName;
+
+    /**
+     * 身份证号
+     */
+    @Schema(description ="身份证号")
+	@NotNull(message = "身份证号码不可为空")
+	@Size(max = 20, message = "身份证号码不可超过20位")
+    private String empIdcard;
+
+    /**
+     * 员工姓名
+     */
+    @Schema(description ="员工姓名")
+	@NotNull(message = "员工姓名不可为空")
+	@Size(max = 20, message = "员工姓名不可超过20位")
+    private String empName;
+
+    /**
+     * 联系电话1
+     */
+    @Schema(description ="联系电话1")
+    private String telOne;
+
+    /**
+     * 联系电话2
+     */
+    @Schema(description ="联系电话2")
+    private String telTwo;
+
+    /**
+     * 入职日期
+     */
+    @Schema(description ="入职日期")
+    private LocalDateTime entryDate;
+
+    /**
+     * 正式工资
+     */
+    @Schema(description ="正式工资")
+    private String formalSalary;
+
+    /**
+     * 派遣开始日期
+     */
+    @Schema(description ="派遣开始日期")
+	@Size(max = 20, message = "派遣开始日期不可超过20位")
+    private String dispatchStart;
+
+    /**
+     * 派遣结束日期
+     */
+    @Schema(description ="派遣结束日期")
+	@Size(max = 20, message = "派遣结束日期不可超过20位")
+    private String dispatchEnd;
+
+    /**
+     * 合同开始日期
+     */
+    @Schema(description ="合同开始日期")
+	@Size(max = 20, message = "合同开始日期不可超过20位")
+    private String contractStart;
+
+    /**
+     * 合同终止日期
+     */
+    @Schema(description ="合同终止日期")
+	@Size(max = 20, message = "合同终止日期不可超过20位")
+    private String contractEnd;
+
+    /**
+     * 使用开始日期
+     */
+    @Schema(description ="使用开始日期")
+	@Size(max = 20, message = "使用开始日期不可超过20位")
+    private String trialStart;
+
+    /**
+     * 试用结束日期
+     */
+    @Schema(description ="试用结束日期")
+	@Size(max = 20, message = "试用结束日期不可超过20位")
+	private String trialEnd;
+
+    /**
+     * 试用期工资
+     */
+    @Schema(description ="试用期工资")
+    private String trialSalary;
+
+    /**
+     * 工作制
+     */
+    @Schema(description ="工作制")
+	@Size(max = 20, message = "工作制不可超过20位")
+	private String workingSystem;
+
+    /**
+     * 合同版本
+     */
+    @Schema(description ="合同版本")
+	@Size(max = 20, message = "合同版本不可超过20位")
+	private String contractVersion;
+
+    /**
+     * 是否电话通知
+     */
+    @Schema(description ="是否电话通知")
+    private String telNotice;
+
+    /**
+     * 实际工作地
+     */
+    @Schema(description ="实际工作地")
+	private String workingAddress;
+
+    /**
+     * 备注说明1
+     */
+    @Schema(description ="备注说明1")
+	private String remarkOne;
+
+    /**
+     * 备注说明2
+     */
+    @Schema(description ="备注说明2")
+    private String remarkTwo;
+
+    /**
+     * 养老城市
+     */
+    @Schema(description ="养老城市")
+	private String pensionAddress;
+
+    /**
+     * 养老基数
+     */
+    @Schema(description ="养老基数")
+    private BigDecimal pensionBase;
+
+    /**
+     * 养老起缴月
+     */
+    @Schema(description ="养老起缴月")
+	private String pensionStart;
+
+    /**
+     * 医疗城市
+     */
+    @Schema(description ="医疗城市")
+	private String medicalAddress;
+
+    /**
+     * 医疗基数
+     */
+    @Schema(description ="医疗基数")
+    private BigDecimal medicalBase;
+
+    /**
+     * 医疗起缴月
+     */
+    @Schema(description ="医疗起缴月")
+    private String medicalStart;
+
+    /**
+     * 工伤城市
+     */
+    @Schema(description ="工伤城市")
+    private String injuryAddress;
+
+    /**
+     * 工伤基数
+     */
+    @Schema(description ="工伤基数")
+    private BigDecimal injuryBase;
+
+    /**
+     * 工伤起缴月
+     */
+    @Schema(description ="工伤起缴月")
+    private String injuryStart;
+
+    /**
+     * 生育城市
+     */
+    @Schema(description ="生育城市")
+    private String birthAddress;
+
+    /**
+     * 生育基数
+     */
+    @Schema(description ="生育基数")
+    private BigDecimal birthBase;
+
+    /**
+     * 生育起缴月
+     */
+    @Schema(description ="生育起缴月")
+    private String birthStart;
+
+    /**
+     * 失业城市
+     */
+    @Schema(description ="失业城市")
+    private String unemploymentAddress;
+
+    /**
+     * 失业基数
+     */
+    @Schema(description ="失业基数")
+    private BigDecimal unemploymentBase;
+
+    /**
+     * 失业起缴月
+     */
+    @Schema(description ="失业起缴月")
+    private String unemploymentStart;
+
+    /**
+     * 公积金城市
+     */
+    @Schema(description ="公积金城市")
+    private String fundAddress;
+
+    /**
+     * 公积金基数
+     */
+    @Schema(description ="公积金基数")
+    private BigDecimal fundBase;
+
+    /**
+     * 公积金起缴月
+     */
+    @Schema(description ="公积金起缴月")
+    private String fundStart;
+
+    /**
+     * 公积金个人比例
+     */
+    @Schema(description ="公积金个人比例")
+    private BigDecimal fundPersonalPer;
+
+    /**
+     * 公积金企业比例
+     */
+    @Schema(description ="公积金企业比例")
+    private BigDecimal fundCompanyPer;
+
+    /**
+     * 派单分公司
+     */
+    @Schema(description ="派单分公司")
+    private String dispatchCompany;
+
+    /**
+     * 派单客服
+     */
+    @Schema(description ="派单客服")
+    private String customerService;
+
+    /**
+     * 小合同名称
+     */
+    @Schema(description ="小合同名称")
+    private String contractMinorName;
+
+    /**
+     * 唯一号
+     */
+    @Schema(description ="唯一号")
+    private String uniqueNumber;
+
+    /**
+     * 客户编号
+     */
+    @Schema(description ="客户编号")
+    private String customerNumber;
+
+    /**
+     * 服务类别
+     */
+    @Schema(description ="服务类别")
+    private String serviceType;
+
+    /**
+     * 养老城市
+     */
+    @Schema(description ="养老城市")
+    private String pensionAddressReduce;
+
+    /**
+     * 养老截止时间
+     */
+    @Schema(description ="养老截止时间")
+    private String pensionEndReduce;
+
+    /**
+     * 医疗城市
+     */
+    @Schema(description ="医疗城市")
+    private String medicalAddressReduce;
+
+    /**
+     * 医疗截止时间
+     */
+    @Schema(description ="医疗截止时间")
+    private String medicalEndReduce;
+
+    /**
+     * 工伤城市
+     */
+    @Schema(description ="工伤城市")
+    private String injuryAddressReduce;
+
+    /**
+     * 工伤截止时间
+     */
+    @Schema(description ="工伤截止时间")
+    private String injuryEndReduce;
+
+    /**
+     * 生育城市
+     */
+    @Schema(description ="生育城市")
+    private String birthAddressReduce;
+
+    /**
+     * 生育截止时间
+     */
+    @Schema(description ="生育截止时间")
+    private String birthEndReduce;
+
+    /**
+     * 失业城市
+     */
+    @Schema(description ="失业城市")
+    private String unemploymentAddressReduce;
+
+    /**
+     * 失业截止时间
+     */
+    @Schema(description ="失业截止时间")
+    private String unemploymentEndReduce;
+
+    /**
+     * 公积金城市
+     */
+    @Schema(description ="公积金城市")
+    private String fundAddressReduce;
+
+    /**
+     * 公积金截止时间
+     */
+    @Schema(description ="公积金截止时间")
+    private String fundEndReduce;
+
+    /**
+     * 离职日期
+     */
+    @Schema(description ="离职日期")
+    private LocalDateTime leaveDate;
+
+    /**
+     * 离职原因
+     */
+    @Schema(description ="离职原因")
+    private String leaveReason;
+
+    /**
+     * 合同类型
+     */
+    @Schema(description ="合同类型")
+    private String contractType;
+
+    /**
+     * 员工类型
+     */
+    @Schema(description ="员工类型")
+	@Size(max = 20, message = "员工类型不可超过20位")
+	@NotNull(message = "员工姓名不可为空")
+    private String empTypeAdd;
+
+    /**
+     * 所属单位ID
+     */
+    @Schema(description ="所属单位ID")
+    private String unitIdAdd;
+
+    /**
+     * 所属结算主体ID
+     */
+    @Schema(description ="所属结算主体ID")
+    private String departIdAdd;
+
+    /**
+     * 所属单位名称
+     */
+    @Schema(description ="所属单位名称")
+    private String unitNameAdd;
+
+    /**
+     * 所属结算主体名称
+     */
+    @Schema(description ="所属结算主体名称")
+    private String departNameAdd;
+
+    /**
+     * 社保户
+     */
+    @Schema(description ="社保户")
+    private String socialHouseAdd;
+
+    /**
+     * 公积金户
+     */
+    @Schema(description ="公积金户")
+    private String fundHouseAdd;
+
+    /**
+     * 备案基数
+     */
+    @Schema(description ="备案基数")
+    private BigDecimal filingBaseAdd;
+
+    /**
+     * 0:正常未派单1:异常未派单2:已派单
+     */
+    @Schema(description ="0:正常未派单1:异常未派单2:已派单")
+    private String preStatus;
+
+    /**
+     * 0:正常1:作废
+     */
+    @Schema(description ="0:正常1:作废")
+    private String status;
+
+    /**
+     * 异常内容
+     */
+    @Schema(description ="异常内容")
+    private String exceptionContent;
+
+    /**
+     * 社保-省
+     */
+    @Schema(description ="社保-省")
+    private String socialProvince;
+
+    /**
+     * 社保-市
+     */
+    @Schema(description ="社保-市")
+    private String socialCity;
+
+    /**
+     * 社保-县
+     */
+    @Schema(description ="社保-县")
+    private String socialTown;
+
+    /**
+     * 公积金-省
+     */
+    @Schema(description ="公积金-省")
+    private String fundProvince;
+
+    /**
+     * 公积金-市
+     */
+    @Schema(description ="公积金-市")
+    private String fundCity;
+
+    /**
+     * 公积金-县
+     */
+    @Schema(description ="公积金-县")
+    private String fundTown;
+
+    /**
+     * 派单日期限制  在15日前可派单 15日及15后次月派单
+     */
+    @Schema(description ="派单日期限制  在15日前可派单 15日及15后次月派单")
+    private Integer dayLimit;
+
+    /**
+     * 资料是否提交: 0 已提交 1 未提交
+     */
+    @Schema(description ="资料是否提交: 0 已提交 1 未提交")
+	@NotNull(message = "资料是否提交不可为空")
+	@Size(max = 2, message = "资料是否提交不可超过2位")
+    private String dataSubStatus;
+
+    /**
+     * 岗位
+     */
+    @Schema(description ="岗位")
+	@NotNull(message = "岗位不可为空")
+	@Size(max = 50, message = "岗位不可超过50位")
+    private String positionAdd;
+
+    /**
+     * 派单的合同名称
+     */
+    @Schema(description ="派单的合同名称")
+    private String contractNameAdd;
+
+    /**
+     * 派单的合同类型
+     */
+    @Schema(description ="派单的合同类型")
+    private String contractTypeAdd;
+
+    /**
+     * 合同开始时间
+     */
+    @Schema(description ="合同开始时间")
+    private String contractStartAdd;
+
+    /**
+     * 合同截止时间
+     */
+    @Schema(description ="合同截止时间")
+    private String contractEndAdd;
+
+    /**
+     * 合同期限：默认两年
+     */
+    @Schema(description ="合同期限：默认两年")
+    private String contractTermAdd;
+
+    /**
+     * 工时制：默认综合工时制
+     */
+    @Schema(description ="工时制：默认综合工时制")
+    private String workingHoursAdd;
+
+    /**
+     * 离职原因（转换后的）
+     */
+    @Schema(description ="离职原因（转换后的）")
+    private String leaveReasonAdd;
+
+    /**
+     * 备注
+     */
+    @Schema(description ="备注")
+    private String remark;
+
+    /**
+     * 是否派单：0 是 2 否 
+     */
+    @Schema(description ="是否派单：0 是 2 否 ")
+    private String dispatchFlag;
+
+    /**
+     * 取消原因：不派单时填写
+     */
+    @Schema(description ="取消原因：不派单时填写")
+    private String cancelRemark;
+
+    /**
+     * 创建人部门名称
+     */
+    @Schema(description ="创建人部门名称")
+    private String userDeptName;
+
+	/**
+	 * 开始时间（查询专用）
+	 */
+	@ExcelAttribute(name = "创建开始时间")
+	@TableField(exist = false)
+	private LocalDateTime createTimeStart;
+	/**
+	 * 截止时间（查询专用）
+	 */
+	@ExcelAttribute(name = "创建截止时间")
+	@TableField(exist = false)
+	private LocalDateTime createTimeEnd;
+}

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

+package com.yifu.cloud.plus.v1.yifu.social.vo;
+
+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.util.LocalDateTimeUtils;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+public class TPreDispatchExportVo implements Serializable {
+
+	/**
+	 * 0 派增  1 派减
+	 */
+	@ExcelAttribute(name = "派单类型", maxLength = 2)
+	@Schema(description ="派单类型:0 派增  1 派减")
+	@ExcelProperty("派单类型")
+	private String type;
+
+	/**
+	 * 日期，格式：2020-12-25
+	 */
+	@ExcelAttribute(name = "日期" )
+	@Schema(description ="日期，格式：2020-12-25")
+	@ExcelProperty("日期，格式：2020-12-25")
+	private String date;
+
+	/**
+	 * 接单分公司
+	 */
+	@ExcelAttribute(name = "接单分公司" )
+	@Schema(description ="接单分公司")
+	@ExcelProperty("接单分公司")
+	@Size(max = 50, message = "接单分公司不可超过50位")
+	private String company;
+
+	/**
+	 * 缴费地
+	 */
+	@ExcelAttribute(name = "缴费地", isNotEmpty = true,errorInfo = "缴费地不能为空", maxLength = 20)
+	@Schema(description ="缴费地")
+	@ExcelProperty("缴费地")
+	@NotNull(message = "缴费地不可为空")
+	@Size(max = 20, message = "接单分公司不可超过20位")
+	private String payAddress;
+
+	/**
+	 * 身份证号
+	 */
+	@ExcelAttribute(name = "身份证号", isNotEmpty = true,errorInfo = "身份证号不能为空", maxLength = 20, isIdCard = true)
+	@Schema(description ="身份证号")
+	@ExcelProperty("身份证号")
+	@Size(max = 20, message = "客户名称不可超过20位")
+	private String empIdcard;
+
+	/**
+	 * 客户名称
+	 */
+	@ExcelAttribute(name = "客户名称", errorInfo = "客户名称不能为空", maxLength = 50)
+	@Schema(description ="客户名称")
+	@ExcelProperty("客户名称")
+	@Size(max = 50, message = "客户名称不可超过50位")
+	private String customerName;
+	/**
+	 * 员工姓名
+	 */
+	@ExcelProperty(value ="员工姓名")
+	@ExcelAttribute(name = "员工姓名", needExport = true)
+	private String empName;
+	/**
+	 * 联系电话1
+	 */
+	@ExcelProperty(value ="联系电话1")
+	@ExcelAttribute(name = "联系电话1", needExport = true)
+	private String telOne;
+	/**
+	 * 联系电话2
+	 */
+	@ExcelProperty(value ="联系电话2")
+	@ExcelAttribute(name = "联系电话2", needExport = true)
+	private String telTwo;
+	/**
+	 * 入职日期
+	 */
+	@ExcelProperty(value ="入职日期")
+	@ExcelAttribute(name = "入职日期", needExport = true)
+	private LocalDate entryDate;
+	/**
+	 * 正式工资
+	 */
+	@ExcelProperty(value ="正式工资")
+	@ExcelAttribute(name = "正式工资", needExport = true)
+	private String formalSalary;
+	/**
+	 * 派遣开始日期
+	 */
+	@ExcelProperty(value ="派遣开始日期")
+	@ExcelAttribute(name = "派遣开始日期", needExport = true)
+	private String dispatchStart;
+	/**
+	 * 派遣结束日期
+	 */
+	@ExcelProperty(value ="派遣结束日期")
+	@ExcelAttribute(name = "派遣结束日期", needExport = true)
+	private String dispatchEnd;
+	/**
+	 * 合同开始日期
+	 */
+	@ExcelProperty(value ="合同开始日期")
+	@ExcelAttribute(name = "合同开始日期", needExport = true)
+	private String contractStart;
+	/**
+	 * 合同终止日期
+	 */
+	@ExcelProperty(value ="合同终止日期")
+	@ExcelAttribute(name = "合同终止日期", needExport = true)
+	private String contractEnd;
+	/**
+	 * 试用开始日期
+	 */
+	@ExcelProperty(value ="试用开始日期")
+	@ExcelAttribute(name = "试用开始日期", needExport = true)
+	private String trialStart;
+	/**
+	 * 试用结束日期
+	 */
+	@ExcelProperty(value ="试用结束日期")
+	@ExcelAttribute(name = "试用结束日期", needExport = true)
+	private String trialEnd;
+	/**
+	 * 试用期工资
+	 */
+	@ExcelProperty(value ="试用期工资")
+	@ExcelAttribute(name = "试用期工资", needExport = true)
+	private String trialSalary;
+	/**
+	 * 工作制
+	 */
+	@ExcelProperty(value ="工作制")
+	@ExcelAttribute(name = "工作制", needExport = true)
+	private String workingSystem;
+	/**
+	 * 合同版本
+	 */
+	@ExcelProperty(value ="合同版本")
+	@ExcelAttribute(name = "合同版本", needExport = true)
+	private String contractVersion;
+	/**
+	 * 是否电话通知
+	 */
+	@ExcelProperty(value ="是否电话通知")
+	@ExcelAttribute(name = "是否电话通知", needExport = true)
+	private String telNotice;
+	/**
+	 * 实际工作地
+	 */
+	@ExcelProperty(value ="实际工作地")
+	@ExcelAttribute(name = "实际工作地", needExport = true)
+	private String workingAddress;
+	/**
+	 * 备注说明1
+	 */
+	@ExcelProperty(value ="备注说明1")
+	@ExcelAttribute(name = "备注说明1", needExport = true)
+	private String remarkOne;
+	/**
+	 * 备注说明2
+	 */
+	@ExcelProperty(value ="备注说明2")
+	@ExcelAttribute(name = "备注说明2", needExport = true)
+	private String remarkTwo;
+	/**
+	 * 养老城市
+	 */
+	@ExcelProperty(value ="养老城市")
+	@ExcelAttribute(name = "养老城市", needExport = true)
+	private String pensionAddress;
+	/**
+	 * 养老基数
+	 */
+	@ExcelProperty(value ="养老基数")
+	@ExcelAttribute(name = "养老基数", needExport = true)
+	private BigDecimal pensionBase;
+	/**
+	 * 养老起缴月
+	 */
+	@ExcelProperty(value ="养老起缴月")
+	@ExcelAttribute(name = "养老起缴月", needExport = true)
+	private String pensionStart;
+	/**
+	 * 医疗城市
+	 */
+	@ExcelProperty(value ="医疗城市")
+	@ExcelAttribute(name = "医疗城市", needExport = true)
+	private String medicalAddress;
+	/**
+	 * 医疗基数
+	 */
+	@ExcelProperty(value ="医疗基数")
+	@ExcelAttribute(name = "医疗基数", needExport = true)
+	private BigDecimal medicalBase;
+	/**
+	 * 医疗起缴月
+	 */
+	@ExcelProperty(value ="医疗起缴月")
+	@ExcelAttribute(name = "医疗起缴月", needExport = true)
+	private String medicalStart;
+	/**
+	 * 工伤城市
+	 */
+	@ExcelProperty(value ="工伤城市")
+	@ExcelAttribute(name = "工伤城市", needExport = true)
+	private String injuryAddress;
+	/**
+	 * 工伤基数
+	 */
+	@ExcelProperty(value ="工伤基数")
+	@ExcelAttribute(name = "工伤基数", needExport = true)
+	private BigDecimal injuryBase;
+	/**
+	 * 工伤起缴月
+	 */
+	@ExcelProperty(value ="工伤起缴月")
+	@ExcelAttribute(name = "工伤起缴月", needExport = true)
+	private String injuryStart;
+	/**
+	 * 生育城市
+	 */
+	@ExcelProperty(value ="生育城市")
+	@ExcelAttribute(name = "生育城市", needExport = true)
+	private String birthAddress;
+	/**
+	 * 生育基数
+	 */
+	@ExcelProperty(value ="生育基数")
+	@ExcelAttribute(name = "生育基数", needExport = true)
+	private BigDecimal birthBase;
+	/**
+	 * 生育起缴月
+	 */
+	@ExcelProperty(value ="生育起缴月")
+	@ExcelAttribute(name = "生育起缴月", needExport = true)
+	private String birthStart;
+	/**
+	 * 失业城市
+	 */
+	@ExcelProperty(value ="失业城市")
+	@ExcelAttribute(name = "失业城市", needExport = true)
+	private String unemploymentAddress;
+	/**
+	 * 失业基数
+	 */
+	@ExcelProperty(value ="失业基数")
+	@ExcelAttribute(name = "失业基数", needExport = true)
+	private BigDecimal unemploymentBase;
+	/**
+	 * 失业起缴月
+	 */
+	@ExcelProperty(value ="失业起缴月")
+	@ExcelAttribute(name = "失业起缴月", needExport = true)
+	private String unemploymentStart;
+	/**
+	 * 公积金城市
+	 */
+	@ExcelProperty(value ="公积金城市")
+	@ExcelAttribute(name = "公积金城市", needExport = true)
+	private String fundAddress;
+	/**
+	 * 公积金基数
+	 */
+	@ExcelProperty(value ="公积金基数")
+	@ExcelAttribute(name = "公积金基数", needExport = true)
+	private BigDecimal fundBase;
+	/**
+	 * 公积金起缴月
+	 */
+	@ExcelProperty(value ="公积金起缴月")
+	@ExcelAttribute(name = "公积金起缴月", needExport = true)
+	private String fundStart;
+	/**
+	 * 公积金个人比例
+	 */
+	@ExcelProperty(value ="公积金个人比例")
+	@ExcelAttribute(name = "公积金个人比例", needExport = true)
+	private BigDecimal fundPersonalPer;
+	/**
+	 * 公积金企业比例
+	 */
+	@ExcelProperty(value ="公积金企业比例")
+	@ExcelAttribute(name = "公积金企业比例", needExport = true)
+	private BigDecimal fundCompanyPer;
+	/**
+	 * 派单分公司
+	 */
+	@ExcelProperty(value ="派单分公司")
+	@ExcelAttribute(name = "派单分公司", needExport = true)
+	private String dispatchCompany;
+	/**
+	 * 派单客服
+	 */
+	@ExcelProperty(value ="派单客服")
+	@ExcelAttribute(name = "派单客服", needExport = true)
+	private String customerService;
+	/**
+	 * contract
+	 */
+	@ExcelProperty(value ="小合同名称")
+	@ExcelAttribute(name = "小合同名称", needExport = true)
+	private String contractMinorName;
+	/**
+	 * 唯一号
+	 */
+	@ExcelProperty(value ="唯一号")
+	@ExcelAttribute(name = "唯一号", needExport = true)
+	private String uniqueNumber;
+	/**
+	 * 客户编号
+	 */
+	@ExcelProperty(value ="客户编号")
+	@ExcelAttribute(name = "客户编号", needExport = true)
+	private String customerNumber;
+	/**
+	 * 服务类别
+	 */
+	@ExcelProperty(value ="服务类别")
+	@ExcelAttribute(name = "服务类别", needExport = true)
+	private String serviceType;
+	/**
+	 * 养老截止城市
+	 */
+	@ExcelProperty(value ="养老截止城市")
+	@ExcelAttribute(name = "养老截止城市", needExport = true)
+	private String pensionAddressReduce;
+	/**
+	 * 养老截止时间
+	 */
+	@ExcelProperty(value ="养老截止时间")
+	@ExcelAttribute(name = "养老截止时间", needExport = true)
+	private String pensionEndReduce;
+	/**
+	 * 医疗截止城市
+	 */
+	@ExcelProperty(value ="医疗截止城市")
+	@ExcelAttribute(name = "医疗截止城市", needExport = true)
+	private String medicalAddressReduce;
+	/**
+	 * 医疗截止时间
+	 */
+	@ExcelProperty(value ="医疗截止时间")
+	@ExcelAttribute(name = "医疗截止时间", needExport = true)
+	private String medicalEndReduce;
+	/**
+	 * 工伤截止城市
+	 */
+	@ExcelProperty(value ="工伤截止城市")
+	@ExcelAttribute(name = "工伤截止城市", needExport = true)
+	private String injuryAddressReduce;
+	/**
+	 * 工伤截止时间
+	 */
+	@ExcelProperty(value ="工伤截止时间")
+	@ExcelAttribute(name = "工伤截止时间", needExport = true)
+	private String injuryEndReduce;
+	/**
+	 * 生育截止城市
+	 */
+	@ExcelProperty(value ="生育截止城市")
+	@ExcelAttribute(name = "生育截止城市", needExport = true)
+	private String birthAddressReduce;
+	/**
+	 * 生育截止时间
+	 */
+	@ExcelProperty(value ="生育截止时间")
+	@ExcelAttribute(name = "生育截止时间", needExport = true)
+	private String birthEndReduce;
+	/**
+	 * 失业截止城市
+	 */
+	@ExcelProperty(value ="失业截止城市")
+	@ExcelAttribute(name = "失业截止城市", needExport = true)
+	private String unemploymentAddressReduce;
+	/**
+	 * 失业截止时间
+	 */
+	@ExcelProperty(value ="失业截止时间")
+	@ExcelAttribute(name = "失业截止时间", needExport = true)
+	private String unemploymentEndReduce;
+	/**
+	 * 公积金截止城市
+	 */
+	@ExcelProperty(value ="公积金截止城市")
+	@ExcelAttribute(name = "公积金截止城市", needExport = true)
+	private String fundAddressReduce;
+	/**
+	 * 公积金截止时间
+	 */
+	@ExcelProperty(value ="公积金截止时间")
+	@ExcelAttribute(name = "公积金截止时间", needExport = true)
+	private String fundEndReduce;
+	/**
+	 * 离职日期
+	 */
+	@ExcelProperty(value ="离职日期")
+	@ExcelAttribute(name = "离职日期", needExport = true)
+	private LocalDateTime leaveDate;
+	/**
+	 * 离职原因
+	 */
+	@ExcelProperty(value ="离职原因")
+	@ExcelAttribute(name = "离职原因", needExport = true)
+	private String leaveReason;
+	/**
+	 * 合同类型
+	 */
+	@ExcelProperty(value ="合同类型")
+	@ExcelAttribute(name = "合同类型", needExport = true)
+	private String contractType;
+	/**
+	 * 所属单位名称
+	 */
+	@ExcelProperty(value ="所属单位名称")
+	@ExcelAttribute(name = "所属单位名称", needExport = true)
+	private String unitNameAdd;
+	/**
+	 * 所属结算主体名称
+	 */
+	@ExcelProperty(value ="所属结算主体名称")
+	@ExcelAttribute(name = "所属结算主体名称", needExport = true)
+	private String departNameAdd;
+	/**
+	 * 备案基数
+	 */
+	@ExcelProperty(value ="备案基数")
+	@ExcelAttribute(name = "备案基数", needExport = true)
+	private BigDecimal filingBaseAdd;
+	/**
+	 * 0:正常未派单1:异常未派单2:已派单
+	 */
+	@ExcelProperty(value ="派单状态")
+	@ExcelAttribute(name = "派单状态", needExport = true, readConverterExp = "0=正常未派单,1=异常未派单,2=已派单")
+	private String preStatus;
+	/**
+	 * 0:正常1:作废
+	 */
+	@ExcelProperty(value ="预派单状态")
+	@ExcelAttribute(name = "预派单状态", needExport = false)
+	private String status;
+	/**
+	 * 异常内容
+	 */
+	@ExcelProperty(value ="异常内容")
+	@ExcelAttribute(name = "异常内容", needExport = true)
+	private String exceptionContent;
+	/**
+	 * 派单日期限制  在15日前可派单 15日及15后次月派单
+	 */
+	@ExcelProperty(value ="派单日期限制")
+	@ExcelAttribute(name = "派单日期限制", needExport = true)
+	private String dayLimit;
+	/**
+	 * 资料是否提交：0 是 1  否
+	 */
+	@ExcelProperty(value ="资料是否提交")
+	@ExcelAttribute(name = "资料是否提交", needExport = true, readConverterExp = "0=是,1=否")
+	private String dataSubStatus;
+
+	/**
+	 * 派单合同名称：合同名称删除后直接清空合同相关派单信息，主要增对已有合同存在的派单情况
+	 */
+	@ExcelProperty(value ="派单合同名称")
+	@ExcelAttribute(name = "派单合同名称", maxLength = 50, needExport = true)
+	private String contractNameAdd;
+
+	/**
+	 * 创建时间
+	 */
+	@ExcelProperty(value ="创建时间")
+	@ExcelAttribute(name = "创建时间", needExport = true, isDate = true, dateFormatExport = LocalDateTimeUtils.DATE_TIME_PATTERN)
+	private LocalDateTime createTime;
+
+	/**
+	 * 备注
+	 */
+	@ExcelProperty(value ="备注")
+	@ExcelAttribute(name = "备注", needExport = true)
+	private String remark;
+
+	/**
+	 * 是否派单：0 是 2 否
+	 */
+	@ExcelProperty(value ="是否派单")
+	@ExcelAttribute(name = "是否派单", maxLength = 2, needExport = true, readConverterExp = "0=是,1=否")
+	private String dispatchFlag;
+
+	/**
+	 * 取消原因：不派单时填写
+	 */
+	@ExcelProperty(value ="取消原因")
+	@ExcelAttribute(name = "取消原因", maxLength = 255, needExport = true)
+	private String cancelRemark;
+
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/PreDispatchConstants.java

+package com.yifu.cloud.plus.v1.yifu.social.constants;
+
+public class PreDispatchConstants {
+
+    public static final String NO_PENSION_AREA_ADD = "获取缴纳地数据失败，请检查养老城市或公积金城市名称是否合规！";
+
+    public static final String NO_PENSION_AREA_REDUCE = "获取缴纳地数据失败，请检查养老截止城市或公积金截止城市名称是否合规！";
+
+    public static final String NO_PENSION_AREA=  "请检查派单缴纳地名称是否合规！";
+
+    public static final String SOCIAL_START_DATE_ERROR = "社保起缴月份在可补缴月份之前，请确认后操作！";
+
+    public static final String NO_SOCIAL_BASE_SET_INFO = "未找到有效的社保基数配置信息（户+缴纳地+起缴时间）！";
+
+    public static final String FUND_START_DATE_ERROR = "公积金起缴月份在可补缴月份之前，请确认后操作！";
+
+    public static final String NO_FUND_BASE_SET_INFO = "未找到有效的公积金基数配置信息（户+缴纳地+起缴时间）！";
+
+    public static final String[] ADD_HEAD_INFO = {"日期","接单分公司","缴费地","客户名称","员工姓名","身份证号",
+            "联系电话1","联系电话2","入职日期","正式工资","派遣开始日期","派遣结束日期","合同开始日期","合同终止日期",
+            "试用开始日期","试用结束日期","试用期工资","工作制","合同版本","是否电话通知","实际工作地","备注说明1",
+            "备注说明2","养老城市","养老基数","养老起缴月","医疗城市","医疗基数","医疗起缴月","工伤城市","工伤基数",
+            "工伤起缴月","生育城市","生育基数","生育起缴月","失业城市","失业基数","失业起缴月","公积金城市","公积金基数",
+            "公积金个人比例","公积金企业比例","公积金起缴月","派单分公司","派单客服","小合同名称","唯一号","客户编号","服务类别"};
+    public static final String[] REDUCE_HEAD_INFO = {"日期","接单分公司","缴费地","客户名称","员工姓名","身份证号",
+            "离职日期","离职原因","联系电话1","联系电话2","备注说明1","养老城市","养老截止时间","医疗城市","医疗截止时间",
+            "工伤城市","工伤截止时间","生育城市","生育截止时间","失业城市","失业截止时间","公积金城市","公积金截止时间",
+            "派单分公司","派单客服","小合同名称","合同类型"};
+
+    public static final String HAED_ERROR = "请使用标准模板！";
+    public static final String POSITION = "服务";
+    public static final String CONTRACT_NAME = "代理社保";
+    public static final String DISPATCH_TYPE_ERROR = "派单类型有误，0-派增 1-派减！";
+    public static final String EMPIDCARD_IS_EMPTY = "身份证不可变更！";
+    public static final String EXISTS_SAME_EMPIDCARD_ADD = "当月已存在对应身份证的预派单信息！";
+    public static final String PREDISPATCH_EXCEPTION = "派单异常";
+    public static final String DISPATCH_ADD_SUCCESS = "派单成功";
+    public static final String NO_SOCIAL_CAN_REDUCE = "无社保数据可派减，请查看社保派增是否办理成功！";
+    public static final String NO_FUND_CAN_REDUCE = "无公积金数据可派减，请查看公积金派增是否办理成功！";
+    public static final String PRESTATUS_ERROR = "‘是否派单’为是且‘预派单状态’为正常未派单才可派单！";
+    public static final String CITY = "city";
+    public static final String TOWN = "town";
+    public static final String SOCIAL_CITY = "social_city";
+    public static final String SOCIAL_TOWN = "social_town";
+    public static final String FUND_CITY = "fund_city";
+    public static final String FUND_TOWN = "fund_town";
+    public static final String YES_CH = "是";
+    public static final String NO_CH = "否";
+    public static final String DATA_CHECK = "数据校验信息：";
+    public static final String DATA_HANDLE_RESULT = "数据导入结果：";
+    public static final String DATA_IMPORT_ANALYSIS_ERROR = "数据导入解析失败！";
+    public static final String IMPORT_PREDISPATCH = "导出预派单";
+    public static final String NO_SOCIAL_FUND_ADDRESS_ADD = "派增：养老城市和公积金城市不可同时为空，请确认表中有‘养老城市’和‘公积金城市’数据列及数据！";
+    public static final String NO_SOCIAL_FUND_ADDRESS_REDUCE = "派减：养老城市和公积金城市不可同时为空，请确认表中有‘养老城市’和‘公积金城市’数据列及数据！";
+    public static final String TEL_NOT_EMPTY = "联系电话1不可为空！";
+    public static final String TEL_INVALID = "联系电话1无效！";
+	public static final String GET_AREA_INFO = "获取区域数据失败！";
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPaymentInfoController.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.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
+import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 缴费库
+ *
+ * @author huyc
+ * @date 2022-07-14 18:53:42
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/tpaymentinfo" )
+@Tag(name = "缴费库管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class TPaymentInfoController {
+
+    private final  TPaymentInfoService tPaymentInfoService;
+    
+    /**
+     * 简单分页查询
+     * @param page 分页对象
+     * @param tPaymentInfo 缴费库
+     * @return
+     */
+	@Operation(summary = "简单分页查询", description = "简单分页查询")
+    @GetMapping("/page")
+    public R<IPage<TPaymentInfo>> getTPaymentInfoPage(Page<TPaymentInfo> page, TPaymentInfo tPaymentInfo) {
+        return  new R<>(tPaymentInfoService.getTPaymentInfoPage(page,tPaymentInfo));
+    }
+    /**
+     * 不分页查询
+     * @param tPaymentInfo 缴费库
+     * @return
+     */
+    @Operation(summary = "不分页查询", description = "不分页查询")
+    @PostMapping("/noPage" )
+    public R<List<TPaymentInfo>> getTPaymentInfoNoPage(@RequestBody TPaymentInfo tPaymentInfo) {
+        return R.ok(tPaymentInfoService.list(Wrappers.query(tPaymentInfo)));
+    }
+
+    /**
+     * 通过id查询缴费库
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询", description = "通过id查询：hasPermission('social_tpaymentinfo_get')")
+    @GetMapping("/{id}" )
+    public R<TPaymentInfo> getById(@PathVariable("id" ) String id) {
+        return R.ok(tPaymentInfoService.getById(id));
+    }
+
+    /**
+     * 新增缴费库
+     * @param tPaymentInfo 缴费库
+     * @return R
+     */
+    @Operation(summary = "新增缴费库", description = "新增缴费库：hasPermission('social_tpaymentinfo_add')")
+    @SysLog("新增缴费库" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('social_tpaymentinfo_add')" )
+    public R<Boolean> save(@RequestBody TPaymentInfo tPaymentInfo) {
+        return R.ok(tPaymentInfoService.save(tPaymentInfo));
+    }
+
+    /**
+     * 修改缴费库
+     * @param tPaymentInfo 缴费库
+     * @return R
+     */
+    @Operation(summary = "修改缴费库", description = "修改缴费库：hasPermission('social_tpaymentinfo_edit')")
+    @SysLog("修改缴费库" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('social_tpaymentinfo_edit')" )
+    public R<Boolean> updateById(@RequestBody TPaymentInfo tPaymentInfo) {
+        return R.ok(tPaymentInfoService.updateById(tPaymentInfo));
+    }
+
+    /**
+     * 通过id删除缴费库
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id删除缴费库", description = "通过id删除缴费库：hasPermission('social_tpaymentinfo_del')")
+    @SysLog("通过id删除缴费库" )
+    @DeleteMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('social_tpaymentinfo_del')" )
+    public R<Boolean> removeById(@PathVariable String id) {
+        return R.ok(tPaymentInfoService.removeById(id));
+    }
+
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPreDispatchInfoController.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.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo;
+import com.yifu.cloud.plus.v1.yifu.social.service.TPreDispatchInfoService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 预派单记录
+ *
+ * @author huyc
+ * @date 2022-07-14 18:53:42
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/tpredispatchinfo" )
+@Tag(name = "预派单记录管理")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class TPreDispatchInfoController {
+
+    private final  TPreDispatchInfoService tPreDispatchInfoService;
+
+    /**
+     * 简单分页查询
+     * @param page 分页对象
+     * @param tPreDispatchInfo 预派单记录
+     * @return
+     */
+	@Operation(summary = "简单分页查询", description = "简单分页查询")
+    @GetMapping("/page")
+    public R<IPage<TPreDispatchInfo>> getTPreDispatchInfoPage(Page<TPreDispatchInfo> page, TPreDispatchInfo tPreDispatchInfo) {
+        return  new R<>(tPreDispatchInfoService.getTPreDispatchInfoPage(page,tPreDispatchInfo));
+    }
+    /**
+     * 不分页查询
+     * @param tPreDispatchInfo 预派单记录
+     * @return
+     */
+    @Operation(summary = "不分页查询", description = "不分页查询")
+    @PostMapping("/noPage" )
+    public R<List<TPreDispatchInfo>> getTPreDispatchInfoNoPage(@RequestBody TPreDispatchInfo tPreDispatchInfo) {
+        return R.ok(tPreDispatchInfoService.list(Wrappers.query(tPreDispatchInfo)));
+    }
+
+    /**
+     * 通过id查询预派单记录
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询", description = "通过id查询：hasPermission('social_tpredispatchinfo_get')")
+    @GetMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_get')" )
+    public R<TPreDispatchInfo> getById(@PathVariable("id" ) String id) {
+        return R.ok(tPreDispatchInfoService.getById(id));
+    }
+
+    /**
+     * 新增预派单记录
+     * @param tPreDispatchInfo 预派单记录
+     * @return R
+     */
+    @Operation(summary = "新增预派单记录", description = "新增预派单记录：hasPermission('social_tpredispatchinfo_add')")
+    @SysLog("新增预派单记录" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_add')" )
+    public R<Boolean> save(@RequestBody TPreDispatchInfo tPreDispatchInfo) {
+        return R.ok(tPreDispatchInfoService.save(tPreDispatchInfo));
+    }
+
+    /**
+     * 修改预派单记录
+     * @param tPreDispatchInfo 预派单记录
+     * @return R
+     */
+    @Operation(summary = "修改预派单记录", description = "修改预派单记录：hasPermission('social_tpredispatchinfo_edit')")
+    @SysLog("修改预派单记录" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_edit')" )
+    public R<Boolean> updateById(@RequestBody TPreDispatchInfo tPreDispatchInfo) {
+        return tPreDispatchInfoService.update(tPreDispatchInfo);
+    }
+
+    /**
+     * 通过id删除预派单记录
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id删除预派单记录", description = "通过id删除预派单记录：hasPermission('social_tpredispatchinfo_del')")
+    @SysLog("通过id删除预派单记录" )
+    @DeleteMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_del')" )
+    public R<Boolean> removeById(@PathVariable String id) {
+        return R.ok(tPreDispatchInfoService.removeById(id));
+    }
+
+	/**
+	 * 修改资料是否提交：0 是 1  否
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param ids
+	 * @param status 0 是 1 否
+	 * @return R
+	 */
+	@Operation(summary = "修改资料是否提交", description = "修改资料是否提交：status 0 是 1 否(social_tpredispatchinfo_edit)")
+	@SysLog("修改资料是否提交")
+	@PostMapping("/modifyDataSubmitStatus")
+	@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_edit')")
+	public R<Boolean> modifyDataSubmitStatus(@RequestParam(value = "ids",required = true)String ids,
+											 @RequestParam(value = "status",required = true)String status) {
+		return tPreDispatchInfoService.modifyDataSubmitStatus(ids,status);
+	}
+	/**
+	 * 清空预派单默认的派单合同信息
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param ids
+	 * @return R
+	 **/
+	@Operation(summary = "清空预派单默认的派单合同信息", description = "清空预派单默认的派单合同信息(social_tpredispatchinfo_edit)")
+	@SysLog("清空预派单默认的派单合同信息")
+	@PostMapping("/clearContractInfo")
+	@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_edit')")
+	public R<Boolean> clearContractInfo(@RequestParam(value = "ids",required = true)String ids) {
+		return tPreDispatchInfoService.clearContractInfo(ids);
+	}
+
+	/**
+	 * 更新预派单是否派单状态
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param id
+	 * @param dispatchFlag 0 派单  1  不派单
+	 * @param cancelRemark 不派单 时填写
+	 * @return R
+	 **/
+	@Operation(summary = "更新预派单是否派单状态", description = "更新预派单是否派单状态(social_tpredispatchinfo_edit)")
+	@SysLog("更新预派单是否派单状态")
+	@PostMapping("/updateDispatchFlag")
+	@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_edit')")
+	public R<Boolean> updateDispatchFlag(@RequestParam(value = "id",required = true)String id,
+										 @RequestParam(value = "dispatchFlag",required = true)String dispatchFlag,
+										 @RequestParam(value = "cancelRemark",required = false)String cancelRemark) {
+		return tPreDispatchInfoService.updateDispatchFlag(id,dispatchFlag,cancelRemark);
+	}
+
+	/**
+	 * 单个派单
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param id
+	 * @return R
+	 */
+	@Operation(summary = "单个派单:按创建人和ID", description = "单个派单:按创建人和ID")
+	@PostMapping("/dispatchById")
+	public R<Boolean> dispatchById(@RequestParam(value = "id",required = true)String id) {
+		return tPreDispatchInfoService.dispatchById(id);
+	}
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/SysBaseSetInfoMapper.java

@@ -24,6 +24,8 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 基数设置表
  *
@@ -39,4 +41,6 @@ public interface SysBaseSetInfoMapper extends BaseMapper<SysBaseSetInfo> {
 	 * @return
 	 */
 	IPage<SysBaseSetInfo> getSysBaseSetInfoPage(Page<SysBaseSetInfo> page, @Param("sysBaseSetInfo") SysBaseSetInfo sysBaseSetInfo);
+
+	List<SysBaseSetInfo> getAllByEntity(@Param("sysBaseSetInfo")SysBaseSetInfo sysBaseSetInfo);
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.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.mapper;
+
+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.social.entity.TPaymentInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 缴费库
+ *
+ * @author huyc
+ * @date 2022-07-14 18:53:42
+ */
+@Mapper
+public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
+    /**
+     * 缴费库简单分页查询
+     * @param tPaymentInfo 缴费库
+     * @return
+     */
+    IPage<TPaymentInfo> getTPaymentInfoPage(Page<TPaymentInfo> page, @Param("tPaymentInfo") TPaymentInfo tPaymentInfo);
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPreDispatchInfoMapper.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.mapper;
+
+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.social.entity.TPreDispatchInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 预派单记录
+ *
+ * @author huyc
+ * @date 2022-07-14 18:53:42
+ */
+@Mapper
+public interface TPreDispatchInfoMapper extends BaseMapper<TPreDispatchInfo> {
+    /**
+     * 预派单记录简单分页查询
+     * @param tPreDispatchInfo 预派单记录
+     * @return
+     */
+    IPage<TPreDispatchInfo> getTPreDispatchInfoPage(Page<TPreDispatchInfo> page, @Param("tPreDispatchInfo") TPreDispatchInfo tPreDispatchInfo);
+
+	void clearContractInfo(List<String> idList);
+
+	void modifyDataSubmitStatus(@Param("idList")List<String> idList, @Param("status")String status);
+
+	int updatePreDispatchInfoById(TPreDispatchInfo tPreDispatchInfo);
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPaymentInfoService.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.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
+
+/**
+ * 缴费库
+ *
+ * @author huyc
+ * @date 2022-07-14 18:53:42
+ */
+public interface TPaymentInfoService extends IService<TPaymentInfo> {
+    /**
+     * 缴费库简单分页查询
+     * @param tPaymentInfo 缴费库
+     * @return
+     */
+    IPage<TPaymentInfo> getTPaymentInfoPage(Page<TPaymentInfo> page, TPaymentInfo tPaymentInfo);
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPreDispatchInfoService.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.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo;
+
+/**
+ * 预派单记录
+ *
+ * @author huyc
+ * @date 2022-07-14 18:53:42
+ */
+public interface TPreDispatchInfoService extends IService<TPreDispatchInfo> {
+    /**
+     * 预派单记录简单分页查询
+     * @param tPreDispatchInfo 预派单记录
+     * @return
+     */
+    IPage<TPreDispatchInfo> getTPreDispatchInfoPage(Page<TPreDispatchInfo> page, TPreDispatchInfo tPreDispatchInfo);
+
+	/**
+	 * 修改资料是否提交状态  0 是 1 否
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param ids
+	 * @param status
+	 * @return
+	 **/
+	R<Boolean> modifyDataSubmitStatus(String ids, String status);
+
+	/**
+	 * 清空预派单默认的派单合同信息
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param ids
+	 * @return
+	 **/
+	R<Boolean> clearContractInfo(String ids);
+
+	/**
+	 * 更新预派单是否派单状态
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param id
+	 * @param dispatchFlag
+	 * @param cancelRemark
+	 * @return
+	 **/
+	R<Boolean> updateDispatchFlag(String id, String dispatchFlag, String cancelRemark);
+
+	/**
+	 * 单个派单
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param id
+	 * @return
+	 **/
+	R<Boolean> dispatchById(String id);
+
+	/**
+	 * 修改预派单记录
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @return
+	 **/
+	R update(TPreDispatchInfo tPreDispatchInfo);
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.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.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TPaymentInfoMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 缴费库
+ *
+ * @author huyc
+ * @date 2022-07-14 18:53:42
+ */
+@Service
+public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPaymentInfo> implements TPaymentInfoService {
+    /**
+     * 缴费库简单分页查询
+     * @param tPaymentInfo 缴费库
+     * @return
+     */
+    @Override
+    public IPage<TPaymentInfo> getTPaymentInfoPage(Page<TPaymentInfo> page, TPaymentInfo tPaymentInfo){
+        return baseMapper.getTPaymentInfoPage(page,tPaymentInfo);
+    }
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.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.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.*;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
+import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
+import com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants;
+import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.SysBaseSetInfoMapper;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TPreDispatchInfoMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TPreDispatchInfoService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 预派单记录
+ *
+ * @author huyc
+ * @date 2022-07-14 18:53:42
+ */
+@Service
+@RequiredArgsConstructor
+public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMapper, TPreDispatchInfo> implements TPreDispatchInfoService {
+
+	@Autowired
+	private SysBaseSetInfoMapper sysBaseSetInfoMapper;
+
+	/**
+	 * 预派单记录简单分页查询
+	 *
+	 * @param tPreDispatchInfo 预派单记录
+	 * @return
+	 */
+	@Override
+	public IPage<TPreDispatchInfo> getTPreDispatchInfoPage(Page<TPreDispatchInfo> page, TPreDispatchInfo tPreDispatchInfo) {
+		return baseMapper.getTPreDispatchInfoPage(page, tPreDispatchInfo);
+	}
+
+	/**
+	 * 修改资料是否提交状态  0 是 1 否
+	 *
+	 * @param ids
+	 * @param status
+	 * @return
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 **/
+	@Override
+	public R<Boolean> modifyDataSubmitStatus(String ids, String status) {
+		//  验证传参
+		if (Common.isEmpty(ids) ||
+				Common.isEmpty(status) ||
+				(!CommonConstants.ZERO_STRING.equals(status) && !CommonConstants.ONE_STRING.equals(status))) {
+			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
+		}
+		List<String> idList = Common.initStrToList(ids, CommonConstants.COMMA_STRING);
+		if (null == idList || idList.isEmpty()) {
+			return R.ok(null, CommonConstants.DATA_CAN_NOT_EMPTY);
+		}
+		baseMapper.modifyDataSubmitStatus(idList, status);
+		return R.ok();
+	}
+
+	/**
+	 * 清空预派单默认的派单合同信息
+	 *
+	 * @param ids
+	 * @return
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 **/
+	@Override
+	public R<Boolean> clearContractInfo(String ids) {
+		if (Common.isEmpty(ids)) {
+			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
+		}
+		List<String> idList = Common.initStrToList(ids, CommonConstants.COMMA_STRING);
+		if (null == idList || idList.isEmpty()) {
+			return R.ok(null, CommonConstants.DATA_CAN_NOT_EMPTY);
+		}
+		baseMapper.clearContractInfo(idList);
+		return R.ok();
+	}
+
+	/**
+	 * 获取社保和公积金基数
+	 *
+	 * @param baseSocialTimeMap
+	 * @param baseFundTimeMap
+	 * @param baseSocialSetMap
+	 * @param baseFundSetMap
+	 * @return
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 **/
+	private void initBaseSetMap(Map<String, TPreDispatchInfo> baseSocialTimeMap,
+								Map<String, TPreDispatchInfo> baseFundTimeMap,
+								Map<String, SysBaseSetInfo> baseSocialSetMap,
+								Map<String, SysBaseSetInfo> baseFundSetMap) {
+		/************************获取社保公积金基数开始************************/
+		SysBaseSetInfo baseSetInfo = new SysBaseSetInfo();
+		// 处理社保基数
+		handleSocialBase(baseSocialTimeMap, baseSocialSetMap, baseSetInfo);
+		// 处理公积金基数
+		handleFundBase(baseFundTimeMap, baseFundSetMap, baseSetInfo);
+		/************************获取社保公积金基数结束************************/
+	}
+
+	/**
+	 * 获取社保基数
+	 *
+	 * @param baseFundTimeMap
+	 * @param baseFundSetMap
+	 * @param baseSetInfo
+	 * @return
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 **/
+	private void handleFundBase(Map<String, TPreDispatchInfo> baseFundTimeMap, Map<String, SysBaseSetInfo> baseFundSetMap, SysBaseSetInfo baseSetInfo) {
+		LocalDateTime dateTime;
+		List<SysBaseSetInfo> baseSetInfoList;
+		if (Common.isNotNull(baseFundTimeMap)) {
+			HashMap<String, SysBaseSetInfo> baseFundSetMapT = null;
+			baseSetInfo.setBaseType(CommonConstants.ONE_STRING);
+			for (TPreDispatchInfo vo : baseFundTimeMap.values()) {
+				baseFundSetMapT = null;
+				if (null != vo.getFundStart()) {
+					dateTime = LocalDateTimeUtils.dateOfYearAndMonth(vo.getFundStart(), LocalDateTimeUtils.DATE_SHORT_PATTERN);
+					baseSetInfo.setApplyStartDate(LocalDateTimeUtils.convertLDTToDate(dateTime));
+					baseSetInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
+					baseSetInfo.setStatus(CommonConstants.ZERO_INT);
+					baseSetInfoList = sysBaseSetInfoMapper.getAllByEntity(baseSetInfo);
+					if (Common.isNotNull(baseSetInfoList)) {
+						baseFundSetMapT = Common.listToHashMapByKey(baseSetInfoList,
+								LocalDateTimeUtils.formatTime(dateTime, ValidityConstants.DATEFORMAT3_PATTERN),
+								ExcelAttributeConstants.DEPARTID_PROVINCE_CITY_TOWN);
+					}
+				}
+				if (Common.isNotNull(baseFundSetMapT)) {
+					baseFundSetMap.putAll(baseFundSetMapT);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 获取公积金基数
+	 *
+	 * @param baseSocialTimeMap
+	 * @param baseSocialSetMap
+	 * @param baseSetInfo
+	 * @return
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 **/
+	private void handleSocialBase(Map<String, TPreDispatchInfo> baseSocialTimeMap, Map<String, SysBaseSetInfo> baseSocialSetMap, SysBaseSetInfo baseSetInfo) {
+		LocalDateTime dateTime;
+		List<SysBaseSetInfo> baseSetInfoList;
+		if (Common.isNotNull(baseSocialTimeMap)) {
+			HashMap<String, SysBaseSetInfo> baseSocialSetMapT = null;
+			baseSetInfo.setBaseType(CommonConstants.ZERO_STRING);
+			for (TPreDispatchInfo vo : baseSocialTimeMap.values()) {
+				baseSocialSetMapT = null;
+				if (null != vo.getPensionStart()) {
+					dateTime = LocalDateTimeUtils.dateOfYearAndMonth(vo.getPensionStart(), LocalDateTimeUtils.DATE_SHORT_PATTERN);
+					baseSetInfo.setApplyStartDate(LocalDateTimeUtils.convertLDTToDate(dateTime));
+					baseSetInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
+					baseSetInfo.setStatus(CommonConstants.ZERO_INT);
+					baseSetInfoList = sysBaseSetInfoMapper.getAllByEntity(baseSetInfo);
+					if (Common.isNotNull(baseSetInfoList) && null != dateTime) {
+						baseSocialSetMapT = Common.listToHashMapByKey(baseSetInfoList,
+								LocalDateTimeUtils.formatTime(dateTime, ValidityConstants.DATEFORMAT3_PATTERN),
+								ExcelAttributeConstants.DEPARTID_PROVINCE_CITY_TOWN);
+					}
+				}
+				if (Common.isNotNull(baseSocialSetMapT)) {
+					baseSocialSetMap.putAll(baseSocialSetMapT);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 查看公积金起缴时间是否符合政策
+	 *
+	 * @param newEntity
+	 * @return
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 **/
+	private String checkFundStartDate(TPreDispatchInfo newEntity, SysBaseSetInfo baseSetInfo) {
+		if (null == baseSetInfo) {
+			return PreDispatchConstants.NO_FUND_BASE_SET_INFO;
+		}
+		// 查看是否符合公积金补缴政策
+		if (checkDispatchDate(
+				LocalDateTimeUtils.dateOfYearAndMonth(newEntity.getFundStart(), DateUtil.ISO_DATE_FORMAT),
+				baseSetInfo.getCanOverpay(), baseSetInfo.getOverpayNumber(), baseSetInfo.getHaveThisMonth())) {
+			return PreDispatchConstants.FUND_START_DATE_ERROR;
+		}
+		return null;
+	}
+
+	/**
+	 * 查看公积金起缴时间是否符合政策
+	 *
+	 * @param newEntity
+	 * @param oldEntity
+	 * @return
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 **/
+	private R<Boolean> checkFundStartDate(TPreDispatchInfo newEntity, TPreDispatchInfo oldEntity) {
+		// 公积金确实要派增且时间有变动要判断是否符合派单政策
+		if (Common.isNotNull(newEntity.getFundAddress()) &&
+				Common.isNotNull(newEntity.getFundStart()) &&
+				!newEntity.getFundStart().equals(oldEntity.getFundStart())) {
+			SysBaseSetInfo baseSetFund = null;
+			if (null != newEntity.getFundProvince()) {
+				baseSetFund = getSysBaseSetInfo(newEntity.getFundProvince(), newEntity.getFundCity(),
+						newEntity.getFundTown(), oldEntity.getFundHouseAdd(), CommonConstants.ONE_STRING);
+			} else {
+				baseSetFund = getSysBaseSetInfo(oldEntity.getFundProvince(), oldEntity.getFundCity(),
+						oldEntity.getFundTown(), oldEntity.getFundHouseAdd(), CommonConstants.ONE_STRING);
+			}
+			if (null == baseSetFund) {
+				return R.failed(PreDispatchConstants.NO_FUND_BASE_SET_INFO);
+			}
+			// 查看是否符合公积金补缴政策
+			if (checkDispatchDate(
+					LocalDateTimeUtils.dateOfYearAndMonth(newEntity.getFundStart(), DateUtil.ISO_DATE_FORMAT),
+					baseSetFund.getCanOverpay(), baseSetFund.getOverpayNumber(), baseSetFund.getHaveThisMonth())) {
+				return R.failed(PreDispatchConstants.FUND_START_DATE_ERROR);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 更新预派单是否派单状态
+	 *
+	 * @param id
+	 * @param dispatchFlag
+	 * @param cancelRemark
+	 * @return
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 **/
+	@Override
+	public R<Boolean> updateDispatchFlag(String id, String dispatchFlag, String cancelRemark) {
+		TPreDispatchInfo dispatchInfo = baseMapper.selectById(id);
+		if (null == dispatchFlag) {
+			return R.failed("无此实体！");
+		}
+		if (!CommonConstants.ZERO_STRING.equals(dispatchFlag) && !CommonConstants.ONE_STRING.equals(dispatchFlag)) {
+			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
+		}
+		dispatchInfo.setDispatchFlag(dispatchFlag);
+		dispatchInfo.setCancelRemark(cancelRemark);
+		baseMapper.updateById(dispatchInfo);
+		return R.ok();
+	}
+
+	@Override
+	public R<Boolean> dispatchById(String id) {
+		YifuUser user = SecurityUtils.getUser();
+		if (null == user || null == user.getId()) {
+			return R.failed(CommonConstants.USER_FAIL);
+		}
+		if (Common.isEmpty(id)) {
+			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
+		}
+//		R<List<TSettleDomainSelectVo>> settleDomainR = null;
+		//结算主体名称map key:结算主体id value:结算主体名称
+		Map<String, String> settleDomainNameMap = new HashMap<>();
+		//客户名称map key:客户id value:客户名称
+		Map<String, String> customerNameMap = new HashMap<>();
+		//结算主体客户关系map key:结算主体id value:客户id
+		Map<String, String> settleIdAndCustomerIdMap = new HashMap<>();
+//		settleDomainR = remoteTSettleDomainService.selectAllSettleDomainSelectVos(SecurityConstants.FROM_IN);
+		//map数据封装
+//		initSettleDomainMaps(settleDomainR, settleDomainNameMap, customerNameMap, settleIdAndCustomerIdMap);
+		return R.ok();
+	}
+
+	@Override
+	public R update(TPreDispatchInfo tPreDispatchInfo) {
+		YifuUser user = SecurityUtils.getUser();
+		if (null == user || null == user.getId()) {
+			return R.failed(CommonConstants.USER_FAIL);
+		}
+		ExcelAttributeValidityUtil<TPreDispatchInfo> validity = new ExcelAttributeValidityUtil<>(TPreDispatchInfo.class);
+		validity.ValidityObj(tPreDispatchInfo);
+		if (null != validity.getErrorInfo() && !validity.getErrorInfo().isEmpty()) {
+			return R.failed(validity.getErrorInfo(), ResultConstants.VALIDITY_FAIL);
+		}
+		HashMap<String, SysArea> areaHashMap = new HashMap<>(CommonConstants.SIXTEEN_INT);
+		HashMap<String, SysArea> areaIdMap = new HashMap<>(CommonConstants.SIXTEEN_INT);
+		TPreDispatchInfo preDispatchTemp = baseMapper.selectById(tPreDispatchInfo.getId());
+		tPreDispatchInfo.setType(preDispatchTemp.getType());
+
+		// 初步校验  如果合同时间变更 同步更新 派单的时间
+		R<Boolean> errorMessage1 = checkUpdate(tPreDispatchInfo, areaHashMap, areaIdMap, preDispatchTemp);
+		if (errorMessage1 != null) {
+			return errorMessage1;
+		}
+		// 社保缴纳地变更 同步更新 社保的省市县数据
+		R<Boolean> areaErrorMessage = handleSocialArea(areaHashMap, areaIdMap, tPreDispatchInfo, preDispatchTemp);
+		if (null != areaErrorMessage) {
+			return areaErrorMessage;
+		}
+		// 公积金缴纳地变更 同步更新 公积金的省市县数据
+		areaErrorMessage = handleFundArea(areaHashMap, areaIdMap, tPreDispatchInfo, preDispatchTemp);
+		if (null != areaErrorMessage) {
+			return areaErrorMessage;
+		}
+		// 派增要派单时间  派减不需要
+		if (CommonConstants.ZERO_STRING.equals(tPreDispatchInfo.getType())) {
+			// 社保起缴日期变更 验证是否可派增
+			R<Boolean> x = checkSocialStartDate(tPreDispatchInfo, preDispatchTemp);
+			if (x != null) {
+				return x;
+			}
+			// 公积金起缴日期变更 验证是否可派增
+			x = checkFundStartDate(tPreDispatchInfo, preDispatchTemp);
+			if (x != null) {
+				return x;
+			}
+			// 手机号码必填及格式校验
+			if (Common.isEmpty(tPreDispatchInfo.getTelOne())) {
+				return R.failed(PreDispatchConstants.TEL_NOT_EMPTY);
+			}
+			//TODO
+//			if (ValidityUtil.checkInvalidEmpPhone(tPreDispatchInfo.getTelOne())){
+//				return R.failed(PreDispatchConstants.TEL_INVALID);
+//			}
+		}
+		if (CommonConstants.ONE_STRING.equals(tPreDispatchInfo.getType())) {
+			initLeaveReason(tPreDispatchInfo);
+			tPreDispatchInfo.setPensionAddress(tPreDispatchInfo.getPensionAddressReduce());
+			tPreDispatchInfo.setFundAddress(tPreDispatchInfo.getFundAddressReduce());
+		}
+		// 合同开始截止时间 同步更新派单的合同时间
+		tPreDispatchInfo.setContractEndAdd(tPreDispatchInfo.getContractEnd());
+		tPreDispatchInfo.setContractStartAdd(tPreDispatchInfo.getContractStart());
+		// 没问题重置异常状态，有问题 在前面就返回了
+		tPreDispatchInfo.setExceptionContent(CommonConstants.EMPTY_STRING);
+		tPreDispatchInfo.setPreStatus(CommonConstants.ZERO_STRING);
+		baseMapper.updatePreDispatchInfoById(tPreDispatchInfo);
+		return R.ok();
+	}
+
+	private static boolean isaBoolean(LocalDateTime temp, LocalDateTime now) {
+		return temp.getYear() == now.getYear() && temp.getMonthValue() < now.getMonthValue();
+	}
+
+	/**
+	 * 预派单更新前校验
+	 * @param tPreDispatchInfo
+	 * @param areaHashMap
+	 * @param areaIdMap
+	 * @param preDispatchTemp
+	 * @return
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 **/
+	private R<Boolean> checkUpdate(TPreDispatchInfo tPreDispatchInfo, Map<String, SysArea> areaHashMap,
+								   Map<String, SysArea> areaIdMap, TPreDispatchInfo preDispatchTemp) {
+		if (null == tPreDispatchInfo || Common.isEmpty(tPreDispatchInfo.getId())) {
+			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
+		}
+		if (null == preDispatchTemp) {
+			return R.failed(CommonConstants.ERROR_NO_DOMAIN);
+		}
+		// 先验证必填项
+		String errorMessage = checkField(tPreDispatchInfo);
+		if (null != errorMessage) {
+			return R.failed(errorMessage);
+		}
+		R<List<SysArea>> areaListR = UpmsDaprUtils.getAreaListR();
+		if (null == areaListR || areaListR.getCode() != CommonConstants.SUCCESS) {
+			return R.failed(PreDispatchConstants.GET_AREA_INFO);
+		}
+		initAreaMap(areaHashMap, areaIdMap, areaListR);
+		return null;
+	}
+
+	private void initAreaMap(Map<String, SysArea> areaHashMap, Map<String, SysArea> areaIdMap, R<List<SysArea>> areaListR) {
+		List<SysArea> areaList = areaListR.getData();
+		if (null != areaList && !areaList.isEmpty()) {
+			for (SysArea area : areaList) {
+				areaHashMap.put(area.getAreaName(), area);
+				areaIdMap.put(Integer.toString(area.getId()), area);
+			}
+		}
+	}
+
+	/**
+	 * 校验修改派增派减
+	 *
+	 * @param tPreDispatchInfo
+	 * @return
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 **/
+	private String checkField(TPreDispatchInfo tPreDispatchInfo) {
+		// 姓名  身份证  缴费地 必填验证
+		String x2 = updateOrSaveBaseCheck(tPreDispatchInfo);
+		if (x2 != null) {
+			return x2;
+		}
+		// 派增验证
+		String x = checkAddPreDispatch(tPreDispatchInfo);
+		if (x != null) {
+			return x;
+		}
+		// 派减验证
+		String x1 = checkReducePreDispatch(tPreDispatchInfo);
+		if (x1 != null) {
+			return x1;
+		}
+		return null;
+	}
+
+	private String updateOrSaveBaseCheck(TPreDispatchInfo tPreDispatchInfo) {
+		if (Common.isEmpty(tPreDispatchInfo.getEmpName())) {
+			return "员工姓名不可为空！";
+		}
+		if (Common.isEmpty(tPreDispatchInfo.getEmpIdcard())) {
+			return "身份证号不可为空！";
+		}
+		if (Common.isEmpty(tPreDispatchInfo.getPayAddress())) {
+			return "缴费地不可为空！";
+		}
+		// 派增或派减的缴纳地不可同时为空
+		if (Common.isEmpty(tPreDispatchInfo.getPensionAddress())
+				&& Common.isEmpty(tPreDispatchInfo.getFundAddress())
+				&& CommonConstants.ZERO_STRING.equals(tPreDispatchInfo.getType())) {
+			return "派增的社保缴纳地与公积金缴纳地不可同时为空！";
+		}
+		if (Common.isEmpty(tPreDispatchInfo.getPensionAddressReduce())
+				&& Common.isEmpty(tPreDispatchInfo.getFundAddressReduce())
+				&& CommonConstants.ONE_STRING.equals(tPreDispatchInfo.getType())) {
+			return "派减的社保缴纳地与公积金缴纳地不可同时为空！";
+		}
+		return null;
+	}
+
+	private String checkAddPreDispatch(TPreDispatchInfo tPreDispatchInfo) {
+		if (CommonConstants.ZERO_STRING.equals(tPreDispatchInfo.getType())) {
+			// 拍增的合同开始和结束时间必填 2021-08-13
+			if (Common.isEmpty(tPreDispatchInfo.getContractStart()) || Common.isEmpty(tPreDispatchInfo.getContractEnd())) {
+				return "派增的合同开始日期和合同终止日期不可为空！";
+			}
+			if (Common.isEmpty(tPreDispatchInfo.getTelOne())) {
+				return PreDispatchConstants.TEL_NOT_EMPTY;
+			}
+			//TODO
+//			if (ValidityUtil.checkInvalidEmpPhone(tPreDispatchInfo.getTelOne())){
+//				return PreDispatchConstants.TEL_INVALID;
+//			}
+			if (Common.isEmpty(tPreDispatchInfo.getPensionAddress()) &&
+					Common.isEmpty(tPreDispatchInfo.getFundAddress())) {
+				return PreDispatchConstants.NO_SOCIAL_FUND_ADDRESS_ADD;
+			}
+			// 派单按养老的基数缴纳地和起缴月来 其他险种只保存数据 不做数据校验
+			if (Common.isNotNull(tPreDispatchInfo.getPensionAddress())) {
+				if (Common.isEmpty(tPreDispatchInfo.getPensionStart())) {
+					return "养老起缴月不可为空！";
+				}
+				if (Common.isNullOrZero(tPreDispatchInfo.getPensionBase())) {
+					return "养老基数不可为空！";
+				}
+			}
+			String x = checkFundForMod(tPreDispatchInfo);
+			if (x != null) {
+				return x;
+			}
+		}
+		return null;
+	}
+
+	private String checkReducePreDispatch(TPreDispatchInfo tPreDispatchInfo) {
+		if (CommonConstants.ONE_STRING.equals(tPreDispatchInfo.getType())) {
+			if (Common.isEmpty(tPreDispatchInfo.getPensionAddressReduce()) &&
+					Common.isEmpty(tPreDispatchInfo.getFundAddressReduce())) {
+				return PreDispatchConstants.NO_SOCIAL_FUND_ADDRESS_REDUCE;
+			}
+			// 派单按养老的基数缴纳地和起缴月来 其他险种只保存数据 不做数据校验
+			if (Common.isNotNull(tPreDispatchInfo.getPensionAddressReduce()) &&
+					Common.isEmpty(tPreDispatchInfo.getPensionEndReduce())) {
+				return "派减养老时间不可为空！";
+			}
+			if (Common.isNotNull(tPreDispatchInfo.getFundAddressReduce()) &&
+					Common.isEmpty(tPreDispatchInfo.getFundEndReduce())) {
+				return "派减公积金时间不可为空！";
+			}
+			if (Common.isNotNull(tPreDispatchInfo.getLeaveReason()) &&
+					Common.isEmpty(tPreDispatchInfo.getLeaveReason())) {
+				return "离职原因不可为空！";
+			}
+		}
+		return null;
+	}
+
+	private String checkFundForMod(TPreDispatchInfo tPreDispatchInfo) {
+		if (Common.isNotNull(tPreDispatchInfo.getFundAddress())) {
+			if (Common.isEmpty(tPreDispatchInfo.getFundStart())) {
+				return "公积金起缴月不可为空！";
+			}
+			if (Common.isNullOrZero(tPreDispatchInfo.getFundBase())) {
+				return "公积金基数不可为空！";
+			}
+			if (Common.isNullOrZero(tPreDispatchInfo.getFundCompanyPer())) {
+				return "公积金单位比例不可为空！";
+			}
+			if (Common.isNullOrZero(tPreDispatchInfo.getFundPersonalPer())) {
+				return "公积个人比例不可为空！";
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 查看社保起缴日期是否符合补缴政策
+	 *
+	 * @param newEntity
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @return
+	 **/
+	private String checkSocialStartDate(TPreDispatchInfo newEntity, SysBaseSetInfo baseSetInfo) {
+		// 社保确实要派增且时间有变动要判断是否符合派单政策
+		if (null == baseSetInfo) {
+			return PreDispatchConstants.NO_SOCIAL_BASE_SET_INFO;
+		}
+		// 查看是否符合社保补缴政策
+		if (checkDispatchDate(
+				LocalDateTimeUtils.dateOfYearAndMonth(newEntity.getPensionStart(), DateUtil.ISO_DATE_FORMAT),
+				baseSetInfo.getCanOverpay(), baseSetInfo.getOverpayNumber(), baseSetInfo.getHaveThisMonth())) {
+			return PreDispatchConstants.SOCIAL_START_DATE_ERROR;
+		}
+		return null;
+	}
+
+	/**
+	 * 查看社保起缴日期是否符合补缴政策
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param newEntity
+	 * @return
+	 **/
+	private R<Boolean> checkSocialStartDate(TPreDispatchInfo newEntity, TPreDispatchInfo oldEntity) {
+		// 社保确实要派增且时间有变动要判断是否符合派单政策
+		if (Common.isNotNull(newEntity.getPensionAddress()) &&
+				Common.isNotNull(newEntity.getPensionStart()) &&
+				!newEntity.getPensionStart().equals(oldEntity.getPensionStart())){
+			SysBaseSetInfo baseSetSocial = null;
+			if (null != newEntity.getSocialProvince()){
+				baseSetSocial = getSysBaseSetInfo(newEntity.getSocialProvince(),newEntity.getSocialCity(),
+						newEntity.getSocialTown(), oldEntity.getSocialHouseAdd(),CommonConstants.ZERO_STRING);
+			}else {
+				baseSetSocial = getSysBaseSetInfo(oldEntity.getSocialProvince(),oldEntity.getSocialCity(),
+						oldEntity.getSocialTown(), oldEntity.getSocialHouseAdd(),CommonConstants.ZERO_STRING);
+			}
+			if (null == baseSetSocial){
+				return R.failed(PreDispatchConstants.NO_SOCIAL_BASE_SET_INFO);
+			}
+			// 查看是否符合社保补缴政策
+			if (checkDispatchDate(
+					LocalDateTimeUtils.dateOfYearAndMonth(newEntity.getPensionStart(), DateUtil.ISO_DATE_FORMAT),
+					baseSetSocial.getCanOverpay(),baseSetSocial.getOverpayNumber(),baseSetSocial.getHaveThisMonth())){
+				return R.failed(PreDispatchConstants.SOCIAL_START_DATE_ERROR);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 查看社保公积金起缴日期是否符合补缴逻辑
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param socialStartDate 起缴日期
+	 * @param canOverpay      是否可补缴 0：是，1：否
+	 * @param overpayNumber   补缴期限 整数
+	 * @param haveThisMonth   是否含当月 0：是，1：否   如果无符合条件默认不含当月
+	 * @return 符合 false  不符合 true
+	 **/
+	public static boolean checkDispatchDate(LocalDateTime socialStartDate, String canOverpay, Integer overpayNumber, String haveThisMonth) {
+		if (null == socialStartDate) {
+			return false;
+		}
+		LocalDateTime temp = null;
+		LocalDateTime now = LocalDateTime.now();
+		if (CommonConstants.ZERO_STRING.equals(canOverpay)) {
+			temp = socialStartDate.plusMonths(CommonConstants.ZERO_STRING.equals(haveThisMonth) ? (long) overpayNumber : (long) (overpayNumber + 1));
+		} else if (CommonConstants.ONE_STRING.equals(canOverpay)) {
+			temp = socialStartDate;
+		}
+		return (null != temp && (temp.getYear() < now.getYear() || isaBoolean(temp, now)));
+	}
+
+	/**
+	 * 0 个人辞职 = 合同主动解除  1单位辞退 = 合同被动解除  15  死亡 = 死亡  19 其他
+	 * @param tPreDispatchInfo
+	 * @Author fxj
+	 * @Date 2021-01-07
+	 * @return
+	 **/
+	private void initLeaveReason(TPreDispatchInfo tPreDispatchInfo) {
+		if ("合同主动解除".equals(tPreDispatchInfo.getLeaveReason())) {
+			tPreDispatchInfo.setLeaveReasonAdd(CommonConstants.ZERO_STRING);
+		} else if ("合同被动解除".equals(tPreDispatchInfo.getLeaveReason())) {
+			tPreDispatchInfo.setLeaveReasonAdd(CommonConstants.ONE_STRING);
+		} else if ("死亡".equals(tPreDispatchInfo.getLeaveReason())) {
+			tPreDispatchInfo.setLeaveReasonAdd(CommonConstants.FIFTEEN);
+		} else {
+			tPreDispatchInfo.setLeaveReasonAdd(CommonConstants.NINETEEN);
+		}
+	}
+
+	private SysBaseSetInfo getSysBaseSetInfo(String province,String city,String town,String houseId,String type) {
+		SysBaseSetInfo queryEntity = new SysBaseSetInfo();
+		queryEntity.setBaseType(type);
+		queryEntity.setStatus(CommonConstants.ZERO_INT);
+		queryEntity.setDepartId(houseId);
+		if (Common.isNotNull(province)){
+			queryEntity.setProvince(Integer.valueOf(province));
+		}
+		if (Common.isNotNull(city)){
+			queryEntity.setCity(Integer.valueOf(city));
+		}
+		if (Common.isNotNull(town)){
+			queryEntity.setTown(Integer.valueOf(town));
+		}
+		queryEntity.setDeleteFlag(CommonConstants.ZERO_STRING);
+		QueryWrapper<SysBaseSetInfo> queryWrapper =  new QueryWrapper<>();
+		queryWrapper.setEntity(queryEntity);
+		if (Common.isEmpty(city)){
+			queryWrapper.isNull(PreDispatchConstants.CITY);
+		}
+		if (Common.isEmpty(town)){
+			queryWrapper.isNull(PreDispatchConstants.TOWN);
+		}
+		queryWrapper.last(CommonConstants.LAST_ONE_SQL);
+		return sysBaseSetInfoMapper.selectOne(queryWrapper);
+	}
+
+	/**
+	 * 重新获取公积金缴纳地数据
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param areaMap
+	 * @param areaIdMap
+	 * @param newEntity
+	 * @param oldEntity
+	 * @return
+	 **/
+	private R<Boolean> handleFundArea(Map<String, SysArea> areaMap,
+									  Map<String, SysArea> areaIdMap, TPreDispatchInfo newEntity, TPreDispatchInfo oldEntity) {
+		// 为空由更新语句清空缴纳地  不为空且有变化的要重新获取数据
+		if (Common.isNotNull(newEntity.getFundAddress()) &&
+				(!newEntity.getFundAddress().equals(oldEntity.getFundAddress())
+						|| null == oldEntity.getFundProvince())){
+			return initFundArea(areaMap, areaIdMap, newEntity,newEntity.getFundAddress());
+		}
+		if (Common.isNotNull(newEntity.getFundAddressReduce()) &&
+				(!newEntity.getFundAddressReduce().equals(oldEntity.getFundAddressReduce())
+						|| null == oldEntity.getFundProvince())){
+			return initFundArea(areaMap, areaIdMap, newEntity,newEntity.getFundAddressReduce());
+		}
+		return null;
+	}
+
+	private R<Boolean> initFundArea(Map<String, SysArea> areaMap,
+									Map<String, SysArea> areaIdMap, TPreDispatchInfo entity,String address) {
+		SysArea area = areaMap.get(address);
+		SysArea areaTemp;
+		if (null != area) {
+			// 处理省数据
+			if (null == area.getParentId() || CommonConstants.ZERO_INT == area.getParentId().intValue()) {
+				entity.setFundProvince(area.getId().toString());
+				entity.setFundCity(null);
+				entity.setFundTown(null);
+				return null;
+			}
+			areaTemp = areaIdMap.get(Integer.toString(area.getParentId()));
+			// 处理市县数据
+			if (handleFundAreaSub(entity, area, areaTemp)) {
+				return R.failed(getAreaErrorInfo(entity.getType()));
+			}
+
+		} else {
+			return R.failed(getAreaErrorInfo(entity.getType()));
+		}
+		return null;
+	}
+
+	/**
+	 * 获取公积金市县 数据
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param newEntity
+	 * @param area
+	 * @param areaTemp
+	 * @return
+	 **/
+	private boolean handleFundAreaSub(TPreDispatchInfo newEntity, SysArea area, SysArea areaTemp) {
+		if (null != areaTemp){
+			if (null == areaTemp.getParentId() || CommonConstants.ZERO_INT == areaTemp.getParentId().intValue()){
+				newEntity.setFundProvince(areaTemp.getId().toString());
+				newEntity.setFundCity(area.getId().toString());
+				newEntity.setFundTown(null);
+			}else {
+				newEntity.setFundProvince(areaTemp.getParentId().toString());
+				newEntity.setFundCity(areaTemp.getId().toString());
+				newEntity.setFundTown(area.getId().toString());
+			}
+		}else {
+			return true;
+		}
+		return false;
+	}
+
+	private String getAreaErrorInfo(String type){
+		if (CommonConstants.ZERO_STRING.equals(type)){
+			return PreDispatchConstants.NO_PENSION_AREA_ADD;
+		}
+		if (CommonConstants.ONE_STRING.equals(type)){
+			return PreDispatchConstants.NO_PENSION_AREA_REDUCE;
+		}
+		return CommonConstants.EMPTY_STRING;
+	}
+
+	/**
+	 * 重新获取社保缴纳地
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param areaMap
+	 * @param newEntity
+	 * @param oldEntity
+	 * @return
+	 **/
+	private R<Boolean> handleSocialArea(Map<String, SysArea> areaMap, Map<String,SysArea> areaIdMap,
+										TPreDispatchInfo newEntity, TPreDispatchInfo oldEntity) {
+		// 为空由更新语句清空缴纳地  不为空且有变化的要重新获取数据 不为空且不相等 更新缴纳地
+		if (Common.isNotNull(newEntity.getPensionAddress()) &&
+				(!newEntity.getPensionAddress().equals(oldEntity.getPensionAddress())
+						|| null == oldEntity.getSocialProvince())){
+			return initSocialArea(areaMap, areaIdMap, newEntity,newEntity.getPensionAddress());
+		}
+		//  处理派减 不为空且不相等 更新缴纳地
+		if (Common.isNotNull(newEntity.getPensionAddressReduce()) &&
+				(!newEntity.getPensionAddressReduce().equals(oldEntity.getPensionAddressReduce())
+						|| null == oldEntity.getSocialProvince())){
+			return initSocialArea(areaMap, areaIdMap, newEntity,newEntity.getPensionAddressReduce());
+		}
+		return null;
+	}
+
+	private R<Boolean> initSocialArea(Map<String, SysArea> areaMap,
+									  Map<String, SysArea> areaIdMap, TPreDispatchInfo entity,String address) {
+		SysArea area = areaMap.get(address);
+		SysArea areaTemp;
+		if (null != area){
+			// 处理省数据
+			if (null == area.getParentId() || CommonConstants.ZERO_INT == area.getParentId().intValue()){
+				entity.setSocialProvince(area.getId().toString());
+				entity.setSocialCity(null);
+				entity.setSocialTown(null);
+				return null;
+			}
+			areaTemp = areaIdMap.get(Integer.toString(area.getParentId()));
+			// 处理市县数据
+			if (handleSocialAreaSub(entity, area, areaTemp)){
+				return R.failed(getAreaErrorInfo(entity.getType()));
+			}
+		}else {
+			return R.failed(getAreaErrorInfo(entity.getType()));
+		}
+		return null;
+	}
+
+	/**
+	 * 获取社保市县 数据
+	 * @Author huyc
+	 * @Date 2022-07-18
+	 * @param newEntity
+	 * @param area
+	 * @param areaTemp
+	 * @return
+	 **/
+	private boolean handleSocialAreaSub(TPreDispatchInfo newEntity, SysArea area, SysArea areaTemp) {
+		if (null != areaTemp){
+			if (null == areaTemp.getParentId() || CommonConstants.ZERO_INT == areaTemp.getParentId().intValue()){
+				newEntity.setSocialProvince(areaTemp.getId().toString());
+				newEntity.setSocialCity(area.getId().toString());
+				newEntity.setSocialTown(null);
+			}else {
+				newEntity.setSocialProvince(areaTemp.getParentId().toString());
+				newEntity.setSocialCity(areaTemp.getId().toString());
+				newEntity.setSocialTown(area.getId().toString());
+			}
+		}else {
+			return true;
+		}
+		return false;
+	}
+
+}

yifu-social/yifu-social-biz/src/main/resources/mapper/SysBaseSetInfoMapper.xml

@@ -82,6 +82,10 @@
 		<result property="createTime" column="CREATE_TIME"/>
 		<result property="updateTime" column="UPDATE_TIME"/>
 	</resultMap>
+	<sql id="base_column_list">
+		SELECT
+			a.*
+	</sql>
 	<sql id="Base_Column_List">
 		a.ID,
 		a.PROVINCE,
@@ -330,4 +334,13 @@
 		</where>
 		order by a.CREATE_TIME desc
 	</select>
+	<!--sysBaseSetInfo简单查询-->
+	<select id="getAllByEntity" resultMap="sysBaseSetInfoMap">
+		<include refid="base_column_list"/>
+		FROM sys_base_set_info a
+		<where>
+			1=1
+			<include refid="sysBaseSetInfo_where"/>
+		</where>
+	</select>
 </mapper>

yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml

+<?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.TPaymentInfoMapper">
+
+  <resultMap id="tPaymentInfoMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo">
+    <id property="id" column="ID"/>
+    <result property="empName" column="EMP_NAME"/>
+    <result property="empNo" column="EMP_NO"/>
+    <result property="empId" column="EMP_ID"/>
+    <result property="empIdcard" column="EMP_IDCARD"/>
+    <result property="unitId" column="UNIT_ID"/>
+    <result property="settleDomainId" column="SETTLE_DOMAIN_ID"/>
+    <result property="socialHousehold" column="SOCIAL_HOUSEHOLD"/>
+    <result property="socialSecurityNo" column="SOCIAL_SECURITY_NO"/>
+    <result property="socialPayAddr" column="SOCIAL_PAY_ADDR"/>
+    <result property="socialPayMonth" column="SOCIAL_PAY_MONTH"/>
+    <result property="socialCreateMonth" column="SOCIAL_CREATE_MONTH"/>
+    <result property="lockStatus" column="LOCK_STATUS"/>
+    <result property="socialSettlementFlag" column="SOCIAL_SETTLEMENT_FLAG"/>
+    <result property="fundSettlementFlag" column="FUND_SETTLEMENT_FLAG"/>
+    <result property="sumAll" column="SUM_ALL"/>
+    <result property="providentPayMonth" column="PROVIDENT_PAY_MONTH"/>
+    <result property="providentCreateMonth" column="PROVIDENT_CREATE_MONTH"/>
+    <result property="providentHousehold" column="PROVIDENT_HOUSEHOLD"/>
+    <result property="providentPayAddr" column="PROVIDENT_PAY_ADDR"/>
+    <result property="fundProvince" column="FUND_PROVINCE"/>
+    <result property="fundCity" column="FUND_CITY"/>
+    <result property="fundTown" column="FUND_TOWN"/>
+    <result property="socialProvince" column="SOCIAL_PROVINCE"/>
+    <result property="socialCity" column="SOCIAL_CITY"/>
+    <result property="socialTown" column="SOCIAL_TOWN"/>
+    <result property="socialId" column="SOCIAL_ID"/>
+    <result property="fundId" column="FUND_ID"/>
+    <result property="socialSum" column="SOCIAL_SUM"/>
+    <result property="unitSocialSum" column="UNIT_SOCIAL_SUM"/>
+    <result property="socialSecurityPersonalSum" column="SOCIAL_SECURITY_PERSONAL_SUM"/>
+    <result property="providentSum" column="PROVIDENT_SUM"/>
+    <result property="socialSettlementId" column="SOCIAL_SETTLEMENT_ID"/>
+    <result property="fundSettlementId" column="FUND_SETTLEMENT_ID"/>
+    <result property="salarySocialFlag" column="SALARY_SOCIAL_FLAG"/>
+    <result property="salaryFundFlag" column="SALARY_FUND_FLAG"/>
+    <result property="inauguralTeam" column="INAUGURAL_TEAM"/>
+    <result property="telecomNumber" column="TELECOM_NUMBER"/>
+    <result property="sortTime" column="SORT_TIME"/>
+    <result property="agentId" column="AGENT_ID"/>
+    <result property="financeBillId" column="FINANCE_BILL_ID"/>
+    <result property="createBy" column="CREATE_BY"/>
+    <result property="updateBy" column="UPDATE_BY"/>
+    <result property="createName" column="CREATE_NAME"/>
+    <result property="createTime" column="CREATE_TIME"/>
+    <result property="updateTime" column="UPDATE_TIME"/>
+  </resultMap>
+    <sql id="Base_Column_List">
+                a.ID,
+                a.EMP_NAME,
+                a.EMP_NO,
+                a.EMP_ID,
+                a.EMP_IDCARD,
+                a.UNIT_ID,
+                a.SETTLE_DOMAIN_ID,
+                a.SOCIAL_HOUSEHOLD,
+                a.SOCIAL_SECURITY_NO,
+                a.SOCIAL_PAY_ADDR,
+                a.SOCIAL_PAY_MONTH,
+                a.SOCIAL_CREATE_MONTH,
+                a.LOCK_STATUS,
+                a.SOCIAL_SETTLEMENT_FLAG,
+                a.FUND_SETTLEMENT_FLAG,
+                a.SUM_ALL,
+                a.PROVIDENT_PAY_MONTH,
+                a.PROVIDENT_CREATE_MONTH,
+                a.PROVIDENT_HOUSEHOLD,
+                a.PROVIDENT_PAY_ADDR,
+                a.FUND_PROVINCE,
+                a.FUND_CITY,
+                a.FUND_TOWN,
+                a.SOCIAL_PROVINCE,
+                a.SOCIAL_CITY,
+                a.SOCIAL_TOWN,
+                a.SOCIAL_ID,
+                a.FUND_ID,
+                a.SOCIAL_SUM,
+                a.UNIT_SOCIAL_SUM,
+                a.SOCIAL_SECURITY_PERSONAL_SUM,
+                a.PROVIDENT_SUM,
+                a.SOCIAL_SETTLEMENT_ID,
+                a.FUND_SETTLEMENT_ID,
+                a.SALARY_SOCIAL_FLAG,
+                a.SALARY_FUND_FLAG,
+                a.INAUGURAL_TEAM,
+                a.TELECOM_NUMBER,
+                a.SORT_TIME,
+                a.AGENT_ID,
+                a.FINANCE_BILL_ID,
+                a.CREATE_BY,
+                a.UPDATE_BY,
+                a.CREATE_NAME,
+                a.CREATE_TIME,
+                a.UPDATE_TIME
+    </sql>
+    <sql id="tPaymentInfo_where">
+        <if test="tPaymentInfo != null">
+                    <if test="tPaymentInfo.id != null and tPaymentInfo.id.trim() != ''">
+                        AND a.ID = #{tPaymentInfo.id}
+                    </if>
+                    <if test="tPaymentInfo.empName != null and tPaymentInfo.empName.trim() != ''">
+                        AND a.EMP_NAME = #{tPaymentInfo.empName}
+                    </if>
+                    <if test="tPaymentInfo.empNo != null and tPaymentInfo.empNo.trim() != ''">
+                        AND a.EMP_NO = #{tPaymentInfo.empNo}
+                    </if>
+                    <if test="tPaymentInfo.empId != null and tPaymentInfo.empId.trim() != ''">
+                        AND a.EMP_ID = #{tPaymentInfo.empId}
+                    </if>
+                    <if test="tPaymentInfo.empIdcard != null and tPaymentInfo.empIdcard.trim() != ''">
+                        AND a.EMP_IDCARD = #{tPaymentInfo.empIdcard}
+                    </if>
+                    <if test="tPaymentInfo.unitId != null and tPaymentInfo.unitId.trim() != ''">
+                        AND a.UNIT_ID = #{tPaymentInfo.unitId}
+                    </if>
+                    <if test="tPaymentInfo.settleDomainId != null and tPaymentInfo.settleDomainId.trim() != ''">
+                        AND a.SETTLE_DOMAIN_ID = #{tPaymentInfo.settleDomainId}
+                    </if>
+                    <if test="tPaymentInfo.socialHousehold != null and tPaymentInfo.socialHousehold.trim() != ''">
+                        AND a.SOCIAL_HOUSEHOLD = #{tPaymentInfo.socialHousehold}
+                    </if>
+                    <if test="tPaymentInfo.socialSecurityNo != null and tPaymentInfo.socialSecurityNo.trim() != ''">
+                        AND a.SOCIAL_SECURITY_NO = #{tPaymentInfo.socialSecurityNo}
+                    </if>
+                    <if test="tPaymentInfo.socialPayAddr != null and tPaymentInfo.socialPayAddr.trim() != ''">
+                        AND a.SOCIAL_PAY_ADDR = #{tPaymentInfo.socialPayAddr}
+                    </if>
+                    <if test="tPaymentInfo.socialPayMonth != null and tPaymentInfo.socialPayMonth.trim() != ''">
+                        AND a.SOCIAL_PAY_MONTH = #{tPaymentInfo.socialPayMonth}
+                    </if>
+                    <if test="tPaymentInfo.socialCreateMonth != null and tPaymentInfo.socialCreateMonth.trim() != ''">
+                        AND a.SOCIAL_CREATE_MONTH = #{tPaymentInfo.socialCreateMonth}
+                    </if>
+                    <if test="tPaymentInfo.lockStatus != null and tPaymentInfo.lockStatus.trim() != ''">
+                        AND a.LOCK_STATUS = #{tPaymentInfo.lockStatus}
+                    </if>
+                    <if test="tPaymentInfo.socialSettlementFlag != null and tPaymentInfo.socialSettlementFlag.trim() != ''">
+                        AND a.SOCIAL_SETTLEMENT_FLAG = #{tPaymentInfo.socialSettlementFlag}
+                    </if>
+                    <if test="tPaymentInfo.fundSettlementFlag != null and tPaymentInfo.fundSettlementFlag.trim() != ''">
+                        AND a.FUND_SETTLEMENT_FLAG = #{tPaymentInfo.fundSettlementFlag}
+                    </if>
+                    <if test="tPaymentInfo.sumAll != null">
+                        AND a.SUM_ALL = #{tPaymentInfo.sumAll}
+                    </if>
+                    <if test="tPaymentInfo.providentPayMonth != null and tPaymentInfo.providentPayMonth.trim() != ''">
+                        AND a.PROVIDENT_PAY_MONTH = #{tPaymentInfo.providentPayMonth}
+                    </if>
+                    <if test="tPaymentInfo.providentCreateMonth != null and tPaymentInfo.providentCreateMonth.trim() != ''">
+                        AND a.PROVIDENT_CREATE_MONTH = #{tPaymentInfo.providentCreateMonth}
+                    </if>
+                    <if test="tPaymentInfo.providentHousehold != null and tPaymentInfo.providentHousehold.trim() != ''">
+                        AND a.PROVIDENT_HOUSEHOLD = #{tPaymentInfo.providentHousehold}
+                    </if>
+                    <if test="tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''">
+                        AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr}
+                    </if>
+                    <if test="tPaymentInfo.fundProvince != null and tPaymentInfo.fundProvince.trim() != ''">
+                        AND a.FUND_PROVINCE = #{tPaymentInfo.fundProvince}
+                    </if>
+                    <if test="tPaymentInfo.fundCity != null and tPaymentInfo.fundCity.trim() != ''">
+                        AND a.FUND_CITY = #{tPaymentInfo.fundCity}
+                    </if>
+                    <if test="tPaymentInfo.fundTown != null and tPaymentInfo.fundTown.trim() != ''">
+                        AND a.FUND_TOWN = #{tPaymentInfo.fundTown}
+                    </if>
+                    <if test="tPaymentInfo.socialProvince != null and tPaymentInfo.socialProvince.trim() != ''">
+                        AND a.SOCIAL_PROVINCE = #{tPaymentInfo.socialProvince}
+                    </if>
+                    <if test="tPaymentInfo.socialCity != null and tPaymentInfo.socialCity.trim() != ''">
+                        AND a.SOCIAL_CITY = #{tPaymentInfo.socialCity}
+                    </if>
+                    <if test="tPaymentInfo.socialTown != null and tPaymentInfo.socialTown.trim() != ''">
+                        AND a.SOCIAL_TOWN = #{tPaymentInfo.socialTown}
+                    </if>
+                    <if test="tPaymentInfo.socialId != null and tPaymentInfo.socialId.trim() != ''">
+                        AND a.SOCIAL_ID = #{tPaymentInfo.socialId}
+                    </if>
+                    <if test="tPaymentInfo.fundId != null and tPaymentInfo.fundId.trim() != ''">
+                        AND a.FUND_ID = #{tPaymentInfo.fundId}
+                    </if>
+                    <if test="tPaymentInfo.socialSum != null">
+                        AND a.SOCIAL_SUM = #{tPaymentInfo.socialSum}
+                    </if>
+                    <if test="tPaymentInfo.unitSocialSum != null">
+                        AND a.UNIT_SOCIAL_SUM = #{tPaymentInfo.unitSocialSum}
+                    </if>
+                    <if test="tPaymentInfo.socialSecurityPersonalSum != null">
+                        AND a.SOCIAL_SECURITY_PERSONAL_SUM = #{tPaymentInfo.socialSecurityPersonalSum}
+                    </if>
+                    <if test="tPaymentInfo.providentSum != null">
+                        AND a.PROVIDENT_SUM = #{tPaymentInfo.providentSum}
+                    </if>
+                    <if test="tPaymentInfo.socialSettlementId != null and tPaymentInfo.socialSettlementId.trim() != ''">
+                        AND a.SOCIAL_SETTLEMENT_ID = #{tPaymentInfo.socialSettlementId}
+                    </if>
+                    <if test="tPaymentInfo.fundSettlementId != null and tPaymentInfo.fundSettlementId.trim() != ''">
+                        AND a.FUND_SETTLEMENT_ID = #{tPaymentInfo.fundSettlementId}
+                    </if>
+                    <if test="tPaymentInfo.salarySocialFlag != null and tPaymentInfo.salarySocialFlag.trim() != ''">
+                        AND a.SALARY_SOCIAL_FLAG = #{tPaymentInfo.salarySocialFlag}
+                    </if>
+                    <if test="tPaymentInfo.salaryFundFlag != null and tPaymentInfo.salaryFundFlag.trim() != ''">
+                        AND a.SALARY_FUND_FLAG = #{tPaymentInfo.salaryFundFlag}
+                    </if>
+                    <if test="tPaymentInfo.inauguralTeam != null and tPaymentInfo.inauguralTeam.trim() != ''">
+                        AND a.INAUGURAL_TEAM = #{tPaymentInfo.inauguralTeam}
+                    </if>
+                    <if test="tPaymentInfo.telecomNumber != null and tPaymentInfo.telecomNumber.trim() != ''">
+                        AND a.TELECOM_NUMBER = #{tPaymentInfo.telecomNumber}
+                    </if>
+                    <if test="tPaymentInfo.sortTime != null and tPaymentInfo.sortTime.trim() != ''">
+                        AND a.SORT_TIME = #{tPaymentInfo.sortTime}
+                    </if>
+                    <if test="tPaymentInfo.agentId != null and tPaymentInfo.agentId.trim() != ''">
+                        AND a.AGENT_ID = #{tPaymentInfo.agentId}
+                    </if>
+                    <if test="tPaymentInfo.financeBillId != null and tPaymentInfo.financeBillId.trim() != ''">
+                        AND a.FINANCE_BILL_ID = #{tPaymentInfo.financeBillId}
+                    </if>
+                    <if test="tPaymentInfo.createBy != null and tPaymentInfo.createBy.trim() != ''">
+                        AND a.CREATE_BY = #{tPaymentInfo.createBy}
+                    </if>
+                    <if test="tPaymentInfo.updateBy != null and tPaymentInfo.updateBy.trim() != ''">
+                        AND a.UPDATE_BY = #{tPaymentInfo.updateBy}
+                    </if>
+                    <if test="tPaymentInfo.createName != null and tPaymentInfo.createName.trim() != ''">
+                        AND a.CREATE_NAME = #{tPaymentInfo.createName}
+                    </if>
+                    <if test="tPaymentInfo.createTime != null">
+                        AND a.CREATE_TIME = #{tPaymentInfo.createTime}
+                    </if>
+                    <if test="tPaymentInfo.updateTime != null">
+                        AND a.UPDATE_TIME = #{tPaymentInfo.updateTime}
+                    </if>
+        </if>
+    </sql>
+    <!--tPaymentInfo简单分页查询-->
+    <select id="getTPaymentInfoPage" resultMap="tPaymentInfoMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_payment_info a
+        <where>
+            1=1
+            <include refid="tPaymentInfo_where"/>
+        </where>
+    </select>
+</mapper>

yifu-social/yifu-social-biz/src/main/resources/mapper/TPreDispatchInfoMapper.xml

+<?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.TPreDispatchInfoMapper">
+
+  <resultMap id="tPreDispatchInfoMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo">
+    <id property="id" column="ID"/>
+    <result property="type" column="TYPE"/>
+    <result property="date" column="DATE"/>
+    <result property="company" column="COMPANY"/>
+    <result property="payAddress" column="PAY_ADDRESS"/>
+    <result property="customerName" column="CUSTOMER_NAME"/>
+    <result property="empIdcard" column="EMP_IDCARD"/>
+    <result property="empName" column="EMP_NAME"/>
+    <result property="telOne" column="TEL_ONE"/>
+    <result property="telTwo" column="TEL_TWO"/>
+    <result property="entryDate" column="ENTRY_DATE"/>
+    <result property="formalSalary" column="FORMAL_SALARY"/>
+    <result property="dispatchStart" column="DISPATCH_START"/>
+    <result property="dispatchEnd" column="DISPATCH_END"/>
+    <result property="contractStart" column="CONTRACT_START"/>
+    <result property="contractEnd" column="CONTRACT_END"/>
+    <result property="trialStart" column="TRIAL_START"/>
+    <result property="trialEnd" column="TRIAL_END"/>
+    <result property="trialSalary" column="TRIAL_SALARY"/>
+    <result property="workingSystem" column="WORKING_SYSTEM"/>
+    <result property="contractVersion" column="CONTRACT_VERSION"/>
+    <result property="telNotice" column="TEL_NOTICE"/>
+    <result property="workingAddress" column="WORKING_ADDRESS"/>
+    <result property="remarkOne" column="REMARK_ONE"/>
+    <result property="remarkTwo" column="REMARK_TWO"/>
+    <result property="pensionAddress" column="PENSION_ADDRESS"/>
+    <result property="pensionBase" column="PENSION_BASE"/>
+    <result property="pensionStart" column="PENSION_START"/>
+    <result property="medicalAddress" column="MEDICAL_ADDRESS"/>
+    <result property="medicalBase" column="MEDICAL_BASE"/>
+    <result property="medicalStart" column="MEDICAL_START"/>
+    <result property="injuryAddress" column="INJURY_ADDRESS"/>
+    <result property="injuryBase" column="INJURY_BASE"/>
+    <result property="injuryStart" column="INJURY_START"/>
+    <result property="birthAddress" column="BIRTH_ADDRESS"/>
+    <result property="birthBase" column="BIRTH_BASE"/>
+    <result property="birthStart" column="BIRTH_START"/>
+    <result property="unemploymentAddress" column="UNEMPLOYMENT_ADDRESS"/>
+    <result property="unemploymentBase" column="UNEMPLOYMENT_BASE"/>
+    <result property="unemploymentStart" column="UNEMPLOYMENT_START"/>
+    <result property="fundAddress" column="FUND_ADDRESS"/>
+    <result property="fundBase" column="FUND_BASE"/>
+    <result property="fundStart" column="FUND_START"/>
+    <result property="fundPersonalPer" column="FUND_PERSONAL_PER"/>
+    <result property="fundCompanyPer" column="FUND_COMPANY_PER"/>
+    <result property="dispatchCompany" column="DISPATCH_COMPANY"/>
+    <result property="customerService" column="CUSTOMER_SERVICE"/>
+    <result property="contractMinorName" column="CONTRACT_MINOR_NAME"/>
+    <result property="uniqueNumber" column="UNIQUE_NUMBER"/>
+    <result property="customerNumber" column="CUSTOMER_NUMBER"/>
+    <result property="serviceType" column="SERVICE_TYPE"/>
+    <result property="pensionAddressReduce" column="PENSION_ADDRESS_REDUCE"/>
+    <result property="pensionEndReduce" column="PENSION_END_REDUCE"/>
+    <result property="medicalAddressReduce" column="MEDICAL_ADDRESS_REDUCE"/>
+    <result property="medicalEndReduce" column="MEDICAL_END_REDUCE"/>
+    <result property="injuryAddressReduce" column="INJURY_ADDRESS_REDUCE"/>
+    <result property="injuryEndReduce" column="INJURY_END_REDUCE"/>
+    <result property="birthAddressReduce" column="BIRTH_ADDRESS_REDUCE"/>
+    <result property="birthEndReduce" column="BIRTH_END_REDUCE"/>
+    <result property="unemploymentAddressReduce" column="UNEMPLOYMENT_ADDRESS_REDUCE"/>
+    <result property="unemploymentEndReduce" column="UNEMPLOYMENT_END_REDUCE"/>
+    <result property="fundAddressReduce" column="FUND_ADDRESS_REDUCE"/>
+    <result property="fundEndReduce" column="FUND_END_REDUCE"/>
+    <result property="leaveDate" column="LEAVE_DATE"/>
+    <result property="leaveReason" column="LEAVE_REASON"/>
+    <result property="contractType" column="CONTRACT_TYPE"/>
+    <result property="empTypeAdd" column="EMP_TYPE_ADD"/>
+    <result property="unitIdAdd" column="UNIT_ID_ADD"/>
+    <result property="departIdAdd" column="DEPART_ID_ADD"/>
+    <result property="unitNameAdd" column="UNIT_NAME_ADD"/>
+    <result property="departNameAdd" column="DEPART_NAME_ADD"/>
+    <result property="socialHouseAdd" column="SOCIAL_HOUSE_ADD"/>
+    <result property="fundHouseAdd" column="FUND_HOUSE_ADD"/>
+    <result property="filingBaseAdd" column="FILING_BASE_ADD"/>
+    <result property="preStatus" column="PRE_STATUS"/>
+    <result property="status" column="STATUS"/>
+    <result property="exceptionContent" column="EXCEPTION_CONTENT"/>
+    <result property="socialProvince" column="SOCIAL_PROVINCE"/>
+    <result property="socialCity" column="SOCIAL_CITY"/>
+    <result property="socialTown" column="SOCIAL_TOWN"/>
+    <result property="fundProvince" column="FUND_PROVINCE"/>
+    <result property="fundCity" column="FUND_CITY"/>
+    <result property="fundTown" column="FUND_TOWN"/>
+    <result property="dayLimit" column="DAY_LIMIT"/>
+    <result property="dataSubStatus" column="DATA_SUB_STATUS"/>
+    <result property="positionAdd" column="POSITION_ADD"/>
+    <result property="contractNameAdd" column="CONTRACT_NAME_ADD"/>
+    <result property="contractTypeAdd" column="CONTRACT_TYPE_ADD"/>
+    <result property="contractStartAdd" column="CONTRACT_START_ADD"/>
+    <result property="contractEndAdd" column="CONTRACT_END_ADD"/>
+    <result property="contractTermAdd" column="CONTRACT_TERM_ADD"/>
+    <result property="workingHoursAdd" column="WORKING_HOURS_ADD"/>
+    <result property="leaveReasonAdd" column="LEAVE_REASON_ADD"/>
+    <result property="remark" column="REMARK"/>
+    <result property="dispatchFlag" column="DISPATCH_FLAG"/>
+    <result property="cancelRemark" column="CANCEL_REMARK"/>
+    <result property="userDeptName" column="USER_DEPT_NAME"/>
+    <result property="createBy" column="CREATE_BY"/>
+    <result property="updateBy" column="UPDATE_BY"/>
+    <result property="createName" column="CREATE_NAME"/>
+    <result property="createTime" column="CREATE_TIME"/>
+    <result property="updateTime" column="UPDATE_TIME"/>
+  </resultMap>
+    <sql id="Base_Column_List">
+                a.ID,
+                a.TYPE,
+                a.DATE,
+                a.COMPANY,
+                a.PAY_ADDRESS,
+                a.CUSTOMER_NAME,
+                a.EMP_IDCARD,
+                a.EMP_NAME,
+                a.TEL_ONE,
+                a.TEL_TWO,
+                a.ENTRY_DATE,
+                a.FORMAL_SALARY,
+                a.DISPATCH_START,
+                a.DISPATCH_END,
+                a.CONTRACT_START,
+                a.CONTRACT_END,
+                a.TRIAL_START,
+                a.TRIAL_END,
+                a.TRIAL_SALARY,
+                a.WORKING_SYSTEM,
+                a.CONTRACT_VERSION,
+                a.TEL_NOTICE,
+                a.WORKING_ADDRESS,
+                a.REMARK_ONE,
+                a.REMARK_TWO,
+                a.PENSION_ADDRESS,
+                a.PENSION_BASE,
+                a.PENSION_START,
+                a.MEDICAL_ADDRESS,
+                a.MEDICAL_BASE,
+                a.MEDICAL_START,
+                a.INJURY_ADDRESS,
+                a.INJURY_BASE,
+                a.INJURY_START,
+                a.BIRTH_ADDRESS,
+                a.BIRTH_BASE,
+                a.BIRTH_START,
+                a.UNEMPLOYMENT_ADDRESS,
+                a.UNEMPLOYMENT_BASE,
+                a.UNEMPLOYMENT_START,
+                a.FUND_ADDRESS,
+                a.FUND_BASE,
+                a.FUND_START,
+                a.FUND_PERSONAL_PER,
+                a.FUND_COMPANY_PER,
+                a.DISPATCH_COMPANY,
+                a.CUSTOMER_SERVICE,
+                a.CONTRACT_MINOR_NAME,
+                a.UNIQUE_NUMBER,
+                a.CUSTOMER_NUMBER,
+                a.SERVICE_TYPE,
+                a.PENSION_ADDRESS_REDUCE,
+                a.PENSION_END_REDUCE,
+                a.MEDICAL_ADDRESS_REDUCE,
+                a.MEDICAL_END_REDUCE,
+                a.INJURY_ADDRESS_REDUCE,
+                a.INJURY_END_REDUCE,
+                a.BIRTH_ADDRESS_REDUCE,
+                a.BIRTH_END_REDUCE,
+                a.UNEMPLOYMENT_ADDRESS_REDUCE,
+                a.UNEMPLOYMENT_END_REDUCE,
+                a.FUND_ADDRESS_REDUCE,
+                a.FUND_END_REDUCE,
+                a.LEAVE_DATE,
+                a.LEAVE_REASON,
+                a.CONTRACT_TYPE,
+                a.EMP_TYPE_ADD,
+                a.UNIT_ID_ADD,
+                a.DEPART_ID_ADD,
+                a.UNIT_NAME_ADD,
+                a.DEPART_NAME_ADD,
+                a.SOCIAL_HOUSE_ADD,
+                a.FUND_HOUSE_ADD,
+                a.FILING_BASE_ADD,
+                a.PRE_STATUS,
+                a.STATUS,
+                a.EXCEPTION_CONTENT,
+                a.SOCIAL_PROVINCE,
+                a.SOCIAL_CITY,
+                a.SOCIAL_TOWN,
+                a.FUND_PROVINCE,
+                a.FUND_CITY,
+                a.FUND_TOWN,
+                a.DAY_LIMIT,
+                a.DATA_SUB_STATUS,
+                a.POSITION_ADD,
+                a.CONTRACT_NAME_ADD,
+                a.CONTRACT_TYPE_ADD,
+                a.CONTRACT_START_ADD,
+                a.CONTRACT_END_ADD,
+                a.CONTRACT_TERM_ADD,
+                a.WORKING_HOURS_ADD,
+                a.LEAVE_REASON_ADD,
+                a.REMARK,
+                a.DISPATCH_FLAG,
+                a.CANCEL_REMARK,
+                a.USER_DEPT_NAME,
+                a.CREATE_BY,
+                a.UPDATE_BY,
+                a.CREATE_NAME,
+                a.CREATE_TIME,
+                a.UPDATE_TIME
+    </sql>
+    <sql id="tPreDispatchInfo_where">
+        <if test="tPreDispatchInfo != null">
+                    <if test="tPreDispatchInfo.id != null and tPreDispatchInfo.id.trim() != ''">
+                        AND a.ID = #{tPreDispatchInfo.id}
+                    </if>
+                    <if test="tPreDispatchInfo.type != null and tPreDispatchInfo.type.trim() != ''">
+                        AND a.TYPE = #{tPreDispatchInfo.type}
+                    </if>
+                    <if test="tPreDispatchInfo.date != null and tPreDispatchInfo.date.trim() != ''">
+                        AND a.DATE = #{tPreDispatchInfo.date}
+                    </if>
+                    <if test="tPreDispatchInfo.company != null and tPreDispatchInfo.company.trim() != ''">
+						AND a.COMPANY like  CONCAT('%',#{tPreDispatchInfo.company,jdbcType=VARCHAR},'%')
+					</if>
+                    <if test="tPreDispatchInfo.payAddress != null and tPreDispatchInfo.payAddress.trim() != ''">
+						AND a.PAY_ADDRESS like  CONCAT('%',#{tPreDispatchInfo.payAddress,jdbcType=VARCHAR},'%')
+                    </if>
+                    <if test="tPreDispatchInfo.customerName != null and tPreDispatchInfo.customerName.trim() != ''">
+						AND a.CUSTOMER_NAME like  CONCAT('%',#{tPreDispatchInfo.customerName,jdbcType=VARCHAR},'%')
+					</if>
+                    <if test="tPreDispatchInfo.empIdcard != null and tPreDispatchInfo.empIdcard.trim() != ''">
+                        AND a.EMP_IDCARD = #{tPreDispatchInfo.empIdcard}
+                    </if>
+                    <if test="tPreDispatchInfo.empName != null and tPreDispatchInfo.empName.trim() != ''">
+						AND a.EMP_NAME like  CONCAT('%',#{tPreDispatchInfo.empName,jdbcType=VARCHAR},'%')
+					</if>
+                    <if test="tPreDispatchInfo.telOne != null and tPreDispatchInfo.telOne.trim() != ''">
+                        AND a.TEL_ONE = #{tPreDispatchInfo.telOne}
+                    </if>
+                    <if test="tPreDispatchInfo.telTwo != null and tPreDispatchInfo.telTwo.trim() != ''">
+                        AND a.TEL_TWO = #{tPreDispatchInfo.telTwo}
+                    </if>
+                    <if test="tPreDispatchInfo.entryDate != null">
+                        AND a.ENTRY_DATE = #{tPreDispatchInfo.entryDate}
+                    </if>
+                    <if test="tPreDispatchInfo.formalSalary != null and tPreDispatchInfo.formalSalary.trim() != ''">
+                        AND a.FORMAL_SALARY = #{tPreDispatchInfo.formalSalary}
+                    </if>
+                    <if test="tPreDispatchInfo.dispatchStart != null and tPreDispatchInfo.dispatchStart.trim() != ''">
+                        AND a.DISPATCH_START = #{tPreDispatchInfo.dispatchStart}
+                    </if>
+                    <if test="tPreDispatchInfo.dispatchEnd != null and tPreDispatchInfo.dispatchEnd.trim() != ''">
+                        AND a.DISPATCH_END = #{tPreDispatchInfo.dispatchEnd}
+                    </if>
+                    <if test="tPreDispatchInfo.contractStart != null and tPreDispatchInfo.contractStart.trim() != ''">
+                        AND a.CONTRACT_START = #{tPreDispatchInfo.contractStart}
+                    </if>
+                    <if test="tPreDispatchInfo.contractEnd != null and tPreDispatchInfo.contractEnd.trim() != ''">
+                        AND a.CONTRACT_END = #{tPreDispatchInfo.contractEnd}
+                    </if>
+                    <if test="tPreDispatchInfo.trialStart != null and tPreDispatchInfo.trialStart.trim() != ''">
+                        AND a.TRIAL_START = #{tPreDispatchInfo.trialStart}
+                    </if>
+                    <if test="tPreDispatchInfo.trialEnd != null and tPreDispatchInfo.trialEnd.trim() != ''">
+                        AND a.TRIAL_END = #{tPreDispatchInfo.trialEnd}
+                    </if>
+                    <if test="tPreDispatchInfo.trialSalary != null and tPreDispatchInfo.trialSalary.trim() != ''">
+                        AND a.TRIAL_SALARY = #{tPreDispatchInfo.trialSalary}
+                    </if>
+                    <if test="tPreDispatchInfo.workingSystem != null and tPreDispatchInfo.workingSystem.trim() != ''">
+                        AND a.WORKING_SYSTEM = #{tPreDispatchInfo.workingSystem}
+                    </if>
+                    <if test="tPreDispatchInfo.contractVersion != null and tPreDispatchInfo.contractVersion.trim() != ''">
+                        AND a.CONTRACT_VERSION = #{tPreDispatchInfo.contractVersion}
+                    </if>
+                    <if test="tPreDispatchInfo.telNotice != null and tPreDispatchInfo.telNotice.trim() != ''">
+                        AND a.TEL_NOTICE = #{tPreDispatchInfo.telNotice}
+                    </if>
+                    <if test="tPreDispatchInfo.workingAddress != null and tPreDispatchInfo.workingAddress.trim() != ''">
+                        AND a.WORKING_ADDRESS = #{tPreDispatchInfo.workingAddress}
+                    </if>
+                    <if test="tPreDispatchInfo.remarkOne != null and tPreDispatchInfo.remarkOne.trim() != ''">
+                        AND a.REMARK_ONE = #{tPreDispatchInfo.remarkOne}
+                    </if>
+                    <if test="tPreDispatchInfo.remarkTwo != null and tPreDispatchInfo.remarkTwo.trim() != ''">
+                        AND a.REMARK_TWO = #{tPreDispatchInfo.remarkTwo}
+                    </if>
+                    <if test="tPreDispatchInfo.pensionAddress != null and tPreDispatchInfo.pensionAddress.trim() != ''">
+                        AND a.PENSION_ADDRESS = #{tPreDispatchInfo.pensionAddress}
+                    </if>
+                    <if test="tPreDispatchInfo.pensionBase != null">
+                        AND a.PENSION_BASE = #{tPreDispatchInfo.pensionBase}
+                    </if>
+                    <if test="tPreDispatchInfo.pensionStart != null and tPreDispatchInfo.pensionStart.trim() != ''">
+                        AND a.PENSION_START = #{tPreDispatchInfo.pensionStart}
+                    </if>
+                    <if test="tPreDispatchInfo.medicalAddress != null and tPreDispatchInfo.medicalAddress.trim() != ''">
+                        AND a.MEDICAL_ADDRESS = #{tPreDispatchInfo.medicalAddress}
+                    </if>
+                    <if test="tPreDispatchInfo.medicalBase != null">
+                        AND a.MEDICAL_BASE = #{tPreDispatchInfo.medicalBase}
+                    </if>
+                    <if test="tPreDispatchInfo.medicalStart != null and tPreDispatchInfo.medicalStart.trim() != ''">
+                        AND a.MEDICAL_START = #{tPreDispatchInfo.medicalStart}
+                    </if>
+                    <if test="tPreDispatchInfo.injuryAddress != null and tPreDispatchInfo.injuryAddress.trim() != ''">
+                        AND a.INJURY_ADDRESS = #{tPreDispatchInfo.injuryAddress}
+                    </if>
+                    <if test="tPreDispatchInfo.injuryBase != null">
+                        AND a.INJURY_BASE = #{tPreDispatchInfo.injuryBase}
+                    </if>
+                    <if test="tPreDispatchInfo.injuryStart != null and tPreDispatchInfo.injuryStart.trim() != ''">
+                        AND a.INJURY_START = #{tPreDispatchInfo.injuryStart}
+                    </if>
+                    <if test="tPreDispatchInfo.birthAddress != null and tPreDispatchInfo.birthAddress.trim() != ''">
+                        AND a.BIRTH_ADDRESS = #{tPreDispatchInfo.birthAddress}
+                    </if>
+                    <if test="tPreDispatchInfo.birthBase != null">
+                        AND a.BIRTH_BASE = #{tPreDispatchInfo.birthBase}
+                    </if>
+                    <if test="tPreDispatchInfo.birthStart != null and tPreDispatchInfo.birthStart.trim() != ''">
+                        AND a.BIRTH_START = #{tPreDispatchInfo.birthStart}
+                    </if>
+                    <if test="tPreDispatchInfo.unemploymentAddress != null and tPreDispatchInfo.unemploymentAddress.trim() != ''">
+                        AND a.UNEMPLOYMENT_ADDRESS = #{tPreDispatchInfo.unemploymentAddress}
+                    </if>
+                    <if test="tPreDispatchInfo.unemploymentBase != null">
+                        AND a.UNEMPLOYMENT_BASE = #{tPreDispatchInfo.unemploymentBase}
+                    </if>
+                    <if test="tPreDispatchInfo.unemploymentStart != null and tPreDispatchInfo.unemploymentStart.trim() != ''">
+                        AND a.UNEMPLOYMENT_START = #{tPreDispatchInfo.unemploymentStart}
+                    </if>
+                    <if test="tPreDispatchInfo.fundAddress != null and tPreDispatchInfo.fundAddress.trim() != ''">
+                        AND a.FUND_ADDRESS = #{tPreDispatchInfo.fundAddress}
+                    </if>
+                    <if test="tPreDispatchInfo.fundBase != null">
+                        AND a.FUND_BASE = #{tPreDispatchInfo.fundBase}
+                    </if>
+                    <if test="tPreDispatchInfo.fundStart != null and tPreDispatchInfo.fundStart.trim() != ''">
+                        AND a.FUND_START = #{tPreDispatchInfo.fundStart}
+                    </if>
+                    <if test="tPreDispatchInfo.fundPersonalPer != null">
+                        AND a.FUND_PERSONAL_PER = #{tPreDispatchInfo.fundPersonalPer}
+                    </if>
+                    <if test="tPreDispatchInfo.fundCompanyPer != null">
+                        AND a.FUND_COMPANY_PER = #{tPreDispatchInfo.fundCompanyPer}
+                    </if>
+                    <if test="tPreDispatchInfo.dispatchCompany != null and tPreDispatchInfo.dispatchCompany.trim() != ''">
+                        AND a.DISPATCH_COMPANY = #{tPreDispatchInfo.dispatchCompany}
+                    </if>
+                    <if test="tPreDispatchInfo.customerService != null and tPreDispatchInfo.customerService.trim() != ''">
+                        AND a.CUSTOMER_SERVICE = #{tPreDispatchInfo.customerService}
+                    </if>
+                    <if test="tPreDispatchInfo.contractMinorName != null and tPreDispatchInfo.contractMinorName.trim() != ''">
+                        AND a.CONTRACT_MINOR_NAME = #{tPreDispatchInfo.contractMinorName}
+                    </if>
+                    <if test="tPreDispatchInfo.uniqueNumber != null and tPreDispatchInfo.uniqueNumber.trim() != ''">
+                        AND a.UNIQUE_NUMBER = #{tPreDispatchInfo.uniqueNumber}
+                    </if>
+                    <if test="tPreDispatchInfo.customerNumber != null and tPreDispatchInfo.customerNumber.trim() != ''">
+                        AND a.CUSTOMER_NUMBER = #{tPreDispatchInfo.customerNumber}
+                    </if>
+                    <if test="tPreDispatchInfo.serviceType != null and tPreDispatchInfo.serviceType.trim() != ''">
+                        AND a.SERVICE_TYPE = #{tPreDispatchInfo.serviceType}
+                    </if>
+                    <if test="tPreDispatchInfo.pensionAddressReduce != null and tPreDispatchInfo.pensionAddressReduce.trim() != ''">
+                        AND a.PENSION_ADDRESS_REDUCE = #{tPreDispatchInfo.pensionAddressReduce}
+                    </if>
+                    <if test="tPreDispatchInfo.pensionEndReduce != null and tPreDispatchInfo.pensionEndReduce.trim() != ''">
+                        AND a.PENSION_END_REDUCE = #{tPreDispatchInfo.pensionEndReduce}
+                    </if>
+                    <if test="tPreDispatchInfo.medicalAddressReduce != null and tPreDispatchInfo.medicalAddressReduce.trim() != ''">
+                        AND a.MEDICAL_ADDRESS_REDUCE = #{tPreDispatchInfo.medicalAddressReduce}
+                    </if>
+                    <if test="tPreDispatchInfo.medicalEndReduce != null and tPreDispatchInfo.medicalEndReduce.trim() != ''">
+                        AND a.MEDICAL_END_REDUCE = #{tPreDispatchInfo.medicalEndReduce}
+                    </if>
+                    <if test="tPreDispatchInfo.injuryAddressReduce != null and tPreDispatchInfo.injuryAddressReduce.trim() != ''">
+                        AND a.INJURY_ADDRESS_REDUCE = #{tPreDispatchInfo.injuryAddressReduce}
+                    </if>
+                    <if test="tPreDispatchInfo.injuryEndReduce != null and tPreDispatchInfo.injuryEndReduce.trim() != ''">
+                        AND a.INJURY_END_REDUCE = #{tPreDispatchInfo.injuryEndReduce}
+                    </if>
+                    <if test="tPreDispatchInfo.birthAddressReduce != null and tPreDispatchInfo.birthAddressReduce.trim() != ''">
+                        AND a.BIRTH_ADDRESS_REDUCE = #{tPreDispatchInfo.birthAddressReduce}
+                    </if>
+                    <if test="tPreDispatchInfo.birthEndReduce != null and tPreDispatchInfo.birthEndReduce.trim() != ''">
+                        AND a.BIRTH_END_REDUCE = #{tPreDispatchInfo.birthEndReduce}
+                    </if>
+                    <if test="tPreDispatchInfo.unemploymentAddressReduce != null and tPreDispatchInfo.unemploymentAddressReduce.trim() != ''">
+                        AND a.UNEMPLOYMENT_ADDRESS_REDUCE = #{tPreDispatchInfo.unemploymentAddressReduce}
+                    </if>
+                    <if test="tPreDispatchInfo.unemploymentEndReduce != null and tPreDispatchInfo.unemploymentEndReduce.trim() != ''">
+                        AND a.UNEMPLOYMENT_END_REDUCE = #{tPreDispatchInfo.unemploymentEndReduce}
+                    </if>
+                    <if test="tPreDispatchInfo.fundAddressReduce != null and tPreDispatchInfo.fundAddressReduce.trim() != ''">
+                        AND a.FUND_ADDRESS_REDUCE = #{tPreDispatchInfo.fundAddressReduce}
+                    </if>
+                    <if test="tPreDispatchInfo.fundEndReduce != null and tPreDispatchInfo.fundEndReduce.trim() != ''">
+                        AND a.FUND_END_REDUCE = #{tPreDispatchInfo.fundEndReduce}
+                    </if>
+                    <if test="tPreDispatchInfo.leaveDate != null">
+                        AND a.LEAVE_DATE = #{tPreDispatchInfo.leaveDate}
+                    </if>
+                    <if test="tPreDispatchInfo.leaveReason != null and tPreDispatchInfo.leaveReason.trim() != ''">
+                        AND a.LEAVE_REASON = #{tPreDispatchInfo.leaveReason}
+                    </if>
+                    <if test="tPreDispatchInfo.contractType != null and tPreDispatchInfo.contractType.trim() != ''">
+                        AND a.CONTRACT_TYPE = #{tPreDispatchInfo.contractType}
+                    </if>
+                    <if test="tPreDispatchInfo.empTypeAdd != null and tPreDispatchInfo.empTypeAdd.trim() != ''">
+                        AND a.EMP_TYPE_ADD = #{tPreDispatchInfo.empTypeAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.unitIdAdd != null and tPreDispatchInfo.unitIdAdd.trim() != ''">
+                        AND a.UNIT_ID_ADD = #{tPreDispatchInfo.unitIdAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.departIdAdd != null and tPreDispatchInfo.departIdAdd.trim() != ''">
+                        AND a.DEPART_ID_ADD = #{tPreDispatchInfo.departIdAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.unitNameAdd != null and tPreDispatchInfo.unitNameAdd.trim() != ''">
+                        AND a.UNIT_NAME_ADD = #{tPreDispatchInfo.unitNameAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.departNameAdd != null and tPreDispatchInfo.departNameAdd.trim() != ''">
+						AND a.DEPART_NAME_ADD like  CONCAT('%',#{tPreDispatchInfo.departNameAdd,jdbcType=VARCHAR},'%')
+					</if>
+                    <if test="tPreDispatchInfo.socialHouseAdd != null and tPreDispatchInfo.socialHouseAdd.trim() != ''">
+                        AND a.SOCIAL_HOUSE_ADD = #{tPreDispatchInfo.socialHouseAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.fundHouseAdd != null and tPreDispatchInfo.fundHouseAdd.trim() != ''">
+                        AND a.FUND_HOUSE_ADD = #{tPreDispatchInfo.fundHouseAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.filingBaseAdd != null">
+                        AND a.FILING_BASE_ADD = #{tPreDispatchInfo.filingBaseAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.preStatus != null and tPreDispatchInfo.preStatus.trim() != ''">
+                        AND a.PRE_STATUS = #{tPreDispatchInfo.preStatus}
+                    </if>
+                    <if test="tPreDispatchInfo.status != null and tPreDispatchInfo.status.trim() != ''">
+                        AND a.STATUS = #{tPreDispatchInfo.status}
+                    </if>
+                    <if test="tPreDispatchInfo.exceptionContent != null and tPreDispatchInfo.exceptionContent.trim() != ''">
+                        AND a.EXCEPTION_CONTENT = #{tPreDispatchInfo.exceptionContent}
+                    </if>
+                    <if test="tPreDispatchInfo.socialProvince != null and tPreDispatchInfo.socialProvince.trim() != ''">
+                        AND a.SOCIAL_PROVINCE = #{tPreDispatchInfo.socialProvince}
+                    </if>
+                    <if test="tPreDispatchInfo.socialCity != null and tPreDispatchInfo.socialCity.trim() != ''">
+                        AND a.SOCIAL_CITY = #{tPreDispatchInfo.socialCity}
+                    </if>
+                    <if test="tPreDispatchInfo.socialTown != null and tPreDispatchInfo.socialTown.trim() != ''">
+                        AND a.SOCIAL_TOWN = #{tPreDispatchInfo.socialTown}
+                    </if>
+                    <if test="tPreDispatchInfo.fundProvince != null and tPreDispatchInfo.fundProvince.trim() != ''">
+                        AND a.FUND_PROVINCE = #{tPreDispatchInfo.fundProvince}
+                    </if>
+                    <if test="tPreDispatchInfo.fundCity != null and tPreDispatchInfo.fundCity.trim() != ''">
+                        AND a.FUND_CITY = #{tPreDispatchInfo.fundCity}
+                    </if>
+                    <if test="tPreDispatchInfo.fundTown != null and tPreDispatchInfo.fundTown.trim() != ''">
+                        AND a.FUND_TOWN = #{tPreDispatchInfo.fundTown}
+                    </if>
+                    <if test="tPreDispatchInfo.dayLimit != null">
+                        AND a.DAY_LIMIT = #{tPreDispatchInfo.dayLimit}
+                    </if>
+                    <if test="tPreDispatchInfo.dataSubStatus != null and tPreDispatchInfo.dataSubStatus.trim() != ''">
+                        AND a.DATA_SUB_STATUS = #{tPreDispatchInfo.dataSubStatus}
+                    </if>
+                    <if test="tPreDispatchInfo.positionAdd != null and tPreDispatchInfo.positionAdd.trim() != ''">
+                        AND a.POSITION_ADD = #{tPreDispatchInfo.positionAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.contractNameAdd != null and tPreDispatchInfo.contractNameAdd.trim() != ''">
+                        AND a.CONTRACT_NAME_ADD = #{tPreDispatchInfo.contractNameAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.contractTypeAdd != null and tPreDispatchInfo.contractTypeAdd.trim() != ''">
+                        AND a.CONTRACT_TYPE_ADD = #{tPreDispatchInfo.contractTypeAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.contractStartAdd != null and tPreDispatchInfo.contractStartAdd.trim() != ''">
+                        AND a.CONTRACT_START_ADD = #{tPreDispatchInfo.contractStartAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.contractEndAdd != null and tPreDispatchInfo.contractEndAdd.trim() != ''">
+                        AND a.CONTRACT_END_ADD = #{tPreDispatchInfo.contractEndAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.contractTermAdd != null and tPreDispatchInfo.contractTermAdd.trim() != ''">
+                        AND a.CONTRACT_TERM_ADD = #{tPreDispatchInfo.contractTermAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.workingHoursAdd != null and tPreDispatchInfo.workingHoursAdd.trim() != ''">
+                        AND a.WORKING_HOURS_ADD = #{tPreDispatchInfo.workingHoursAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.leaveReasonAdd != null and tPreDispatchInfo.leaveReasonAdd.trim() != ''">
+                        AND a.LEAVE_REASON_ADD = #{tPreDispatchInfo.leaveReasonAdd}
+                    </if>
+                    <if test="tPreDispatchInfo.remark != null and tPreDispatchInfo.remark.trim() != ''">
+                        AND a.REMARK = #{tPreDispatchInfo.remark}
+                    </if>
+                    <if test="tPreDispatchInfo.dispatchFlag != null and tPreDispatchInfo.dispatchFlag.trim() != ''">
+                        AND a.DISPATCH_FLAG = #{tPreDispatchInfo.dispatchFlag}
+                    </if>
+                    <if test="tPreDispatchInfo.cancelRemark != null and tPreDispatchInfo.cancelRemark.trim() != ''">
+                        AND a.CANCEL_REMARK = #{tPreDispatchInfo.cancelRemark}
+                    </if>
+                    <if test="tPreDispatchInfo.userDeptName != null and tPreDispatchInfo.userDeptName.trim() != ''">
+                        AND a.USER_DEPT_NAME = #{tPreDispatchInfo.userDeptName}
+                    </if>
+                    <if test="tPreDispatchInfo.createBy != null and tPreDispatchInfo.createBy.trim() != ''">
+                        AND a.CREATE_BY = #{tPreDispatchInfo.createBy}
+                    </if>
+                    <if test="tPreDispatchInfo.updateBy != null and tPreDispatchInfo.updateBy.trim() != ''">
+                        AND a.UPDATE_BY = #{tPreDispatchInfo.updateBy}
+                    </if>
+                    <if test="tPreDispatchInfo.createName != null and tPreDispatchInfo.createName.trim() != ''">
+                        AND a.CREATE_NAME = #{tPreDispatchInfo.createName}
+                    </if>
+					<if test="tPreDispatchInfo.createTimeEnd != null" >
+						AND a.CREATE_TIME <![CDATA[<=]]> #{tPreDispatchInfo.createTimeEnd}
+					</if>
+					<if test="tPreDispatchInfo.createTimeStart != null">
+						AND a.CREATE_TIME <![CDATA[>=]]> #{tPreDispatchInfo.createTimeStart}
+					</if>
+                    <if test="tPreDispatchInfo.updateTime != null">
+                        AND a.UPDATE_TIME = #{tPreDispatchInfo.updateTime}
+                    </if>
+        </if>
+    </sql>
+    <!--tPreDispatchInfo简单分页查询-->
+    <select id="getTPreDispatchInfoPage" resultMap="tPreDispatchInfoMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM t_pre_dispatch_info a
+        <where>
+            1=1
+            <include refid="tPreDispatchInfo_where"/>
+        </where>
+    </select>
+	<!--tPreDispatchInfo无分页查询-->
+	<select id="getListForExport" resultMap="tPreDispatchExportMap">
+		SELECT
+		<include refid="Base_Column_List"/>
+		FROM t_pre_dispatch_info a
+		<where>
+			1=1
+			<include refid="tPreDispatchInfo_where"/>
+		</where>
+	</select>
+	<update id="updatePreDispatchInfoById" parameterType="com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo">
+		update t_pre_dispatch_info
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="date != null ">date = #{date},</if>
+			<if test="company != null  and company != ''">company = #{company},</if>
+			<if test="payAddress != null  and payAddress != ''">pay_address = #{payAddress},</if>
+			<if test="customerName != null  and customerName != ''">customer_name = #{customerName},</if>
+			<if test="empName != null  and empName != ''">emp_name = #{empName},</if>
+			<if test="empIdcard != null  and empIdcard != ''">emp_idcard = #{empIdcard},</if>
+			<if test="telOne != null  and telOne != ''">tel_one = #{telOne},</if>
+			<if test="telTwo != null  and telTwo != ''">tel_two = #{telTwo},</if>
+			<if test="entryDate != null ">entry_date = #{entryDate},</if>
+			<if test="formalSalary != null and formalSalary != ''">formal_salary = #{formalSalary},</if>
+			<if test="dispatchStart != null  and dispatchStart != ''">dispatch_start = #{dispatchStart},</if>
+			<if test="dispatchEnd != null  and dispatchEnd != ''">dispatch_end = #{dispatchEnd},</if>
+			<if test="contractType != null  and contractType != ''">contract_type = #{contractType},</if>
+			<if test="contractStart != null  and contractStart != ''">contract_start = #{contractStart},</if>
+			<if test="contractEnd != null  and contractEnd != ''">contract_end = #{contractEnd},</if>
+			<if test="contractNameAdd != null  and contractNameAdd != ''">
+				contract_name_add = #{contractNameAdd},
+			</if>
+			<if test="contractTypeAdd != null  and contractTypeAdd != ''">
+				contract_type_add = #{contractTypeAdd},
+			</if>
+			<if test="contractStartAdd != null  and contractStartAdd != ''">
+				contract_start_add = #{contractStartAdd},
+			</if>
+			<if test="contractEndAdd != null  and contractEndAdd != ''">
+				contract_end_add = #{contractEndAdd},
+			</if>
+			<if test="contractTermAdd != null  and contractTermAdd != ''">
+				contract_term_add = #{contractTermAdd},
+			</if>
+			<if test="contractNameAdd == null  or contractNameAdd == ''">
+				contract_name_add = null,
+			</if>
+			<if test="contractTypeAdd == null  or contractTypeAdd == ''">
+				contract_type_add = null,
+			</if>
+			<if test="contractStartAdd == null  or contractStartAdd == ''">
+				contract_start_add = null,
+			</if>
+			<if test="contractEndAdd == null  or contractEndAdd == ''">
+				contract_end_add = null,
+			</if>
+			<if test="contractTermAdd == null  or contractTermAdd == ''">
+				contract_term_add = null,
+			</if>
+			<if test="trialStart != null  and trialStart != ''">trial_start = #{trialStart},</if>
+			<if test="trialEnd != null  and trialEnd != ''">trial_end = #{trialEnd},</if>
+			<if test="trialSalary != null and  trialSalary !='' ">trial_salary = #{trialSalary},</if>
+			<if test="workingSystem != null  and workingSystem != ''">working_system = #{workingSystem},</if>
+			<if test="contractVersion != null  and contractVersion != ''">contract_version = #{contractVersion},</if>
+			<if test="telNotice != null  and telNotice != ''">tel_notice = #{telNotice},</if>
+			<if test="workingAddress != null  and workingAddress != ''">working_address = #{workingAddress},</if>
+			<if test="remarkOne != null  and remarkOne != ''">remark_one = #{remarkOne},</if>
+			<if test="remarkTwo != null  and remarkTwo != ''">remark_two = #{remarkTwo},</if>
+			<if test='type == "0"'>
+				<if test="pensionAddress != null  and pensionAddress != ''">
+					pension_address = #{pensionAddress},
+					<if test="socialProvince != null  and socialProvince != ''">social_province = #{socialProvince},</if>
+					<if test="socialCity != null  and socialCity != ''">social_city = #{socialCity},</if>
+					<if test="socialTown != null  and socialTown != ''">social_town = #{socialTown},</if>
+				</if>
+				<if test='pensionAddress == null || pensionAddress == ""'>
+					pension_address = null,
+					social_province = null,
+					social_city = null,
+					social_town = null,
+				</if>
+				<if test="fundAddress != null  and fundAddress != ''">
+					fund_address = #{fundAddress},
+					<if test="fundProvince != null  and fundProvince != ''">
+						fund_province = #{fundProvince},
+						<if test="fundCity == null">fund_city = null,</if>
+						<if test="fundTown == null">fund_town = null,</if>
+					</if>
+					<if test="fundCity != null  and fundCity != ''">fund_city = #{fundCity},</if>
+					<if test="fundTown != null  and fundTown != ''">fund_town = #{fundTown},</if>
+				</if>
+				<if test='fundAddress == null || fundAddress == ""'>
+					fund_address = null,
+					fund_province = null,
+					fund_city = null,
+					fund_town = null,
+				</if>
+			</if>
+			<if test='type == "1"'>
+				<if test="pensionAddressReduce != null  and pensionAddressReduce != ''">
+					pension_address_reduce = #{pensionAddressReduce},
+					pension_address = #{pensionAddressReduce},
+					<if test="socialProvince != null  and socialProvince != ''">social_province = #{socialProvince},</if>
+					<if test="socialCity != null  and socialCity != ''">social_city = #{socialCity},</if>
+					<if test="socialTown != null  and socialTown != ''">social_town = #{socialTown},</if>
+				</if>
+				<if test='pensionAddressReduce == null || pensionAddressReduce ==""'>
+					pension_address_reduce = null,
+					pension_end_reduce = null,
+					pension_address = null,
+					social_province = null,
+					social_city = null,
+					social_town = null,
+				</if>
+				<if test="fundAddressReduce != null  and fundAddressReduce != ''">
+					fund_address_reduce = #{fundAddressReduce},
+					fund_address = #{fundAddressReduce},
+					<if test="fundProvince != null  and fundProvince != ''">
+						fund_province = #{fundProvince},
+						<if test="fundCity == null">fund_city = null,</if>
+						<if test="fundTown == null">fund_town = null,</if>
+					</if>
+					<if test="fundCity != null  and fundCity != ''">fund_city = #{fundCity},</if>
+					<if test="fundTown != null  and fundTown != ''">fund_town = #{fundTown},</if>
+				</if>
+				<if test='fundAddressReduce == null || fundAddressReduce == ""'>
+					fund_address_reduce = null,
+					fund_address = null,
+					fund_end_reduce = null,
+					fund_province = null,
+					fund_city = null,
+					fund_town = null,
+				</if>
+			</if>
+			<if test="pensionBase != null ">pension_base = #{pensionBase},</if>
+			<if test="pensionStart != null  and pensionStart != ''">pension_start = #{pensionStart},</if>
+			<if test="medicalAddress != null  and medicalAddress != ''">medical_address = #{medicalAddress},</if>
+			<if test="medicalBase != null ">medical_base = #{medicalBase},</if>
+			<if test="medicalStart != null  and medicalStart != ''">medical_start = #{medicalStart},</if>
+			<if test="injuryAddress != null  and injuryAddress != ''">injury_address = #{injuryAddress},</if>
+			<if test="injuryBase != null ">injury_base = #{injuryBase},</if>
+			<if test="injuryStart != null  and injuryStart != ''">injury_start = #{injuryStart},</if>
+			<if test="birthAddress != null  and birthAddress != ''">birth_address = #{birthAddress},</if>
+			<if test="birthBase != null ">birth_base = #{birthBase},</if>
+			<if test="birthStart != null  and birthStart != ''">birth_start = #{birthStart},</if>
+			<if test="unemploymentAddress != null  and unemploymentAddress != ''">unemployment_address = #{unemploymentAddress},</if>
+			<if test="unemploymentBase != null ">unemployment_base = #{unemploymentBase},</if>
+			<if test="unemploymentStart != null  and unemploymentStart != ''">unemployment_start = #{unemploymentStart},</if>
+			<if test="pensionBase == null ">pension_base = null,</if>
+			<if test="pensionStart == null">pension_start = null,</if>
+			<if test="medicalAddress == null  or medicalAddress == ''">medical_address = null,</if>
+			<if test="medicalBase == null ">medical_base = null,</if>
+			<if test="medicalStart == null">medical_start = null,</if>
+			<if test="injuryAddress == null or injuryAddress == ''">injury_address = null,</if>
+			<if test="injuryBase == null ">injury_base = null,</if>
+			<if test="injuryStart == null">injury_start = null,</if>
+			<if test="birthAddress == null or birthAddress == ''">birth_address = null,</if>
+			<if test="birthBase == null ">birth_base = null,</if>
+			<if test="birthStart == null">birth_start = null,</if>
+			<if test="unemploymentAddress == null or unemploymentAddress == ''">unemployment_address = null,</if>
+			<if test="unemploymentBase == null ">unemployment_base = null,</if>
+			<if test="unemploymentStart == null">unemployment_start = null,</if>
+			<if test="fundBase != null ">fund_base = #{fundBase},</if>
+			<if test="fundStart != null  and fundStart != ''">fund_start = #{fundStart},</if>
+			<if test="fundPersonalPer != null ">fund_personal_per = #{fundPersonalPer},</if>
+			<if test="fundCompanyPer != null ">fund_company_per = #{fundCompanyPer},</if>
+			<if test="fundBase == null ">fund_base = null,</if>
+			<if test="fundStart == null">fund_start = null,</if>
+			<if test="fundPersonalPer == null ">fund_personal_per = null,</if>
+			<if test="fundCompanyPer == null ">fund_company_per = null,</if>
+			<if test="dispatchCompany != null  and dispatchCompany != ''">dispatch_company = #{dispatchCompany},</if>
+			<if test="customerService != null  and customerService != ''">customer_service = #{customerService},</if>
+			<if test="contractMinorName != null  and contractMinorName != ''">contract_minor_name = #{contractMinorName},</if>
+			<if test="uniqueNumber != null  and uniqueNumber != ''">unique_number = #{uniqueNumber},</if>
+			<if test="customerNumber != null  and customerNumber != ''">customer_number = #{customerNumber},</if>
+			<if test="serviceType != null  and serviceType != ''">service_type = #{serviceType},</if>
+			<if test="pensionEndReduce != null  and pensionEndReduce != ''">pension_end_reduce = #{pensionEndReduce},</if>
+			<if test="medicalAddressReduce != null  and medicalAddressReduce != ''">medical_address_reduce = #{medicalAddressReduce},</if>
+			<if test="medicalEndReduce != null  and medicalEndReduce != ''">medical_end_reduce = #{medicalEndReduce},</if>
+			<if test="injuryAddressReduce != null  and injuryAddressReduce != ''">injury_address_reduce = #{injuryAddressReduce},</if>
+			<if test="injuryEndReduce != null  and injuryEndReduce != ''">injury_end_reduce = #{injuryEndReduce},</if>
+			<if test="birthAddressReduce != null  and birthAddressReduce != ''">birth_address_reduce = #{birthAddressReduce},</if>
+			<if test="birthEndReduce != null  and birthEndReduce != ''">birth_end_reduce = #{birthEndReduce},</if>
+			<if test="unemploymentAddressReduce != null  and unemploymentAddressReduce != ''">unemployment_address_reduce = #{unemploymentAddressReduce},</if>
+			<if test="unemploymentEndReduce != null  and unemploymentEndReduce != ''">unemployment_end_reduce = #{unemploymentEndReduce},</if>
+			<if test="fundEndReduce != null  and fundEndReduce != ''">fund_end_reduce = #{fundEndReduce},</if>
+			<if test="leaveDate != null ">leave_date = #{leaveDate},</if>
+			<if test="leaveReason != null  and leaveReason != ''">leave_reason = #{leaveReason},</if>
+			<if test="leaveReasonAdd != null  and leaveReasonAdd != ''">leave_reason_add = #{leaveReasonAdd},</if>
+			<if test="empTypeAdd != null  and empTypeAdd != ''">emp_type_add = #{empTypeAdd},</if>
+			<if test="unitIdAdd != null  and unitIdAdd != ''">unit_id_add = #{unitIdAdd},</if>
+			<if test="departIdAdd != null  and departIdAdd != ''">depart_id_add = #{departIdAdd},</if>
+			<if test="unitNameAdd != null  and unitNameAdd != ''">unit_name_add = #{unitNameAdd},</if>
+			<if test="departNameAdd != null  and departNameAdd != ''">depart_name_add = #{departNameAdd},</if>
+			<if test="socialHouseAdd != null  and socialHouseAdd != ''">social_house_add = #{socialHouseAdd},</if>
+			<if test="fundHouseAdd != null  and fundHouseAdd != ''">fund_house_add = #{fundHouseAdd},</if>
+			<if test="filingBaseAdd != null ">filing_base_add = #{filingBaseAdd},</if>
+			<if test="preStatus != null  and preStatus != ''">pre_status = #{preStatus},</if>
+			<if test="status != null  and status != ''">status = #{status},</if>
+			<if test="exceptionContent != null">exception_content = #{exceptionContent},</if>
+			<if test="dayLimit != null ">day_limit = #{dayLimit},</if>
+			<if test="dataSubStatus != null  and dataSubStatus != ''">data_sub_status = #{dataSubStatus},</if>
+			<if test="remark != null  and remark != ''">remark = #{remark},</if>
+			<if test="dispatchFlag != null  and dispatchFlag != ''">dispatch_flag = #{dispatchFlag},</if>
+			<if test="cancelRemark != null  and cancelRemark != ''">cancel_remark = #{cancelRemark},</if>
+		</trim>
+		where id = #{id}
+	</update>
+
+	<update id="updateBatchPreDispatchById" parameterType="com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo">
+		update t_pre_dispatch_info
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="date != null ">date = #{date},</if>
+			<if test="company != null  and company != ''">company = #{company},</if>
+			<if test="payAddress != null  and payAddress != ''">pay_address = #{payAddress},</if>
+			<if test="customerName != null  and customerName != ''">customer_name = #{customerName},</if>
+			<if test="empName != null  and empName != ''">emp_name = #{empName},</if>
+			<if test="empIdcard != null  and empIdcard != ''">emp_idcard = #{empIdcard},</if>
+			<if test="telOne != null  and telOne != ''">tel_one = #{telOne},</if>
+			<if test="telTwo != null  and telTwo != ''">tel_two = #{telTwo},</if>
+			<if test="entryDate != null ">entry_date = #{entryDate},</if>
+			<if test="formalSalary != null and formalSalary != ''">formal_salary = #{formalSalary},</if>
+			<if test="dispatchStart != null  and dispatchStart != ''">dispatch_start = #{dispatchStart},</if>
+			<if test="dispatchEnd != null  and dispatchEnd != ''">dispatch_end = #{dispatchEnd},</if>
+			<if test="contractType != null  and contractType != ''">contract_type = #{contractType},</if>
+			<if test="contractStart != null  and contractStart != ''">contract_start = #{contractStart},</if>
+			<if test="contractEnd != null  and contractEnd != ''">contract_end = #{contractEnd},</if>
+			<if test="contractNameAdd != null  and contractNameAdd != ''">
+				contract_name_add = #{contractNameAdd},
+			</if>
+			<if test="contractTypeAdd != null  and contractTypeAdd != ''">
+				contract_type_add = #{contractTypeAdd},
+			</if>
+			<if test="contractStartAdd != null  and contractStartAdd != ''">
+				contract_start_add = #{contractStartAdd},
+			</if>
+			<if test="contractEndAdd != null  and contractEndAdd != ''">
+				contract_end_add = #{contractEndAdd},
+			</if>
+			<if test="contractTermAdd != null  and contractTermAdd != ''">
+				contract_term_add = #{contractTermAdd},
+			</if>
+
+			<if test="contractNameAdd == null  or contractNameAdd == ''">
+				contract_name_add = null,
+			</if>
+			<if test="contractTypeAdd == null  or contractTypeAdd == ''">
+				contract_type_add = null,
+			</if>
+			<if test="contractStartAdd == null  or contractStartAdd == ''">
+				contract_start_add = null,
+			</if>
+			<if test="contractEndAdd == null  or contractEndAdd == ''">
+				contract_end_add = null,
+			</if>
+			<if test="contractTermAdd == null  or contractTermAdd == ''">
+				contract_term_add = null,
+			</if>
+			<if test="trialStart != null  and trialStart != ''">trial_start = #{trialStart},</if>
+			<if test="trialEnd != null  and trialEnd != ''">trial_end = #{trialEnd},</if>
+			<if test="trialSalary != null and  trialSalary !='' ">trial_salary = #{trialSalary},</if>
+			<if test="workingSystem != null  and workingSystem != ''">working_system = #{workingSystem},</if>
+			<if test="contractVersion != null  and contractVersion != ''">contract_version = #{contractVersion},</if>
+			<if test="telNotice != null  and telNotice != ''">tel_notice = #{telNotice},</if>
+			<if test="workingAddress != null  and workingAddress != ''">working_address = #{workingAddress},</if>
+			<if test="remarkOne != null  and remarkOne != ''">remark_one = #{remarkOne},</if>
+			<if test="remarkTwo != null  and remarkTwo != ''">remark_two = #{remarkTwo},</if>
+			<if test='type == "0"'>
+				<if test="pensionAddress != null  and pensionAddress != ''">
+					pension_address = #{pensionAddress},
+					<if test="socialProvince != null  and socialProvince != ''">social_province = #{socialProvince},</if>
+					<if test="socialCity != null  and socialCity != ''">social_city = #{socialCity},</if>
+					<if test="socialTown != null  and socialTown != ''">social_town = #{socialTown},</if>
+				</if>
+				<if test='pensionAddress == null || pensionAddress == ""'>
+					pension_address = null,
+					social_province = null,
+					social_city = null,
+					social_town = null,
+				</if>
+				<if test="fundAddress != null  and fundAddress != ''">
+					fund_address = #{fundAddress},
+					<if test="fundProvince != null  and fundProvince != ''">
+						fund_province = #{fundProvince},
+						<if test="fundCity == null">fund_city = null,</if>
+						<if test="fundTown == null">fund_town = null,</if>
+					</if>
+					<if test="fundCity != null  and fundCity != ''">fund_city = #{fundCity},</if>
+					<if test="fundTown != null  and fundTown != ''">fund_town = #{fundTown},</if>
+				</if>
+				<if test='fundAddress == null || fundAddress == ""'>
+					fund_address = null,
+					fund_province = null,
+					fund_city = null,
+					fund_town = null,
+				</if>
+			</if>
+			<if test='type == "1"'>
+				<if test="pensionAddressReduce != null  and pensionAddressReduce != ''">
+					pension_address_reduce = #{pensionAddressReduce},
+					pension_address = #{pensionAddressReduce},
+					<if test="socialProvince != null  and socialProvince != ''">social_province = #{socialProvince},</if>
+					<if test="socialCity != null  and socialCity != ''">social_city = #{socialCity},</if>
+					<if test="socialTown != null  and socialTown != ''">social_town = #{socialTown},</if>
+				</if>
+				<if test='pensionAddressReduce == null || pensionAddressReduce ==""'>
+					pension_address_reduce = null,
+					pension_end_reduce = null,
+					pension_address = null,
+					social_province = null,
+					social_city = null,
+					social_town = null,
+				</if>
+				<if test="fundAddressReduce != null  and fundAddressReduce != ''">
+					fund_address_reduce = #{fundAddressReduce},
+					fund_address = #{fundAddressReduce},
+					<if test="fundProvince != null  and fundProvince != ''">
+						fund_province = #{fundProvince},
+						<if test="fundCity == null">fund_city = null,</if>
+						<if test="fundTown == null">fund_town = null,</if>
+					</if>
+					<if test="fundCity != null  and fundCity != ''">fund_city = #{fundCity},</if>
+					<if test="fundTown != null  and fundTown != ''">fund_town = #{fundTown},</if>
+
+				</if>
+
+				<if test='fundAddressReduce == null || fundAddressReduce == ""'>
+					fund_address_reduce = null,
+					fund_address = null,
+					fund_end_reduce = null,
+					fund_province = null,
+					fund_city = null,
+					fund_town = null,
+				</if>
+			</if>
+			<if test="pensionBase != null ">pension_base = #{pensionBase},</if>
+			<if test="pensionStart != null  and pensionStart != ''">pension_start = #{pensionStart},</if>
+			<if test="medicalAddress != null  and medicalAddress != ''">medical_address = #{medicalAddress},</if>
+			<if test="medicalBase != null ">medical_base = #{medicalBase},</if>
+			<if test="medicalStart != null  and medicalStart != ''">medical_start = #{medicalStart},</if>
+			<if test="injuryAddress != null  and injuryAddress != ''">injury_address = #{injuryAddress},</if>
+			<if test="injuryBase != null ">injury_base = #{injuryBase},</if>
+			<if test="injuryStart != null  and injuryStart != ''">injury_start = #{injuryStart},</if>
+			<if test="birthAddress != null  and birthAddress != ''">birth_address = #{birthAddress},</if>
+			<if test="birthBase != null ">birth_base = #{birthBase},</if>
+			<if test="birthStart != null  and birthStart != ''">birth_start = #{birthStart},</if>
+			<if test="unemploymentAddress != null  and unemploymentAddress != ''">unemployment_address = #{unemploymentAddress},</if>
+			<if test="unemploymentBase != null ">unemployment_base = #{unemploymentBase},</if>
+			<if test="unemploymentStart != null  and unemploymentStart != ''">unemployment_start = #{unemploymentStart},</if>
+			<if test="pensionBase == null ">pension_base = null,</if>
+			<if test="pensionStart == null">pension_start = null,</if>
+			<if test="medicalAddress == null  or medicalAddress == ''">medical_address = null,</if>
+			<if test="medicalBase == null ">medical_base = null,</if>
+			<if test="medicalStart == null">medical_start = null,</if>
+			<if test="injuryAddress == null or injuryAddress == ''">injury_address = null,</if>
+			<if test="injuryBase == null ">injury_base = null,</if>
+			<if test="injuryStart == null">injury_start = null,</if>
+			<if test="birthAddress == null or birthAddress == ''">birth_address = null,</if>
+			<if test="birthBase == null ">birth_base = null,</if>
+			<if test="birthStart == null">birth_start = null,</if>
+			<if test="unemploymentAddress == null or unemploymentAddress == ''">unemployment_address = null,</if>
+			<if test="unemploymentBase == null ">unemployment_base = null,</if>
+			<if test="unemploymentStart == null">unemployment_start = null,</if>
+			<if test="fundBase != null ">fund_base = #{fundBase},</if>
+			<if test="fundStart != null  and fundStart != ''">fund_start = #{fundStart},</if>
+			<if test="fundPersonalPer != null ">fund_personal_per = #{fundPersonalPer},</if>
+			<if test="fundCompanyPer != null ">fund_company_per = #{fundCompanyPer},</if>
+			<if test="fundBase == null ">fund_base = null,</if>
+			<if test="fundStart == null">fund_start = null,</if>
+			<if test="fundPersonalPer == null ">fund_personal_per = null,</if>
+			<if test="fundCompanyPer == null ">fund_company_per = null,</if>
+			<if test="dispatchCompany != null  and dispatchCompany != ''">dispatch_company = #{dispatchCompany},</if>
+			<if test="customerService != null  and customerService != ''">customer_service = #{customerService},</if>
+			<if test="contractMinorName != null  and contractMinorName != ''">contract_minor_name = #{contractMinorName},</if>
+			<if test="uniqueNumber != null  and uniqueNumber != ''">unique_number = #{uniqueNumber},</if>
+			<if test="customerNumber != null  and customerNumber != ''">customer_number = #{customerNumber},</if>
+			<if test="serviceType != null  and serviceType != ''">service_type = #{serviceType},</if>
+			<if test="pensionEndReduce != null  and pensionEndReduce != ''">pension_end_reduce = #{pensionEndReduce},</if>
+			<if test="medicalAddressReduce != null  and medicalAddressReduce != ''">medical_address_reduce = #{medicalAddressReduce},</if>
+			<if test="medicalEndReduce != null  and medicalEndReduce != ''">medical_end_reduce = #{medicalEndReduce},</if>
+			<if test="injuryAddressReduce != null  and injuryAddressReduce != ''">injury_address_reduce = #{injuryAddressReduce},</if>
+			<if test="injuryEndReduce != null  and injuryEndReduce != ''">injury_end_reduce = #{injuryEndReduce},</if>
+			<if test="birthAddressReduce != null  and birthAddressReduce != ''">birth_address_reduce = #{birthAddressReduce},</if>
+			<if test="birthEndReduce != null  and birthEndReduce != ''">birth_end_reduce = #{birthEndReduce},</if>
+			<if test="unemploymentAddressReduce != null  and unemploymentAddressReduce != ''">unemployment_address_reduce = #{unemploymentAddressReduce},</if>
+			<if test="unemploymentEndReduce != null  and unemploymentEndReduce != ''">unemployment_end_reduce = #{unemploymentEndReduce},</if>
+			<if test="fundEndReduce != null  and fundEndReduce != ''">fund_end_reduce = #{fundEndReduce},</if>
+			<if test="leaveDate != null ">leave_date = #{leaveDate},</if>
+			<if test="leaveReason != null  and leaveReason != ''">leave_reason = #{leaveReason},</if>
+			<if test="leaveReasonAdd != null  and leaveReasonAdd != ''">leave_reason_add = #{leaveReasonAdd},</if>
+			<if test="empTypeAdd != null  and empTypeAdd != ''">emp_type_add = #{empTypeAdd},</if>
+			<if test="unitIdAdd != null  and unitIdAdd != ''">unit_id_add = #{unitIdAdd},</if>
+			<if test="departIdAdd != null  and departIdAdd != ''">depart_id_add = #{departIdAdd},</if>
+			<if test="socialHouseAdd != null  and socialHouseAdd != ''">social_house_add = #{socialHouseAdd},</if>
+			<if test="fundHouseAdd != null  and fundHouseAdd != ''">fund_house_add = #{fundHouseAdd},</if>
+			<if test="preStatus != null  and preStatus != ''">pre_status = #{preStatus},</if>
+			<if test="status != null  and status != ''">status = #{status},</if>
+			<if test="exceptionContent != null">exception_content = #{exceptionContent},</if>
+			<if test="dataSubStatus != null  and dataSubStatus != ''">data_sub_status = #{dataSubStatus},</if>
+			<if test="remark != null  and remark != ''">remark = #{remark},</if>
+			<if test="dispatchFlag != null  and dispatchFlag != ''">dispatch_flag = #{dispatchFlag},</if>
+			<if test="cancelRemark != null  and cancelRemark != ''">cancel_remark = #{cancelRemark},</if>
+		</trim>
+		where id = #{id}
+	</update>
+	<!-- 批量更新资料提交状态-->
+	<update id="modifyDataSubmitStatus">
+		update t_pre_dispatch_info
+		SET data_sub_status = #{status}
+		WHERE
+		<!--指定ID数据-->
+		<if test="idList != null and idList.size() > 0">
+			id in
+			<foreach collection="idList" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+	</update>
+
+	<!-- 批量清空资料提交状态-->
+	<update id="clearContractInfo">
+		<!--指定ID数据-->
+		<if test="idList != null and idList.size() > 0">
+			update t_pre_dispatch_info
+			SET
+			contract_name_add = null,
+			contract_type_add = null,
+			contract_start_add = null,
+			contract_end_add = null,
+			contract_term_add = null
+			WHERE
+			id in
+			<foreach collection="idList" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+	</update>
+	<update id="updatePreStatusById" parameterType="com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo">
+		update t_pre_dispatch_info
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="preStatus != null  and preStatus != ''">pre_status = #{preStatus},</if>
+			<if test="status != null  and status != ''">status = #{status},</if>
+			<if test="exceptionContent != null">exception_content = #{exceptionContent},</if>
+		</trim>
+		where id = #{id}
+	</update>
+	<resultMap id="tPreDispatchExportMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TPreDispatchExportVo">
+		<result property="type" column="type"/>
+		<result property="date" column="date"/>
+		<result property="company" column="company"/>
+		<result property="payAddress" column="pay_address"/>
+		<result property="customerName" column="customer_name"/>
+		<result property="empIdcard" column="emp_idcard"/>
+		<result property="empName" column="emp_name"/>
+		<result property="entryDate" column="entry_date"/>
+		<result property="formalSalary" column="formal_salary"/>
+		<result property="dispatchStart" column="dispatch_start"/>
+		<result property="dispatchEnd" column="dispatch_end"/>
+		<result property="contractStart" column="contract_start"/>
+		<result property="contractEnd" column="contract_end"/>
+		<result property="trialStart" column="trial_start"/>
+		<result property="trialEnd" column="trial_end"/>
+		<result property="trialSalary" column="trial_salary"/>
+		<result property="workingSystem" column="working_system"/>
+		<result property="contractVersion" column="contract_version"/>
+		<result property="telNotice" column="tel_notice"/>
+		<result property="workingAddress" column="working_address"/>
+		<result property="pensionAddress" column="pension_address"/>
+		<result property="pensionBase" column="pension_base"/>
+		<result property="pensionStart" column="pension_start"/>
+		<result property="medicalAddress" column="medical_address"/>
+		<result property="medicalBase" column="medical_base"/>
+		<result property="medicalStart" column="medical_start"/>
+		<result property="injuryAddress" column="injury_address"/>
+		<result property="injuryBase" column="injury_base"/>
+		<result property="injuryStart" column="injury_start"/>
+		<result property="birthAddress" column="birth_address"/>
+		<result property="birthBase" column="birth_base"/>
+		<result property="birthStart" column="birth_start"/>
+		<result property="unemploymentAddress" column="unemployment_address"/>
+		<result property="unemploymentBase" column="unemployment_base"/>
+		<result property="unemploymentStart" column="unemployment_start"/>
+		<result property="fundAddress" column="fund_address"/>
+		<result property="fundBase" column="fund_base"/>
+		<result property="fundStart" column="fund_start"/>
+		<result property="fundPersonalPer" column="fund_personal_per"/>
+		<result property="fundCompanyPer" column="fund_company_per"/>
+		<result property="dispatchCompany" column="dispatch_company"/>
+		<result property="customerService" column="customer_service"/>
+		<result property="contractMinorName" column="contract_minor_name"/>
+		<result property="uniqueNumber" column="unique_number"/>
+		<result property="customerNumber" column="customer_number"/>
+		<result property="serviceType" column="service_type"/>
+		<result property="pensionAddressReduce" column="pension_address_reduce"/>
+		<result property="pensionEndReduce" column="pension_end_reduce"/>
+		<result property="medicalAddressReduce" column="medical_address_reduce"/>
+		<result property="medicalEndReduce" column="medical_end_reduce"/>
+		<result property="injuryAddressReduce" column="injury_address_reduce"/>
+		<result property="injuryEndReduce" column="injury_end_reduce"/>
+		<result property="birthAddressReduce" column="birth_address_reduce"/>
+		<result property="birthEndReduce" column="birth_end_reduce"/>
+		<result property="unemploymentAddressReduce" column="unemployment_address_reduce"/>
+		<result property="unemploymentEndReduce" column="unemployment_end_reduce"/>
+		<result property="fundAddressReduce" column="fund_address_reduce"/>
+		<result property="fundEndReduce" column="fund_end_reduce"/>
+		<result property="leaveDate" column="leave_date"/>
+		<result property="leaveReason" column="leave_reason"/>
+		<result property="contractType" column="contract_type"/>
+		<result property="unitNameAdd" column="unit_name_add"/>
+		<result property="departNameAdd" column="depart_name_add"/>
+		<result property="filingBaseAdd" column="filing_base_add"/>
+		<result property="preStatus" column="pre_status"/>
+		<result property="status" column="status"/>
+		<result property="exceptionContent" column="exception_content"/>
+		<result property="dayLimit" column="day_limit"/>
+		<result property="dataSubStatus" column="data_sub_status"/>
+		<result property="telOne" column="tel_one"/>
+		<result property="telTwo" column="tel_two"/>
+		<result property="contractNameAdd" column="contract_name_add"/>
+		<result property="remarkOne" column="remark_one"/>
+		<result property="remarkTwo" column="remark_two"/>
+		<result property="dispatchFlag" column="dispatch_flag"/>
+		<result property="cancelRemark" column="cancel_remark"/>
+	</resultMap>
+</mapper>