Merge branch 'develop' into feature-licancan

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

@@ -30,8 +30,15 @@ public class DispatchEmpVo implements Serializable {
 	 */
 	@Schema(description = "主键")
 	private String id;
+
 	@ExcelProperty(value = "员工主码")
 	private String empCode;
+	/**
+	 * 员工项目编码
+	 */
+	@ExcelProperty(value = "员工项目编码")
+	private String empNo;
+
 
 	@Schema(description = "员工类型")
 	@ExcelAttribute(name = "员工类型", isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE)
@@ -191,4 +198,9 @@ public class DispatchEmpVo implements Serializable {
 	@Schema(description = "业务细分（存lable）", name = "contractName")
 	private String contractSubName;
 
+	/**
+	 * 项目状态（0正常；1已减项）
+	 */
+	@Schema(description ="项目状态（0正常；1已减项）")
+	private Integer projectStatus;
 }

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

@@ -31,10 +31,10 @@ public class EmpProjectDispatchVo implements Serializable {
 	@Size(max = 32, message = "人员档案主表id不可超过32位")
 	private String empId;
 	/**
-	 * 员工编码
+	 * 员工主码
 	 */
-	@Schema(description ="员工编码")
-	@Size(max = 20, message = "员工编码不可超过20位")
+	@Schema(description ="员工主码")
+	@Size(max = 20, message = "员工主码不可超过20位")
 	private String empCode;
 	/**
 	 * 员工类型（字典值，0外包1派遣2代理）
@@ -92,9 +92,9 @@ public class EmpProjectDispatchVo implements Serializable {
 	private String post;
 
 	/**
-	 * 员工编码
+	 * 员工项目编码
 	 */
-	@Schema(description ="员工编码")
-	@Size(max = 20, message = "员工编码不可超过20位")
+	@Schema(description ="员工项目编码")
+	@Size(max = 20, message = "员工项目编码不可超过20位")
 	private String empNo;
 }

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

@@ -58,7 +58,7 @@ public class ProjectSetInfoVo implements Serializable {
 	 * 商险结算类型：0预估  1 实缴
 	 */
 	@Schema(description = "商险结算类型")
-	private String insuranceSettleType;
+	private String insuranceSettleType = CommonConstants.ONE_STRING;
 
 
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpFamilyController.java

@@ -19,19 +19,15 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpFamily;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpFamilyService;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.DispatchCheckVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.FamilySearchVO;
-import com.yifu.cloud.plus.v1.yifu.archives.vo.ProjectSetInfoVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprCheckProperties;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
-import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -44,10 +40,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 
 /**

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java

@@ -2110,6 +2110,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 						}
 						contractMapper.insert(contract);
 						contractAdd.setId(contract.getId());
+						contractAdd.setEmpNo(contract.getEmpNo());
 						contractsMap.put(contractAdd.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + contractAdd.getDeptNo(), contractAdd);
 					}
 				} catch (Exception e) {
@@ -2131,8 +2132,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 						employeeInfo = new TEmployeeInfo();
 						BeanUtil.copyProperties(empAdd, employeeInfo);
 						employeeInfo.setEmpCode(getCode());
+						employeeInfo.setStatus(CommonConstants.ZERO_INT);
 						baseMapper.insert(employeeInfo);
 						empAdd.setId(employeeInfo.getId());
+						empAdd.setEmpCode(employeeInfo.getEmpCode());
 						empAddsMap.put(empAdd.getEmpIdcard(), empAdd);
 					}
 				} catch (Exception e) {

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml

@@ -142,6 +142,8 @@
 		<result property="fileTown" column="FILE_TOWN"/>
 		<result property="hignEducation" column="HIGN_EDUCATION"/>
 		<result property="fileStatus" column="FILE_STATUS"/>
+		<result property="projectStatus" column="PROJECT_STATUS"/>
+
 
 		<result property="contractName" column="CONTRACT_NAME"/>
 		<result property="contractType" column="CONTRACT_TYPE"/>
@@ -157,6 +159,8 @@
 		<result property="deptName" column="DEPT_NAME"/>
 		<result property="deptNo" column="DEPT_NO"/>
 		<result property="post" column="POST"/>
+		<result property="empNo" column="EMP_NO"/>
+
 	</resultMap>
 	<sql id="baseParam">
 		a
@@ -673,7 +677,7 @@
 		b.CONTRACT_START,b.CONTRACT_END,b.CONTRACT_TERM,b.CONTRACT_SUB_NAME,b.CONTRACT_ID,
 
 		c.UNIT_NAME,
-		c.UNIT_NO,c.DEPT_ID,c.DEPT_NAME,c.DEPT_NO,c.POST
+		c.UNIT_NO,c.DEPT_ID,c.DEPT_NAME,c.DEPT_NO,c.POST,c.EMP_NO,c.PROJECT_STATUS
 		from (
 		select e.ID,e.EMP_CODE,e.EMP_NATRUE,e.EMP_NAME,e.EMP_IDCARD,e.EMP_NATIONAL,e.EMP_PHONE,e.ID_PROVINCE,e.ID_CITY,
 		e.ID_TOWN,e.EMP_REGIS_TYPE,e.FILE_PROVINCE,e.FILE_CITY,e.FILE_TOWN,e.HIGN_EDUCATION,e.FILE_STATUS
@@ -689,7 +693,7 @@
 		</if>
 		) a
 		left join (
-		select p.UNIT_NAME,p.UNIT_NO,p.DEPT_ID,p.DEPT_NAME,p.DEPT_NO,p.POST,p.EMP_ID
+		select p.UNIT_NAME,p.UNIT_NO,p.DEPT_ID,p.DEPT_NAME,p.DEPT_NO,p.POST,p.EMP_ID,p.EMP_NO,P.PROJECT_STATUS
 		from t_employee_project p
 		where 1=1
 		<if test="checkVo != null">

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

@@ -290,7 +290,7 @@ public interface CommonConstants {
 
 	public static final String ZIP_TYPE = "zip";
 	int BATCH_COUNT = 100;
-	String IMPORT_DATA_ANALYSIS_ERROR = "数据导入解析异常，请检查表数据格式";
+	String IMPORT_DATA_ANALYSIS_ERROR = "数据导入解析异常，请检查表数据格式（1.日期格式:yyyy-MM-dd,2.比例为整数且不含%）";
     String CREATE_TIME = "CREATE_TIME";
 	String ID = "ID";
 	String PARAM_IS_NOT_ERROR = "传参异常，请检查参数";

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

@@ -337,7 +337,7 @@ public interface ErrorCodes {
 	String EMP_DISPATCH_SOCIAL_NOT_EMPTY = "emp.dispatch.social.not.empty";
 
 	/**
-	 * 派单信息不可为空
+	 * 派单公积金信息不可为空
 	 */
 	String EMP_DISPATCH_FUND_NOT_EMPTY = "emp.dispatch.fund.not.empty";
 
@@ -424,4 +424,16 @@ public interface ErrorCodes {
 	 * 派增异常： 自定义缴纳养老基数不可为空
 	 */
 	String EMP_DISPATCH_SOCIAL_DIY_NOT_EMPTY = "emp.dispatch.social.diy.not.empty";
+	/**
+	 * 派增异常： 对应项目编码的项目档案已减项，请去项目档案处复项
+	 */
+	String EMP_DISPATCH_EMP_PROJECT_NOT_USED = "emp.dispatch.emp.project.not.used";
+	/**
+	 * 派增异常： 对应身份证的人员档案已减档
+	 */
+	String EMP_DISPATCH_EMP_NOT_USED = "emp.dispatch.emp.not.used";
+	/**
+	 * 派增异常： 社保派单基数不可小于最低基数且不可大于最高基数
+	 */
+	String EMP_DISPATCH_SOCIAL_LIMIT_ERROR = "emp.dispatch.social.limit.error";
 }

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

@@ -312,7 +312,7 @@ public class ExcelUtil <T> implements Serializable {
 				}
 				if (Common.isNotNull(tempStr)){
 					c = tempStr;
-					mapArea.put(tempStr,field);
+					mapArea.put(tempStr+CommonConstants.DOWN_LINE_STRING+attr.name(),field);
 				}
 				// 取得类型,并根据对象类型设置值.
 				fieldType = field.getType();
@@ -377,7 +377,7 @@ public class ExcelUtil <T> implements Serializable {
 			}
 			if (Common.isNotNull(mapArea)){
 				for (Map.Entry<String, Field> entry: mapArea.entrySet()){
-					entry.getValue().set(data,entry.getKey());
+					entry.getValue().set(data,entry.getKey().substring(0,entry.getKey().indexOf(CommonConstants.DOWN_LINE_STRING)));
 				}
 			}
 		}catch (Exception e){

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

@@ -153,7 +153,13 @@ emp.dispatch.reduce.exists=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u672C\u6B21\u6D3E\u58
 
 socialinfo.list.num.large=\u5F53\u524D\u793E\u4FDD\u5BFC\u5165\u961F\u5217\u4E0D\u8DB3\u6216\u8005\u6570\u636E\u91CF\u8FC7\u5927\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\uFF01
 
+emp.dispatch.social.diy.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u81EA\u5B9A\u4E49\u7F34\u7EB3\u517B\u8001\u57FA\u6570\u4E0D\u53EF\u4E3A\u7A7A
 
+emp.dispatch.emp.project.not.used=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5BF9\u5E94\u9879\u76EE\u7F16\u7801\u7684\u9879\u76EE\u6863\u6848\u5DF2\u51CF\u9879\uFF0C\u8BF7\u53BB\u9879\u76EE\u6863\u6848\u5904\u590D\u9879
+
+emp.dispatch.emp.not.used=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5BF9\u5E94\u8EAB\u4EFD\u8BC1\u7684\u4EBA\u5458\u6863\u6848\u5DF2\u51CF\u6863
+
+emp.dispatch.social.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u6D3E\u5355\u57FA\u6570\u4E0D\u53EF\u5C0F\u4E8E\u6700\u4F4E\u57FA\u6570\u4E14\u4E0D\u53EF\u5927\u4E8E\u6700\u9AD8\u57FA\u6570
 
 
 

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

@@ -171,5 +171,9 @@ public class InsuranceRefundListVo implements Serializable {
 	@Schema(description = "减员状态 1待减员 2减员中3减员退回")
 	private Integer reduceHandleStatus;
 
-
+	/**
+	 * 购买月数
+	 */
+	@Schema(description = "购买月数")
+	private Long buyMonth;
 }

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

@@ -2121,6 +2121,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
 				Map<String, ProjectSetInfoVo>  data = setInfoByCodes.getData().getProjectSetInfoVoMap();
 				for (InsuredListVo record : insuredList) {
+					//购买月数
+					record.setBuyMonth(LocalDateUtil.betweenMonth(record.getPolicyStart().toString(),record.getPolicyEnd().toString()));
 					ProjectSetInfoVo jsonObject =  data.get(record.getDeptNo());
 					if (null != jsonObject){
 						record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
@@ -2149,6 +2151,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
 				Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
 				for (InsuranceRefundListVo record : insuranceRefundPageList.getRecords()) {
+					//购买月数
+					record.setBuyMonth(LocalDateUtil.betweenMonth(record.getPolicyStart().toString(),record.getPolicyEnd().toString()));
 					ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
 					if (null != jsonObject){
 						record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
@@ -2176,6 +2180,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
 				Map<String, ProjectSetInfoVo>  data = setInfoByCodes.getData().getProjectSetInfoVoMap();
 				for (InsuranceRefundListVo record : insuranceRefundList) {
+					//购买月数
+					record.setBuyMonth(LocalDateUtil.betweenMonth(record.getPolicyStart().toString(),record.getPolicyEnd().toString()));
 					ProjectSetInfoVo jsonObject = data.get(record.getDeptNo());
 					if (null != jsonObject){
 						record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
@@ -2483,8 +2489,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		}
 		Integer reduceHandleStatus = insuranceDetail.getReduceHandleStatus();
 		Integer buyHandleStatus = insuranceDetail.getBuyHandleStatus();
-		if(!(CommonConstants.THREE_INT == buyHandleStatus && (null == reduceHandleStatus ||CommonConstants.THREE_INT == reduceHandleStatus))){
-			return R.failed("当前保单信息非已投保且未减员状态，不能进行出险操作");
+		if(CommonConstants.ONE_INT == buyHandleStatus || CommonConstants.TWO_INT == buyHandleStatus ||CommonConstants.FOUR_INT == buyHandleStatus){
+			return R.failed("当前员工未投保成功，不能进行出险操作");
+		}
+		if(CommonConstants.FIVE_INT == buyHandleStatus){
+			return R.failed("当前员工已减员，不能进行出险操作");
+		}
+		if(null != reduceHandleStatus){
+			return R.failed("当前员工在减员中，不能进行出险操作");
 		}
 		Integer isEffect = insuranceDetail.getIsEffect();
 		if(CommonConstants.ZERO_INT != isEffect){

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/DispatchConstants.java

@@ -38,7 +38,7 @@ public class DispatchConstants {
 
 	/**
      * 社保派单
-     * '缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳） PAYMENT_TYPE
+     * '缴纳类型（0最低缴纳、1自定义、2最高缴纳） PAYMENT_TYPE
      */
     enum PaymentType {
         LATEST("0", "最低"),

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

@@ -121,7 +121,8 @@ public class TPreDispatchInfo extends BaseEntity {
      * 入职日期
      */
     @Schema(description ="入职日期")
-    private Date entryDate;
+	@Size(max = 20, message = "入职日期不可超过20位")
+    private String entryDate;
 
     /**
      * 正式工资
@@ -345,6 +346,7 @@ public class TPreDispatchInfo extends BaseEntity {
      * 派单客服
      */
     @Schema(description ="派单客服")
+	@Size(max = 20, message = "派单客服不可超过20位")
     private String customerService;
 
     /**
@@ -357,6 +359,7 @@ public class TPreDispatchInfo extends BaseEntity {
      * 唯一号
      */
     @Schema(description ="唯一号")
+	@Size(max = 20, message = "唯一号不可超过20位")
     private String uniqueNumber;
 
     /**
@@ -369,6 +372,7 @@ public class TPreDispatchInfo extends BaseEntity {
      * 服务类别
      */
     @Schema(description ="服务类别")
+	@Size(max = 20, message = "服务类别不可超过20位")
     private String serviceType;
 
     /**

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

@@ -298,11 +298,11 @@ public class TSocialFundHistory extends BaseEntity {
 	@ExcelProperty("个人公积金金额" )
 	private BigDecimal personalFundMoney;
 	/**
-	 * 缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）
+	 * 缴纳类型（0最低缴纳、1自定义、2最高缴纳）
 	 */
-	@ExcelAttribute(name = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）" )
-	@Schema(description = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）" )
-	@ExcelProperty("缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）" )
+	@ExcelAttribute(name = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
+	@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
+	@ExcelProperty("缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
 	private Integer paymentType;
 	/**
 	 * 是否是社保：0否1是

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

@@ -610,10 +610,10 @@ public class TSocialFundInfo extends BaseEntity {
 	/**
 	 * 缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）
 	 */
-	@Length(max = 1, message = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳） 不能超过1个字符" )
-	@ExcelAttribute(name = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）", maxLength = 1)
-	@Schema(description = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）" )
-	@ExcelProperty("缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）" )
+	@Length(max = 1, message = "缴纳类型（0最低缴纳、1自定义、2最高缴纳） 不能超过1个字符" )
+	@ExcelAttribute(name = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）", maxLength = 1)
+	@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
+	@ExcelProperty("缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
 	private String paymentType;
 	/**
 	 * 基数上限（社保或公积金）

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

@@ -625,12 +625,12 @@ public class TSocialInfo extends BaseEntity {
 	@ExcelProperty("电信编号" )
 	private String telecomNumber;
 	/**
-	 * 缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）
+	 * 缴纳类型（0最低缴纳、1自定义、2最高缴纳）
 	 */
-	@Length(max = 1, message = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳） 不能超过1个字符" )
-	@ExcelAttribute(name = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）", maxLength = 1)
-	@Schema(description = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）" )
-	@ExcelProperty("缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）" )
+	@Length(max = 1, message = "缴纳类型（0最低缴纳、1自定义、2最高缴纳） 不能超过1个字符" )
+	@ExcelAttribute(name = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）", maxLength = 1)
+	@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
+	@ExcelProperty("缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
 	private String paymentType;
 	/**
 	 * 备案基数

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

@@ -203,10 +203,10 @@ public class SocialHandleExportVo implements Serializable {
 	private String recordBase;
 
 	/**
-	 * 缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）
+	 * 缴纳类型（0最低缴纳、1自定义、2最高缴纳）
 	 */
-	@ExcelAttribute(name = "缴纳类型",isDataId = true,readConverterExp = "0=最低缴纳,1=自定义缴纳,2=最高缴纳",needExport = true)
-	@Schema(description = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）")
+	@ExcelAttribute(name = "缴纳类型",isDataId = true,readConverterExp = "0=最低缴纳,1=自定义,2=最高缴纳",needExport = true)
+	@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）")
 	@ExcelProperty("缴纳类型" )
 	private Integer paymentType;
 	/**

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

@@ -130,7 +130,7 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	/**
 	 * 档案-县
 	 */
-	@ExcelAttribute(name = "档案-县" ,isArea = true,parentField = "fileCity", isNotEmpty = true)
+	@ExcelAttribute(name = "档案-县" ,isArea = true,parentField = "fileCity")
 	@Schema(description = "档案-县" )
 	@ExcelProperty("档案-县" )
 	private String fileTown;
@@ -239,9 +239,9 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	/**
 	 * 学历名称
 	 */
-	@ExcelAttribute(name = "学历",isDataId = true,dataType = ExcelAttributeConstants.EDUCATION)
+	@ExcelAttribute(name = "学历")
 	@NotNull(message = "学历不可为空")
-	@Schema(description = "学历：无档案的时候 新增档案时同步新增学历" )
+	@Schema(description = "学历：派增只做记录" )
 	@ExcelProperty(value ="学历")
 	private String educationName;
 
@@ -306,11 +306,11 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	@ExcelProperty("大病起缴日期" )
 	private Date bigailmentStart;
 	/**
-	 * 缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）
+	 * 缴纳类型（0最低缴纳、1自定义、2最高缴纳）
 	 */
 	@Length(max = 1, message = "缴纳类型 不能超过1 个字符" )
-	@ExcelAttribute(name = "缴纳类型", isDataId = true, readConverterExp = "0=最低缴纳,1=自定义缴纳,2=最高缴纳")
-	@Schema(description = "缴纳类型:（0最低缴纳、1自定义缴纳、2最高缴纳）" )
+	@ExcelAttribute(name = "缴纳类型", isDataId = true, readConverterExp = "0=最低缴纳,1=自定义,2=最高缴纳")
+	@Schema(description = "缴纳类型:（0最低缴纳、1自定义、2最高缴纳）" )
 	@ExcelProperty("缴纳类型" )
 	private String paymentType;
 

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

@@ -75,7 +75,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
      * 入职日期
      */
     @ExcelAttribute(name = "入职日期")
-    private Date entryDate;
+    private String entryDate;
     /**
      * 正式工资
      */

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

@@ -303,8 +303,8 @@ public class TSocialFundInfoExportVo extends RowIndex implements Serializable {
 	@ExcelProperty("大病起缴日期")
 	private Date bigailmentStart;
 
-	@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低缴纳,1=自定义缴纳,2=最高缴纳")
-	@Schema(description = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）")
+	@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低缴纳,1=自定义,2=最高缴纳")
+	@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）")
 	@ExcelProperty("缴纳类型")
 	private String paymentType;
 

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

@@ -301,8 +301,8 @@ public class TSocialFundInfoVo extends RowIndex implements Serializable {
 	@ExcelProperty("大病起缴日期")
 	private Date bigailmentStart;
 
-	@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低缴纳,1=自定义缴纳,2=最高缴纳")
-	@Schema(description = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）")
+	@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低缴纳,1=自定义,2=最高缴纳")
+	@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）")
 	@ExcelProperty("缴纳类型")
 	private String paymentType;
 

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

@@ -622,10 +622,10 @@ public class TSocialInfoVo extends RowIndex implements Serializable {
 	/**
 	 * 缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）
 	 */
-	@Length(max = 1, message = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳） 不能超过1 个字符" )
-	@ExcelAttribute(name = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）", maxLength = 1)
-	@Schema(description = "缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）" )
-	@ExcelProperty("缴纳类型（0最低缴纳、1自定义缴纳、2最高缴纳）" )
+	@Length(max = 1, message = "缴纳类型（0最低缴纳、1自定义、2最高缴纳） 不能超过1 个字符" )
+	@ExcelAttribute(name = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）", maxLength = 1)
+	@Schema(description = "缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
+	@ExcelProperty("缴纳类型（0最低缴纳、1自定义、2最高缴纳）" )
 	private String paymentType;
 	/**
 	 * 备案基数

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

@@ -45,5 +45,6 @@ public class PreDispatchConstants {
     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 TEL_INVALID2 = "联系电话2无效！";
 	public static final String GET_AREA_INFO = "获取区域数据失败！";
 }

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

@@ -91,8 +91,8 @@ public class TAgentConfigController {
     @SysLog("新增预估临时政策配置表" )
     @PostMapping
     @PreAuthorize("@pms.hasPermission('social_tagentconfig_add')" )
-    public R<Boolean> save(@RequestBody TAgentConfig tAgentConfig) {
-        return R.ok(tAgentConfigService.save(tAgentConfig));
+    public R save(@RequestBody TAgentConfig tAgentConfig) {
+        return tAgentConfigService.saveInfo(tAgentConfig);
     }
 
     /**

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

@@ -28,24 +28,21 @@ import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TDispatchInfo;
 import com.yifu.cloud.plus.v1.yifu.social.service.TDispatchInfoService;
-import com.yifu.cloud.plus.v1.yifu.social.vo.*;
+import com.yifu.cloud.plus.v1.yifu.social.vo.DispatchDetailVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.FundSupplementaryExportVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.SocialHandleSearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoSearchVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.log4j.Log4j2;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.time.LocalDateTime;
-import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -73,6 +70,7 @@ public class TDispatchInfoController {
     @Operation(description = "简单分页查询")
     @GetMapping("/page")
     public R<IPage<TDispatchInfo>> getTDispatchInfoPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
+		tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
         return  new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
     }
 
@@ -85,6 +83,7 @@ public class TDispatchInfoController {
     @PostMapping("/noPage" )
     //@PreAuthorize("@pms.hasPermission('demo_tdispatchinfo_get')" )
     public R<List<TDispatchInfo>> getTDispatchInfoNoPage(@RequestBody TDispatchInfoSearchVo tDispatchInfo) {
+		tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
         return R.ok(tDispatchInfoService.noPageDiy(tDispatchInfo));
     }
 	/**
@@ -101,6 +100,7 @@ public class TDispatchInfoController {
 			return  R.failed(CommonConstants.USER_FAIL);
 		}
 		tDispatchInfo.setCreateBy(user.getId());
+		tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
 		return  new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
 	}
 
@@ -114,6 +114,7 @@ public class TDispatchInfoController {
 	@GetMapping("/pageAudit")
 	public R<IPage<TDispatchInfo>> getTDispatchAuditPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo) {
 		tDispatchInfo.setStatus(CommonConstants.ZERO_STRING);
+		tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
 		return  new R<>(tDispatchInfoService.getTDispatchInfoPage(page,tDispatchInfo));
 	}
 
@@ -130,6 +131,7 @@ public class TDispatchInfoController {
 		List<String> settleDomains = null;
 		// 获取自定义sql TODO
 		String sql = CommonConstants.EMPTY_STRING;
+		tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
 		return  new R<>(tDispatchInfoService.getTDispatchSocialHandlePage(page,tDispatchInfo,settleDomains,sql));
 	}
 
@@ -146,6 +148,7 @@ public class TDispatchInfoController {
 		List<String> settleDomains = null;
 		// 获取自定义sql TODO
 		String sql = CommonConstants.EMPTY_STRING;
+		tDispatchInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
 		return  new R<>(tDispatchInfoService.getTDispatchFundHandlePage(page,tDispatchInfo,settleDomains,sql));
 	}
     /**
@@ -262,9 +265,9 @@ public class TDispatchInfoController {
 	 * @Param
 	 * @return
 	**/
-	@Operation(description = "派单申请批量审核，传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyAudit')")
+	@Operation(description = "派单申请批量审核，传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyAudit') auditStatus:1审核通过 2审核不通过")
 	@PostMapping("/addApplyAudit")
-	@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyAudit')")
+	//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyAudit')")
 	public R<List<ErrorMessage>> addApplyAudit(@RequestParam(name = "ids", required = true) String ids,
 									@RequestParam(name = "auditStatus", required = true) String auditStatus,
 									@RequestParam(name = "auditRemark", required = false) String auditRemark) {
@@ -283,9 +286,9 @@ public class TDispatchInfoController {
 	 * @Author fxj
 	 * @Date 2019-09-27
 	 **/
-	@Operation(description = "派单批量办理，传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyHandle')")
+	@Operation(description = "派单批量办理，传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyHandle') handleStatus 1 办理成功 2 办理失败")
 	@PostMapping("/addApplyHandle")
-	@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyHandle')")
+	//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyHandle')")
 	public R<List<ErrorMessage>> addApplyHandle(@RequestParam(name = "ids", required = true) String ids,
 									 @RequestParam(name = "typeSub", required = true) String typeSub,
 									 @RequestParam(name = "auditStatus", required = true) String handleStatus,

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

@@ -96,6 +96,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
 	IPage<TDispatchInfo> getTDispatchSocialHandlePage(Page<TDispatchInfo> page,
 													  @Param("tDispatchInfo") SocialHandleSearchVo tDispatchInfo,
 													  @Param("settleDomainIds")List<String> settleDomains,
+													  @Param("idsStr") List<String> idsStr,
 													  @Param("sql")String sql);
 	/**
 	 * 公积金办理页面查询
@@ -109,6 +110,7 @@ public interface TDispatchInfoMapper extends BaseMapper<TDispatchInfo> {
 	IPage<TDispatchInfo> getTDispatchFundHandlePage(Page<TDispatchInfo> page,
 													@Param("tDispatchInfo")SocialHandleSearchVo tDispatchInfo,
 													@Param("settleDomainIds")List<String> settleDomains,
+													@Param("idsStr") List<String> idsStr,
 													@Param("sql")String sql);
 	/**
 	 * @Author fxj

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

@@ -44,4 +44,11 @@ public interface TAgentConfigService extends IService<TAgentConfig> {
 	 * @return
 	 */
 	R updateFlagById(String id);
+
+	/**
+	 * 修改开启关闭状态
+	 * @param tAgentConfig 预估临时政策配置表id
+	 * @return
+	 */
+	R saveInfo(TAgentConfig tAgentConfig);
 }

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

@@ -26,7 +26,6 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFundInfo;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 
 /**
  * 预估费用
@@ -74,6 +73,15 @@ public interface TForecastLibraryService extends IService<TForecastLibrary> {
 	 **/
 	R<String> updateForecastLibaryByDispatch(TSocialFundInfo socialFundInfo);
 
+	/**
+	 * @param socialFundInfo
+	 * @Description: 派单减少变更预估库-派减
+	 * @Author: hgw
+	 * @Date: 2022/7/26 19:02
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	R<String> updateForecastLibaryByDispatchReduce(TSocialFundInfo socialFundInfo);
+
 	/**
 	 * @Description: 基数变更，同步社保公积金查询、预估库 TODO-加定时器
 	 * @Author: hgw

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

@@ -16,7 +16,10 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.service.impl;
 
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
@@ -69,4 +72,22 @@ public class TAgentConfigServiceImpl extends ServiceImpl<TAgentConfigMapper, TAg
 			return R.failed("更新失败！");
 		}
 	}
+
+	@Override
+	public R saveInfo(TAgentConfig tAgentConfig) {
+		LambdaQueryWrapper<TAgentConfig> wrapper = Wrappers.lambdaQuery();
+		wrapper.eq(TAgentConfig::getYear, tAgentConfig.getYear());
+		wrapper.eq(TAgentConfig::getTarget, tAgentConfig.getTarget());
+		if (Common.isNotNull(tAgentConfig.getCity())){
+			wrapper.eq(TAgentConfig::getCity,tAgentConfig.getCity());
+		} else {
+			wrapper.eq(TAgentConfig::getProvince,tAgentConfig.getProvince());
+		}
+		wrapper.last(CommonConstants.LAST_ONE_SQL);
+		TAgentConfig count = baseMapper.selectOne(wrapper);
+		if (Common.isNotNull(count)) {
+			return R.failed("同一城市，年度的政策不能重复新增");
+		}
+		return R.ok();
+	}
 }

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

@@ -326,8 +326,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			socialSet = socialHoldMap.get(excel.getSocialHousehold());
 			socialFund = getSocialFund(socialFundMap,excel);
 			setInfoVo = getSetInfoVo(projectVoMap,excel);
+			if (Common.isNotNull(empVoMap)) {
+				empVo = empVoMap.get(excel.getEmpIdcard());
+			}
 			// 数据合法情况
-			if (validImport(errorMessageList, excel,setInfoVo,socialFundMap)) {
+			if (validImport(errorMessageList, excel,setInfoVo,socialFundMap,empVo,socialSet)) {
 				excelVOTemp.put(excel.getEmpIdcard(),excel.getEmpIdcard());
 				continue;
 			}
@@ -350,9 +353,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				excelVOTemp.put(excel.getEmpIdcard(),excel.getEmpIdcard());
 				continue;
 			}
-			if (Common.isNotNull(empVoMap)) {
-				empVo = empVoMap.get(excel.getEmpIdcard());
-			}
 			// 初始化新增信息：档案、项目档案、员工合同
 			initAddInfo(empAddsMap, contractsMap, projectsMap, empVo, excel);
 			// 新增社保
@@ -412,7 +412,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		Map<String, EmpContractDispatchVo> contractsMap = null;
 		Map<String, EmpProjectDispatchVo> projectsMap = null;
 		TDispatchImportVo excel;
-		DispatchEmpVo empVo;
 		EmpContractDispatchVo contract = null;
 		EmpProjectDispatchVo project = null;
 		EmpAddDispatchVo emp = null;
@@ -430,32 +429,30 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			if (Common.isNotNull(excelVOTemp) && Common.isNotNull(excelVOTemp.get(excel.getEmpIdcard()))){
 				continue;
 			}
-			empVo = getEmpVoMap(empVoMap,excel);
 			// 验证档案是否插入成功  如果MAP 无数据直接不处理
-			if (Common.isEmpty(empVo) && Common.isNotNull(empAddsMap)){
+			if (Common.isNotNull(empAddsMap)){
 				emp = empAddsMap.get(excel.getEmpIdcard());
-				if (Common.isEmpty(emp) || Common.isEmpty(emp.getId())){
+				if (Common.isNotNull(emp) && Common.isEmpty(emp.getId())){
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_ADD_EMP_ERROR)));
 					continue;
 				}
-			}else if (Common.isNotNull(empVo)){
+			}
 			// 验证合同是否插入成功
-				if (Common.isEmpty(empVo.getContractType()) && Common.isNotNull(contractsMap)){
+			if (Common.isNotNull(contractsMap)){
 				contract = contractsMap.get(excel.getEmpIdcard()+CommonConstants.DOWN_LINE_STRING+excel.getSettleDomainCode());
-					if (Common.isEmpty(contract) || Common.isEmpty(contract.getId())){
+				if (Common.isNotNull(contract) && Common.isEmpty(contract.getId())){
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_ADD_CONTRACT_ERROR)));
 					continue;
 				}
 			}
 			// 验证项目档案是否插入成功
-				if (Common.isEmpty(empVo.getEmpCode()) && Common.isNotNull(projectsMap)){
+			if (Common.isNotNull(projectsMap)){
 				project = projectsMap.get(excel.getEmpIdcard()+CommonConstants.DOWN_LINE_STRING+excel.getSettleDomainCode());
-					if (Common.isEmpty(project) || Common.isEmpty(project.getId())){
+				if (Common.isNotNull(project) && Common.isEmpty(project.getId())){
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_ADD_PROJECT_ERROR)));
 					continue;
 				}
 			}
-			}
 			try {
 				// 插入社保信息并封装社保公积金查询信息
 				if (Common.isNotNull(socialsMap)){
@@ -480,6 +477,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						if (Common.isNotNull(contract)){
 							dispatch.setContractId(contract.getId());
 						}
+						if (Common.isNotNull(project)){
+							dispatch.setEmpNo(project.getEmpNo());
+						}
 					}
 					insertDispatch(emp, dispatch);
 				}
@@ -497,16 +497,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				continue;
 			}
 			errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN));
+		}
 		// 清理map list 等数据
 		Common.clear(empAddsMap);
 		Common.clear(contractsMap);
 		Common.clear(projectsMap);
-
-		}
-	}
-
-	private DispatchEmpVo getEmpVoMap(Map<String, DispatchEmpVo> empVoMap, TDispatchImportVo excel) {
-		return Common.isNotNull(empVoMap)?empVoMap.get(excel.getEmpIdcard()):null;
 	}
 
 	private void insertSocial(EmpAddDispatchVo emp, TSocialInfo social) {
@@ -538,6 +533,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				dispatch.setSettleDomain(emp.getDeptId());
 				dispatch.setSettleDomainName(emp.getDeptName());
 			}
+			dispatch.setCreateTime(LocalDateTime.now());
 			baseMapper.insert(dispatch);
 		}
 	}
@@ -566,6 +562,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				if (Common.isEmpty(socialFund.getFirstBuyMonthSocial())){
 					socialFund.setFirstBuyMonthSocial(social.getSocialStartDate());
 				}
+				socialFund.setUnitBigailmentMoney(social.getUnitBigailmentMoney());
+				socialFund.setPersonalBigailmentMoney(social.getPersonalBigailmentMoney());
 				socialFund.setUnitPensionCardinal(social.getUnitPensionCardinal());
 				socialFund.setUnitMedicalCardinal(social.getUnitMedicalCardinal());
 				socialFund.setUnitUnemploymentCardinal(social.getUnitUnemploymentCardinal());
@@ -687,7 +685,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		if (Common.isEmpty(socialFund)){
 			socialFund = new TSocialFundInfo();
 			if (Common.isNotNull(empVo)){
-				socialFund.setEmpNo(empVo.getEmpCode());
+				socialFund.setEmpNo(empVo.getEmpNo());
 				socialFund.setEmpName(empVo.getEmpName());
 				socialFund.setEmpIdcard(empVo.getEmpIdcard());
 				socialFund.setEmpId(empVo.getId());
@@ -710,7 +708,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				socialFund.setSocialStatus(CommonConstants.ZERO_STRING);
 				socialFund.setSocialStartDate(excel.getPensionStart());
 				if (Common.isNotNull(socialSet)){
-					socialFund.setSocialHousehold(socialSet.getId());
+					socialFund.setSocialHousehold(socialSet.getDepartId());
 					socialFund.setSocialHouseholdName(socialSet.getDepartName());
 					socialFund.setSocialProvince(Common.isNotNullToStr(socialSet.getProvince()));
 					socialFund.setSocialCity(Common.isNotNullToStr(socialSet.getCity()));
@@ -728,7 +726,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				socialFund.setUnitIdFund(setInfoVo.getCustomerId());
 				socialFund.setFundStatus(CommonConstants.ZERO_STRING);
 				if (Common.isNotNull(fundSet)){
-					socialFund.setProvidentHousehold(fundSet.getId());
+					socialFund.setProvidentHousehold(fundSet.getDepartId());
 					socialFund.setProvidentHouseholdName(fundSet.getDepartName());
 					socialFund.setFundProvince(Common.isNotNullToStr(fundSet.getProvince()));
 					socialFund.setFundCity(Common.isNotNullToStr(fundSet.getCity()));
@@ -806,7 +804,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		// 封装客户信息
 		if (Common.isNotNull(empVo)){
 			dispatch.setEmpId(empVo.getId());
-			dispatch.setEmpNo(empVo.getEmpCode());
+			dispatch.setEmpNo(empVo.getEmpNo());
 			// 封装合同信息 如果有合同取值实际合同信息
 			dispatch.setSettleDomainName(empVo.getDeptName());
 			dispatch.setContractStart(empVo.getContractStart());
@@ -841,18 +839,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			fund.setSettleDomain(excel.getSettleDomainId());
 			if (Common.isNotNull(empVo)){
 				fund.setEmpId(empVo.getId());
-				fund.setEmpNo(empVo.getEmpCode());
+				fund.setEmpNo(empVo.getEmpNo());
 			}
 			fund.setEmpIdcard(excel.getEmpIdcard());
 			fund.setEmpName(excel.getEmpName());
 			fund.setTrustRemark(excel.getTrustRemark());
-			fund.setUnitProvidengCardinal(excel.getProvidentPer());
-			fund.setPersonalProvidentPer(excel.getProvidentPer());
 			fund.setUnitProvidengCardinal(excel.getProvidentCardinal());
 			fund.setPersonalProvidentCardinal(excel.getProvidentCardinal());
+			fund.setPersonalProvidentPer(excel.getProvidentPer());
+			fund.setUnitProvidentPer(excel.getProvidentPer());
 			fund.setProvidentStart(excel.getProvidentStart());
 			if (Common.isNotNull(fundSet)){
-				fund.setProvidentHousehold(fundSet.getId());
+				fund.setProvidentHousehold(fundSet.getDepartId());
 				if (!checkFundPer(fundSet.getFundProList(), excel)){
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_FUND_PERCENT_NOT_EXIST)));
 					return true;
@@ -940,7 +938,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				social.setEmpId(empVo.getId());
 				social.setEmpName(empVo.getEmpName());
 				social.setEmpIdcard(empVo.getEmpIdcard());
-				social.setEmpNo(empVo.getEmpCode());
+				social.setEmpNo(empVo.getEmpNo());
 			}
 			social.setEmpIdcard(excel.getEmpIdcard());
 			social.setBigailmentHandle(CommonConstants.ZERO_STRING);
@@ -984,7 +982,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			if (Common.isNotNull(socialSet)){
 				social.setCanOverpay(socialSet.getCanOverpay());
 				social.setCardinalId(socialSet.getId());
-				social.setSocialHousehold(socialSet.getId());
+				social.setSocialHousehold(socialSet.getDepartId());
 				social.setSocialHouseholdName(socialSet.getDepartName());
 				social.setCollectMoth(socialSet.getCollectMoth());
 				social.setCollectType(socialSet.getCollectType());
@@ -1013,8 +1011,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				social.setUnitBigailmentPer(socialSet.getPayCompanyPro());
 				social.setUnitBirthPer(socialSet.getUnitBirthPro());
 
-				social.setUnitBigailmentMoney(socialSet.getPayCompany());
-				social.setPersonalBigailmentMoney(socialSet.getPayPersonal());
 				//按最低
 				if (CommonConstants.ZERO_STRING.equals(excel.getPaymentType())){
 					social.setPersonalPensionCardinal(socialSet.getLowerLimit());
@@ -1051,16 +1047,24 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					//按年收取大病方式按定值
 					social.setUnitBigailmentMoney(socialSet.getPayCompany());
 					social.setPersonalBigailmentMoney(socialSet.getPayPersonal());
+					social.setUnitBigailmentCardinal(null);
+					social.setUnitBigailmentPer(null);
+					social.setPersonalBigailmentCardinal(null);
+					social.setPersonalBigailmentPer(null);
 				}else if (CommonConstants.ONE_STRING.equals(social.getCollectType())) {
 					//收取方式按月
 					if (CommonConstants.ZERO_STRING.equals(social.getValueType())) {
 						//收取大病按比例
-						social.setUnitBigailmentMoney(BigDecimalUtils.safeMultiply(social.getUnitBigailmentCardinal(), social.getUnitBigailmentPer(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
-						social.setPersonalBigailmentMoney(BigDecimalUtils.safeMultiply(social.getPersonalBigailmentCardinal(), social.getPersonalBigailmentPer(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
+						social.setUnitBigailmentMoney(BigDecimalUtils.safeMultiply(social.getUnitBigailmentCardinal(), socialSet.getPayCompanyPro(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
+						social.setPersonalBigailmentMoney(BigDecimalUtils.safeMultiply(social.getPersonalBigailmentCardinal(), socialSet.getPayPersonalPro(), BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
 					} else if (CommonConstants.ONE_STRING.equals(social.getValueType()) && Common.isNotNull(socialSet)) {
 						//收取大病方式按定值
-						social.setUnitBigailmentMoney(socialSet.getPayCompany());
-						social.setPersonalBigailmentMoney(socialSet.getPayPersonal());
+						social.setUnitBigailmentMoney(socialSet.getChargeCompany());
+						social.setPersonalBigailmentMoney(socialSet.getChargePersonal());
+						social.setPersonalBigailmentCardinal(null);
+						social.setPersonalBigailmentPer(null);
+						social.setUnitBigailmentCardinal(null);
+						social.setUnitBigailmentPer(null);
 					}
 				}
 			}
@@ -1185,7 +1189,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		}
 		if (Common.isNotNull(empVo)) {
 			contract.setEmpId(empVo.getId());
-			contract.setEmpNo(empVo.getEmpCode());
+			contract.setEmpNo(empVo.getEmpNo());
 			contract.setEmpType(empVo.getEmpNatrue());
 		}
 		contracts.put(excel.getEmpIdcard()+CommonConstants.DOWN_LINE_STRING+excel.getSettleDomainCode(),contract);
@@ -1206,6 +1210,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		if (Common.isNotNull(empVo)) {
 			project.setEmpId(empVo.getId());
 			project.setEmpCode(empVo.getEmpCode());
+			project.setEmpNo(empVo.getEmpNo());
 		}
 		projects.put(excel.getEmpIdcard()+CommonConstants.DOWN_LINE_STRING+excel.getSettleDomainCode(),project);
 	}
@@ -1246,7 +1251,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		TSocialFundInfo sf;
 		if (Common.isNotNull(socialFundMap)) {
 			sf = socialFundMap.get(excel.getEmpIdcard());
-			if (Common.isNotNull(sf)) {
+			if (Common.isNotNull(sf) && Common.isNotNull(excel.getSocialHousehold())) {
 				// 拒绝新增1：派单待审核、派单待办理、办理成功且未派减成功------ 先排除兼职工伤
 				if (CommonConstants.ZERO_STRING.equals(sf.getSocialAddStatus())
 						|| CommonConstants.ONE_STRING.equals(sf.getSocialAddStatus())
@@ -1336,16 +1341,28 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	private boolean validImport(List<ErrorMessage> errorMessageList,
 								TDispatchImportVo excel,
 								ProjectSetInfoVo setInfoVo,
-								Map<String, TSocialFundInfo> socialFundMap) {
+								Map<String, TSocialFundInfo> socialFundMap,
+								DispatchEmpVo empVo, SysBaseSetInfo socialSet) {
 		if (Common.isEmpty(setInfoVo)){
 			errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_PROJECT_NOT_FOUND)));
 			return true;
 		}
+		if (Common.isNotNull(empVo)){
+			if (CommonConstants.ONE_STRING.equals(empVo.getProjectStatus())){
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_PROJECT_NOT_USED)));
+				return true;
+			}
+			if (CommonConstants.ONE_STRING.equals(empVo.getFileStatus())){
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_NOT_USED)));
+				return true;
+			}
+		}
 		excel.setSettleDomainId(setInfoVo.getId());
 		excel.setDepartName(setInfoVo.getDepartName());
 		excel.setCustomerCode(setInfoVo.getCustomerCode());
 		excel.setCustomerId(setInfoVo.getCustomerId());
 		excel.setCustomerName(setInfoVo.getCustomerName());
+
 		if (Common.isEmpty(excel.getSocialHousehold()) && Common.isEmpty(excel.getProvidentHousehold())){
 			errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_AND_FUND_NOT_EMPTY)));
 			return true;
@@ -1381,7 +1398,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			return true;
 		}
 
-		TSocialFundInfo socialFund = null;
+		TSocialFundInfo socialFund;
 		if (Common.isNotNull(socialFundMap)){
 			socialFund = socialFundMap.get(excel.getEmpIdcard());
 			if (Common.isNotNull(socialFund)){
@@ -1412,6 +1429,31 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				}
 			}
 		}
+		if (Common.isNotNull(excel.getSocialHousehold()) && Common.isNotNull(socialSet)
+				&& CommonConstants.ONE_STRING.equals(excel.getPaymentType())){
+			if ((Common.isNotNull(excel.getPensionCardinal())
+					&& excel.getPensionCardinal().compareTo(socialSet.getUpperLimit()) > CommonConstants.ZERO_INT
+					&& excel.getPensionCardinal().compareTo(socialSet.getLowerLimit())< CommonConstants.ZERO_INT)
+					||(Common.isNotNull(excel.getMedicalCardinal())
+					&& excel.getMedicalCardinal().compareTo(socialSet.getUpperLimit()) > CommonConstants.ZERO_INT
+					&& excel.getMedicalCardinal().compareTo(socialSet.getLowerLimit())< CommonConstants.ZERO_INT)
+					||(Common.isNotNull(excel.getUnemploymentCardinal())
+					&& excel.getUnemploymentCardinal().compareTo(socialSet.getUpperLimit()) > CommonConstants.ZERO_INT
+					&& excel.getUnemploymentCardinal().compareTo(socialSet.getLowerLimit())< CommonConstants.ZERO_INT)
+					||(Common.isNotNull(excel.getWorkInjuryCardinal())
+					&& excel.getWorkInjuryCardinal().compareTo(socialSet.getUpperLimit()) > CommonConstants.ZERO_INT
+					&& excel.getWorkInjuryCardinal().compareTo(socialSet.getLowerLimit())< CommonConstants.ZERO_INT)
+					||(Common.isNotNull(excel.getBirthCardinal())
+					&& excel.getBirthCardinal().compareTo(socialSet.getUpperLimit()) > CommonConstants.ZERO_INT
+					&& excel.getBirthCardinal().compareTo(socialSet.getLowerLimit())< CommonConstants.ZERO_INT)
+					||(Common.isNotNull(excel.getBigailmentCardinal())
+					&& excel.getBigailmentCardinal().compareTo(socialSet.getUpperLimit()) > CommonConstants.ZERO_INT
+					&& excel.getBigailmentCardinal().compareTo(socialSet.getLowerLimit())< CommonConstants.ZERO_INT)
+			){
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_LIMIT_ERROR)));
+				return true;
+			}
+		}
 		return false;
 	}
 
@@ -1737,6 +1779,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				TSocialFundInfo sf = null;
 				Date now = new Date();
 				for (TDispatchInfo dis : dispatchs) {
+					auditInfo = new TAuditInfo();
 					remark = "";
 					if (Common.isNotNull(socialFundMap)){
 						sf = socialFundMap.get(dis.getEmpIdcard());
@@ -1767,6 +1810,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									socialInfo.setDeleteFlag(CommonConstants.ONE_STRING);
 									// 作废更新：社保状态、同步预估数据   审核不通过直接作废 TODO  预估数据
 									socialInfo.setAuditStatus(CommonConstants.TWO_STRING);
+									socialInfo.setDeleteFlag(CommonConstants.ZERO_STRING);
 									sf.setSocialAddStatus(CommonConstants.FOUR_STRING);
 									sf.setSocialStatus(CommonConstants.TEN_STRING);
 								}
@@ -1815,6 +1859,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 								} else if (CommonConstants.ONE_INT == flag.intValue()) {
 									// 作废更新：公积金状态、同步档案的公积金状态、同步预估数据  TODO
 									providentFund.setAuditStatus(CommonConstants.TWO_STRING);
+									providentFund.setDeleteFlag(CommonConstants.ONE_STRING);
 									sf.setFundAddStatus(CommonConstants.FOUR_STRING);
 									sf.setFundStatus(CommonConstants.NINE_STRING);
 								}
@@ -2569,12 +2614,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 	@Override
 	public IPage<TDispatchInfo> getTDispatchSocialHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo, List<String> settleDomains, String sql) {
-		return baseMapper.getTDispatchSocialHandlePage(page,tDispatchInfo,settleDomains,sql);
+		return baseMapper.getTDispatchSocialHandlePage(page,tDispatchInfo,settleDomains,null,sql);
 	}
 
 	@Override
 	public IPage<TDispatchInfo> getTDispatchFundHandlePage(Page<TDispatchInfo> page, SocialHandleSearchVo tDispatchInfo,List<String> settleDomains, String sql) {
-		return baseMapper.getTDispatchFundHandlePage(page,tDispatchInfo,settleDomains,sql);
+		return baseMapper.getTDispatchFundHandlePage(page,tDispatchInfo,settleDomains,null,sql);
 	}
 	/**
 	 * 导出公积金补缴清册

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

@@ -16,6 +16,7 @@
  */
 package com.yifu.cloud.plus.v1.yifu.social.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
@@ -1073,7 +1074,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	 * @param library        预估库
 	 * @param socialInfo     社保
 	 * @param sysBaseSetInfo 基数配置
-	 * @param paymentType    0最低缴纳、1自定义缴纳、2最高缴纳
+	 * @param paymentType    0最低缴纳、1自定义、2最高缴纳
 	 * @Description: 塞大病金额
 	 * @Author: hgw
 	 * @Date: 2020/11/25 15:51
@@ -1140,7 +1141,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 	private void changeSocialInfoByBase(TSocialFundInfo social, SysBaseSetInfo socialSet) {
 		if (Common.isNotNull(socialSet)) {
 			social.setCanOverpay(socialSet.getCanOverpay());
-			social.setSocialHousehold(socialSet.getId());
+			social.setSocialHousehold(socialSet.getDepartId());
 			social.setCollectMoth(socialSet.getCollectMoth());
 			social.setCollectType(socialSet.getCollectType());
 			social.setHaveThisMonth(socialSet.getHaveThisMonth());
@@ -1446,6 +1447,88 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 		return this.updateForecastLibaryCore(socialFundInfo, null);
 	}
 
+	/**
+	 * @Description: 派单减少变更预估库-派减
+	 * @Author: hgw
+	 * @Date: 2022/7/28 17:11
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	@Override
+	public R<String> updateForecastLibaryByDispatchReduce(TSocialFundInfo socialFundInfo) {
+		String empIdCard = socialFundInfo.getEmpIdcard();
+		Date socialReduceDate = socialFundInfo.getSocialReduceDate();
+		Date fundReduceDate = socialFundInfo.getFundReduceDate();
+		if (socialReduceDate == null && fundReduceDate == null) {
+			return R.failed("社保、公积金减少日期不能都为空！");
+		}
+		// 查询已经生成的预估数据
+		List<TForecastLibrary> socialLibraryList = null;
+		List<TForecastLibrary> fundLibraryList = null;
+		if (Common.isNotNull(empIdCard)) {
+			BigDecimal zero = BigDecimal.ZERO;
+			if (socialReduceDate != null) {
+				socialLibraryList = baseMapper.selectList(Wrappers.<TForecastLibrary>query().lambda()
+						.eq(TForecastLibrary::getEmpIdcard, empIdCard)
+						.eq(TForecastLibrary::getDataType, CommonConstants.ZERO_INT));
+				if (Common.isNotNull(socialLibraryList)) {
+					for (TForecastLibrary library : socialLibraryList) {
+						// 存在社保派减且处于派减期间内，未被预估结算，工资结算引用则清空相关数据
+						if (Common.isNotNull(library.getSocialPayMonth()) && DateUtil.formatDateInt(socialReduceDate) < Integer.parseInt(library.getSocialPayMonth())) {
+							this.calculateType(zero, library);
+						}
+					}
+				}
+			}
+			if (socialReduceDate != null) {
+				fundLibraryList = baseMapper.selectList(Wrappers.<TForecastLibrary>query().lambda()
+						.eq(TForecastLibrary::getEmpIdcard, empIdCard)
+						.eq(TForecastLibrary::getDataType, CommonConstants.ONE_INT));
+				if (Common.isNotNull(fundLibraryList)) {
+					for (TForecastLibrary library : fundLibraryList) {
+						// 存在社保派减且处于派减期间内，未被预估结算，工资结算引用则清空相关数据
+						if (Common.isNotNull(library.getProvidentPayMonth()) && DateUtil.formatDateInt(fundReduceDate) < Integer.parseInt(library.getProvidentPayMonth())) {
+							this.calculateType(zero, library);
+						}
+					}
+				}
+			}
+		}
+		return R.ok();
+	}
+
+	private void calculateType(BigDecimal zero, TForecastLibrary library) {
+		if (library.getDataPush() == CommonConstants.ONE_INT) {
+			// 加负数
+			TForecastLibrary negateLib = new TForecastLibrary();
+			BeanUtil.copyProperties(library, negateLib);
+			negateLib.setUnitPensionFee(BigDecimalUtils.safeSubtract(zero, library.getUnitPensionFee()));
+			negateLib.setUnitMedicalFee(BigDecimalUtils.safeSubtract(zero, library.getUnitMedicalFee()));
+			negateLib.setUnitBirthFee(BigDecimalUtils.safeSubtract(zero, library.getUnitBirthFee()));
+			negateLib.setUnitWorkInjuryFee(BigDecimalUtils.safeSubtract(zero, library.getUnitWorkInjuryFee()));
+			negateLib.setUnitUnemploymentFee(BigDecimalUtils.safeSubtract(zero, library.getUnitUnemploymentFee()));
+			negateLib.setUnitBitailmentFee(BigDecimalUtils.safeSubtract(zero, library.getUnitBitailmentFee()));
+			negateLib.setUnitInterestFee(BigDecimalUtils.safeSubtract(zero, library.getUnitInterestFee()));
+			negateLib.setUnitSocialSum(BigDecimalUtils.safeSubtract(zero, library.getUnitSocialSum()));
+			// 个人社保
+			negateLib.setPersonalPensionFee(BigDecimalUtils.safeSubtract(zero, library.getPersonalPensionFee()));
+			negateLib.setPersonalMedicalFee(BigDecimalUtils.safeSubtract(zero, library.getPersonalMedicalFee()));
+			negateLib.setPersonalUnemploymentFee(BigDecimalUtils.safeSubtract(zero, library.getPersonalUnemploymentFee()));
+			negateLib.setPersonalInterestFee(BigDecimalUtils.safeSubtract(zero, library.getPersonalUnemploymentFee()));
+			negateLib.setPersonalBigailmentFee(BigDecimalUtils.safeSubtract(zero, library.getPersonalBigailmentFee()));
+			negateLib.setPersonalSocialSum(BigDecimalUtils.safeSubtract(zero, library.getPersonalSocialSum()));
+			// 单位公积金
+			negateLib.setUnitFundSum(BigDecimalUtils.safeSubtract(zero, library.getUnitFundSum()));
+			// 个人公积金
+			negateLib.setPersonalFundSum(BigDecimalUtils.safeSubtract(zero, library.getPersonalFundSum()));
+			negateLib.setSumAll(BigDecimalUtils.safeSubtract(zero, library.getSumAll()));
+			negateLib.setDiffType(SocialConstants.DIFF_TYPE_TWO);
+			baseMapper.insert(negateLib);
+		} else {
+			// 删除
+			baseMapper.deleteById(library.getId());
+		}
+	}
+
 	/**
 	 * @param socialFundInfo
 	 * @Description: 根据社保公积金信息表更新预估库

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

@@ -558,6 +558,10 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			if (ValidityUtil.checkInvalidEmpPhone(tPreDispatchInfo.getTelOne())) {
 				return R.failed(PreDispatchConstants.TEL_INVALID);
 			}
+
+			if (ValidityUtil.checkInvalidEmpPhone(tPreDispatchInfo.getTelTwo())) {
+				return R.failed(PreDispatchConstants.TEL_INVALID2);
+			}
 		}
 		if (CommonConstants.ONE_STRING.equals(tPreDispatchInfo.getType())) {
 			initLeaveReason(tPreDispatchInfo);
@@ -1145,10 +1149,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 
 	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;
 			}

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

@@ -130,5 +130,6 @@
             1=1
             <include refid="tAgentConfig_where"/>
         </where>
+		ORDER BY a.CREATE_TIME desc
     </select>
 </mapper>

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

@@ -270,7 +270,7 @@
                     <if test="tPreDispatchInfo.telTwo != null and tPreDispatchInfo.telTwo.trim() != ''">
                         AND a.TEL_TWO = #{tPreDispatchInfo.telTwo}
                     </if>
-                    <if test="tPreDispatchInfo.entryDate != null">
+                    <if test="tPreDispatchInfo.entryDate != null and tPreDispatchInfo.entryDate.trim() != ''">
                         AND a.ENTRY_DATE = #{tPreDispatchInfo.entryDate}
                     </if>
                     <if test="tPreDispatchInfo.formalSalary != null and tPreDispatchInfo.formalSalary.trim() != ''">
@@ -448,7 +448,7 @@
                         AND a.DEPART_ID_ADD = #{tPreDispatchInfo.departIdAdd}
                     </if>
                     <if test="tPreDispatchInfo.unitNameAdd != null and tPreDispatchInfo.unitNameAdd.trim() != ''">
-                        AND a.UNIT_NAME_ADD = #{tPreDispatchInfo.unitNameAdd}
+                        AND a.UNIT_NAME_ADD like CONCAT('%',#{tPreDispatchInfo.unitNameAdd,jdbcType=VARCHAR},'%')
                     </if>
                     <if test="tPreDispatchInfo.departNameAdd != null and tPreDispatchInfo.departNameAdd.trim() != ''">
 						AND a.DEPART_NAME_ADD like  CONCAT('%',#{tPreDispatchInfo.departNameAdd,jdbcType=VARCHAR},'%')
@@ -577,33 +577,33 @@
 		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="company != null">company = #{company},</if>
+			<if test="payAddress != null">pay_address = #{payAddress},</if>
+			<if test="customerName != null">customer_name = #{customerName},</if>
+			<if test="empName != null">emp_name = #{empName},</if>
+			<if test="empIdcard != null">emp_idcard = #{empIdcard},</if>
+			<if test="telOne != null">tel_one = #{telOne},</if>
+			<if test="telTwo != null">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 != ''">
+			<if test="formalSalary != null">formal_salary = #{formalSalary},</if>
+			<if test="dispatchStart != null">dispatch_start = #{dispatchStart},</if>
+			<if test="dispatchEnd != null">dispatch_end = #{dispatchEnd},</if>
+			<if test="contractType != null">contract_type = #{contractType},</if>
+			<if test="contractStart != null">contract_start = #{contractStart},</if>
+			<if test="contractEnd != null">contract_end = #{contractEnd},</if>
+			<if test="contractNameAdd != null">
 				contract_name_add = #{contractNameAdd},
 			</if>
-			<if test="contractTypeAdd != null  and contractTypeAdd != ''">
+			<if test="contractTypeAdd != null">
 				contract_type_add = #{contractTypeAdd},
 			</if>
-			<if test="contractStartAdd != null  and contractStartAdd != ''">
+			<if test="contractStartAdd != null">
 				contract_start_add = #{contractStartAdd},
 			</if>
-			<if test="contractEndAdd != null  and contractEndAdd != ''">
+			<if test="contractEndAdd != null">
 				contract_end_add = #{contractEndAdd},
 			</if>
-			<if test="contractTermAdd != null  and contractTermAdd != ''">
+			<if test="contractTermAdd != null">
 				contract_term_add = #{contractTermAdd},
 			</if>
 			<if test="contractNameAdd == null  or contractNameAdd == ''">
@@ -621,21 +621,21 @@
 			<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="trialStart != null">trial_start = #{trialStart},</if>
+			<if test="trialEnd != null">trial_end = #{trialEnd},</if>
+			<if test="trialSalary != null">trial_salary = #{trialSalary},</if>
+			<if test="workingSystem != null">working_system = #{workingSystem},</if>
+			<if test="contractVersion != null">contract_version = #{contractVersion},</if>
+			<if test="telNotice != null">tel_notice = #{telNotice},</if>
+			<if test="workingAddress != null">working_address = #{workingAddress},</if>
+			<if test="remarkOne != null">remark_one = #{remarkOne},</if>
+			<if test="remarkTwo != null">remark_two = #{remarkTwo},</if>
 			<if test='type == "0"'>
-				<if test="pensionAddress != null  and pensionAddress != ''">
+				<if test="pensionAddress != null">
 					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 test="socialProvince != null">social_province = #{socialProvince},</if>
+					<if test="socialCity != null">social_city = #{socialCity},</if>
+					<if test="socialTown != null">social_town = #{socialTown},</if>
 				</if>
 				<if test='pensionAddress == null || pensionAddress == ""'>
 					pension_address = null,
@@ -643,15 +643,15 @@
 					social_city = null,
 					social_town = null,
 				</if>
-				<if test="fundAddress != null  and fundAddress != ''">
+				<if test="fundAddress != null">
 					fund_address = #{fundAddress},
-					<if test="fundProvince != null  and fundProvince != ''">
+					<if test="fundProvince != null">
 						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 test="fundCity != null">fund_city = #{fundCity},</if>
+					<if test="fundTown != null">fund_town = #{fundTown},</if>
 				</if>
 				<if test='fundAddress == null || fundAddress == ""'>
 					fund_address = null,
@@ -661,12 +661,12 @@
 				</if>
 			</if>
 			<if test='type == "1"'>
-				<if test="pensionAddressReduce != null  and pensionAddressReduce != ''">
+				<if test="pensionAddressReduce != null">
 					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 test="socialProvince != null">social_province = #{socialProvince},</if>
+					<if test="socialCity != null">social_city = #{socialCity},</if>
+					<if test="socialTown != null">social_town = #{socialTown},</if>
 				</if>
 				<if test='pensionAddressReduce == null || pensionAddressReduce ==""'>
 					pension_address_reduce = null,
@@ -676,16 +676,16 @@
 					social_city = null,
 					social_town = null,
 				</if>
-				<if test="fundAddressReduce != null  and fundAddressReduce != ''">
+				<if test="fundAddressReduce != null">
 					fund_address_reduce = #{fundAddressReduce},
 					fund_address = #{fundAddressReduce},
-					<if test="fundProvince != null  and fundProvince != ''">
+					<if test="fundProvince != null">
 						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 test="fundCity != null">fund_city = #{fundCity},</if>
+					<if test="fundTown != null">fund_town = #{fundTown},</if>
 				</if>
 				<if test='fundAddressReduce == null || fundAddressReduce == ""'>
 					fund_address_reduce = null,
@@ -697,19 +697,19 @@
 				</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="pensionStart != null">pension_start = #{pensionStart},</if>
+			<if test="medicalAddress != null">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="medicalStart != null">medical_start = #{medicalStart},</if>
+			<if test="injuryAddress != null ">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="injuryStart != null">injury_start = #{injuryStart},</if>
+			<if test="birthAddress != null">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="birthStart != null">birth_start = #{birthStart},</if>
+			<if test="unemploymentAddress != null">unemployment_address = #{unemploymentAddress},</if>
 			<if test="unemploymentBase != null ">unemployment_base = #{unemploymentBase},</if>
-			<if test="unemploymentStart != null  and unemploymentStart != ''">unemployment_start = #{unemploymentStart},</if>
+			<if test="unemploymentStart != null">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>
@@ -725,48 +725,48 @@
 			<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="fundStart != null">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="dispatchCompany != null">dispatch_company = #{dispatchCompany},</if>
+			<if test="customerService != null">customer_service = #{customerService},</if>
+			<if test="contractMinorName != null">contract_minor_name = #{contractMinorName},</if>
+			<if test="uniqueNumber != null">unique_number = #{uniqueNumber},</if>
+			<if test="customerNumber != null">customer_number = #{customerNumber},</if>
+			<if test="serviceType != null">service_type = #{serviceType},</if>
+			<if test="pensionEndReduce != null">pension_end_reduce = #{pensionEndReduce},</if>
+			<if test="medicalAddressReduce != null">medical_address_reduce = #{medicalAddressReduce},</if>
+			<if test="medicalEndReduce != null">medical_end_reduce = #{medicalEndReduce},</if>
+			<if test="injuryAddressReduce != null">injury_address_reduce = #{injuryAddressReduce},</if>
+			<if test="injuryEndReduce != null">injury_end_reduce = #{injuryEndReduce},</if>
+			<if test="birthAddressReduce != null">birth_address_reduce = #{birthAddressReduce},</if>
+			<if test="birthEndReduce != null">birth_end_reduce = #{birthEndReduce},</if>
+			<if test="unemploymentAddressReduce != null">unemployment_address_reduce = #{unemploymentAddressReduce},</if>
+			<if test="unemploymentEndReduce != null">unemployment_end_reduce = #{unemploymentEndReduce},</if>
+			<if test="fundEndReduce != null">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="leaveReason != null">leave_reason = #{leaveReason},</if>
+			<if test="leaveReasonAdd != null">leave_reason_add = #{leaveReasonAdd},</if>
+			<if test="empTypeAdd != null">emp_type_add = #{empTypeAdd},</if>
+			<if test="unitIdAdd != null">unit_id_add = #{unitIdAdd},</if>
+			<if test="departIdAdd != null">depart_id_add = #{departIdAdd},</if>
+			<if test="unitNameAdd != null">unit_name_add = #{unitNameAdd},</if>
+			<if test="departNameAdd != null">depart_name_add = #{departNameAdd},</if>
+			<if test="socialHouseAdd != null">social_house_add = #{socialHouseAdd},</if>
+			<if test="fundHouseAdd != null">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="preStatus != null">pre_status = #{preStatus},</if>
+			<if test="status != null">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>
+			<if test="dataSubStatus != null">data_sub_status = #{dataSubStatus},</if>
+			<if test="remark != null">remark = #{remark},</if>
+			<if test="dispatchFlag != null">dispatch_flag = #{dispatchFlag},</if>
+			<if test="cancelRemark != null">cancel_remark = #{cancelRemark},</if>
 		</trim>
 		where id = #{id}
 	</update>