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

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

@@ -474,4 +474,16 @@ public class TEmployeeInfoController {
 	public Boolean updateEmpInfo(@RequestBody UpdateEmpVo vo) {
 		return tEmployeeInfoService.updateEmpInfo(vo);
 	}
+
+	/**
+	 * @Description: 查验手机号码是否存在
+	 * @Author: fxj
+	 * @Date: 2022/08/01 18:52
+	 **/
+	@Operation(summary = "通过mobile查询是否已存在", description = "通过mobile查询是否已存在")
+	@Inner
+	@PostMapping("/inner/checkMobile")
+	public Boolean checkMobile(@RequestBody String mobile) {
+		return tEmployeeInfoService.checkMobile(mobile);
+	}
 }

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

@@ -186,4 +186,6 @@ public interface TEmployeeInfoService extends IService<TEmployeeInfo> {
 	EmpDispatchAddVo addDispatchInfo(EmpDispatchAddVo addVo);
 
 	Boolean updateEmpInfo(UpdateEmpVo vo);
+
+	Boolean checkMobile(String mobile);
 }

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

@@ -2135,6 +2135,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 		return true;
 	}
 
+	@Override
+	public Boolean checkMobile(String mobile) {
+		if (Common.isEmpty(mobile)){
+			return true;
+		}
+		return !(baseMapper.selectCount(Wrappers.<TEmployeeInfo>query().lambda()
+				.eq(TEmployeeInfo::getFileStatus,CommonConstants.ZERO_STRING)
+				.eq(TEmployeeInfo::getDeleteFlag,CommonConstants.ZERO_STRING)) > 0);
+	}
+
 	private void saveContract(Map<String, EmpProjectDispatchVo> projectsMap,
 							  Map<String, EmpContractDispatchVo> contractsMap,
 							  Map<String, EmpAddDispatchVo> empAddsMap) {

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

@@ -480,4 +480,8 @@ public interface ErrorCodes {
 	 * 派增异常： 单派工伤其他起缴日期不可填写
 	 */
 	String EMP_DISPATCH_SOCIAL_DIY_INJURY_ERROR = "emp.dispatch.social.diy.injury.error";
+	/**
+	 * 派增异常： 已存在对应手机号码的在用员工档案
+	 */
+	String EMP_DISPATCH_EMP_MOBILE_REPEAT = "emp.dispatch.emp.mobile.repeat";
 }

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

@@ -287,8 +287,7 @@ public class DateUtil {
                // setLenient avoids allowing dates like 9/32/2001
                // which would otherwise parse to 10/2/2001
                df.setLenient(false);
-
-               return df.parse(dateText);
+			  return df.parse( dateText.replace("/","").replace("-",""));
           } catch (ParseException e) {
 
                return null;

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

@@ -633,7 +633,9 @@ public class ExcelUtil <T> implements Serializable {
 		if (Common.isNotNull(c)) {
 			//日期格式校验
 			if (attr.isDate()) {
-				DateUtil.stringToDate(c.trim(), attr.dateFormat());
+				if (null == DateUtil.stringToDate(c.trim(), "yyyyMMdd")) {
+					return errorInfo(attr, "_日期格式有误", i);
+				}
 			}
 			//手机号码校验
 			if (attr.isPhone() && getMatchRes(c.trim(), attr, ValidityConstants.MOBILE_PATTERN)) {

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

@@ -183,6 +183,8 @@ emp.dispatch.reduce.fund.depart.no.error=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u65E0\u
 
 emp.dispatch.social.diy.injury.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5355\u6D3E\u5DE5\u4F24\u5176\u4ED6\u8D77\u7F34\u65E5\u671F\u4E0D\u53EF\u586B\u5199
 
+emp.dispatch.emp.mobile.repeat=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5DF2\u5B58\u5728\u5BF9\u5E94\u624B\u673A\u53F7\u7801\u7684\u5728\u7528\u5458\u5DE5\u6863\u6848
+
 
 
 

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

@@ -187,4 +187,18 @@ public class ArchivesDaprUtil {
 		}
 		return res;
 	}
+	/**
+	 * @Author fxj
+	 * @Description 校验手机号码重复
+	 * @Date 22:11 2022/8/4
+	 * @Param
+	 * @return
+	**/
+	public R<Boolean> checkMobile(String mobile) {
+		R<Boolean> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeeinfo/inner/checkMobile" , mobile, Boolean.class, SecurityConstants.FROM_IN);
+		if (Common.isEmpty(res)){
+			return R.failed("检验号码重复信息失败！");
+		}
+		return res;
+	}
 }

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

+package com.yifu.cloud.plus.v1.yifu.insurances.util;
+
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.http.*;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.File;
+
+/**
+ * @author zhaji
+ * @description EKP交互工具类
+ *
+ * @date 2022-08-05 09:42:33
+ */
+public class EKPUtil {
+
+	/**
+	 * 多层级的VO对象，且包含上传功能的样例
+	 * 注意key的书写格式,类似EL表达式的方式，属性关系用'.', 列表和数组关系用[]，Map关系用["xxx"]
+	 */
+	public static void testAddNewsInRestTemplate() throws Exception{
+		RestTemplate yourRestTemplate = new RestTemplate();
+		//指向EKP的接口url
+		String url = "http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel";
+		//把ModelingAppModelParameterAddForm转换成MultiValueMap
+		MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
+		wholeForm.add("docSubject", new String("接口发起流程".getBytes("UTF-8"),"ISO-8859-1") );
+		wholeForm.add("docCreator", "{\"PersonNo\":\"00013\"}");
+		wholeForm.add("docStatus", 20);
+		wholeForm.add("fdModelId", "169b437e7e1cd1bd7b6367c4563b24ef");
+		wholeForm.add("fdFlowId", "178255fbdeda940cbd17bdd476398084");
+		wholeForm.add("formValues", new String("{\"fd_37310fdc84a55e\":\"王五\", \"fd_37310fe0aa2334\":\"2019-03-26\", \"fd_37310fde1759a4\":\"这里内容\"}".getBytes("UTF-8"),"ISO-8859-1") );
+
+
+		LinkedMultiValueMap<String,Object> innerMap = new LinkedMultiValueMap<>();
+		//注意附件列表的key是一样的
+		//第一个附件
+		wholeForm.add("attachmentForms[0].fdKey", "fd_3731bf4852e8fe");
+		wholeForm.add("attachmentForms[0].fdFileName", new String("测试文档.txt".getBytes("UTF-8"),"ISO-8859-1"));
+		wholeForm.add("attachmentForms[0].fdAttachment", new FileSystemResource(new File("E:/测试文档.txt")));
+
+
+		HttpHeaders headers = new HttpHeaders();
+		//如果EKP对该接口启用了Basic认证，那么客户端需要加入
+		//addAuth(headers,"yourAccount"+":"+"yourPassword");是VO，则使用APPLICATION_JSON
+		headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+		//必须设置上传类型，如果入参是字符串，使用MediaType.TEXT_PLAIN；如果
+		HttpEntity<MultiValueMap<String,Object>> entity = new HttpEntity<MultiValueMap<String,Object>>(wholeForm,headers);
+
+
+		//有返回值的情况 VO可以替换成具体的JavaBean
+		ResponseEntity<String> obj = yourRestTemplate.exchange(url, HttpMethod.POST, entity, String.class);
+		String body = obj.getBody();
+		System.out.println(body);
+	}
+
+}

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

@@ -418,7 +418,7 @@ public class TInsuranceDetailController {
 	}
 
 	/**
-	 * 出险
+	 * 紧急出险
 	 *
 	 * @author zhaji
 	 * @param empIdcardNo 身份证

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

@@ -177,4 +177,6 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 * @return
 	 */
 	IPage<InsuranceListByIdCardVo> getInsuranceListByIdCard(Page<TInsuranceDetail> page, @Param("idCard") String idCard);
+
+	List<TInsuranceDetail> selectListByempIdcardNo(String empIdcardNo);
 }

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

@@ -3196,10 +3196,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if(CommonConstants.ZERO_INT != isOverdue){
 			return R.failed("保单信息已过期，不能进行出险操作");
 		}
-		insuranceDetail.setIsUse(CommonConstants.ONE_INT);
-		insuranceDetail.setUpdateBy(user.getId());
-		insuranceDetail.setUpdateTime(LocalDateTime.now());
-		return R.ok(updateById(insuranceDetail),"出险成功");
+		LambdaUpdateWrapper<TInsuranceDetail> updateWrapper = new LambdaUpdateWrapper<TInsuranceDetail>();
+		updateWrapper.eq(TInsuranceDetail::getId,id)
+				.set(TInsuranceDetail::getUpdateTime,LocalDateTime.now())
+				.set(TInsuranceDetail::getIsUse,CommonConstants.ONE_INT)
+				.set(TInsuranceDetail::getUpdateBy,user.getId());
+		update(updateWrapper);
+		return R.ok("出险成功");
 	}
 
 	/**
@@ -3950,31 +3953,20 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (!ValidityUtil.validateIDCard(empIdcardNo)){
 			return R.failed("身份证格式不正确");
 		}
-		LambdaQueryWrapper<TInsuranceDetail> queryWrapper = new LambdaQueryWrapper<>();
 		//查询所有在保，未出险，未过期，未失效，未减员的保单信息
-		queryWrapper.eq(TInsuranceDetail :: getEmpIdcardNo,empIdcardNo)
-				.eq(TInsuranceDetail :: getBuyHandleStatus ,CommonConstants.THREE_INT)
-				.eq(TInsuranceDetail :: getIsEffect,CommonConstants.ZERO_INT)
-				.eq(TInsuranceDetail :: getIsUse,CommonConstants.ZERO_INT)
-				.eq(TInsuranceDetail :: getIsOverdue,CommonConstants.ZERO_INT)
-				.ne(TInsuranceDetail :: getReduceHandleStatus,CommonConstants.ONE_INT)
-				.ne(TInsuranceDetail :: getReduceHandleStatus,CommonConstants.TWO_INT)
-				.ne(TInsuranceDetail :: getReduceHandleStatus,CommonConstants.FOUR_INT);
-		List<TInsuranceDetail> list = list(queryWrapper);
+		List<TInsuranceDetail> list = this.baseMapper.selectListByempIdcardNo(empIdcardNo);
 		if (CollectionUtils.isEmpty(list)){
 			return R.failed("无可出险的保单");
 		}
+		LambdaUpdateWrapper<TInsuranceDetail>  updateWrapper = new LambdaUpdateWrapper<>();
 		for (TInsuranceDetail tInsuranceDetail : list) {
-			tInsuranceDetail.setIsUse(CommonConstants.ONE_INT);
-			//tInsuranceDetail.setUpdateBy();
-			tInsuranceDetail.setUpdateTime(LocalDateTime.now());
-		}
-		boolean b = updateBatchById(list);
-		if(b){
-			return R.ok("EKP紧急出险成功");
-		}else{
-			return R.ok("EKP紧急出险失败");
+			updateWrapper.eq(TInsuranceDetail :: getId,tInsuranceDetail.getId())
+					.set(TInsuranceDetail :: getIsUse,CommonConstants.ONE_INT)
+					.set(TInsuranceDetail :: getUpdateTime,LocalDateTime.now());
+			update(updateWrapper);
 		}
+		return R.ok("EKP紧急出险成功");
+
 	}
 
 	/**

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

@@ -65,7 +65,7 @@
         BUY_HANDLE_STATUS,DEFAULT_SETTLE_ID,REDUCE_HANDLE_STATUS,
         IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
         CREATE_BY,CREATE_NAME,CREATE_TIME,
-        UPDATE_BY,UPDATE_TIME,DELETE_FLAG
+        UPDATE_BY,UPDATE_TIME,DELETE_FLAG,DEFAULT_SETTLE_ID
     </sql>
 	<select id="getInsuranceListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
 		select detail.id as id,
@@ -304,7 +304,7 @@
 			and detail.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%')
 		</if>
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
-			and detail.DEPT_NO like concat('%',replace(replace(#{param.deptNo},'_','\_'),'%','\%'),'%')
+			and detail.DEPT_NO = #{param.deptNo}
 		</if>
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
 			and detail.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
@@ -340,7 +340,7 @@
 		<if test="param.createEndTime != null and param.createEndTime.trim() != ''">
 			AND detail.CREATE_TIME  <![CDATA[ <= ]]> concat(#{param.createEndTime}, ' 23:59:59')
 		</if>
-		ORDER BY detail.CREATE_TIME DESC
+		ORDER BY detail.CREATE_TIME DESC ,detail.ID ASC
 	</select>
 	<!-- 已投保列表不分页查询-->
 	<select id="getInsuredList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredListVo">
@@ -473,7 +473,7 @@
 			(detail.POLICY_END <![CDATA[ >= ]]>  concat(#{param.policyStart}, ' 00:00:00') and detail.POLICY_END <![CDATA[ <= ]]> concat(#{param.policyEnd}, ' 23:59:59'))
 			)
 		</if>
-		ORDER BY refund.CREATE_TIME DESC
+		ORDER BY refund.CREATE_TIME DESC,detail.ID ASC
 	</select>
 	<!-- 已减员列表不分页查询-->
 	<select id="getInsuranceRefundList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceRefundListVo">
@@ -581,7 +581,7 @@
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
 			and detail.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
 		</if>
-		ORDER BY refund.CREATE_TIME DESC
+		ORDER BY refund.CREATE_TIME ,detail.ID DESC
 	</select>
 	<!-- 减员办理列表不分页查询-->
 	<select id="getInsuranceRefundHandlingList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.RefundExportListVo">
@@ -770,7 +770,6 @@
 			#{item}
 		</foreach>
 	</update>
-
 	<!--根据身份证查询商险信息-->
 	<select id="getInsuranceListByIdCard" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListByIdCardVo">
 		SELECT
@@ -783,4 +782,20 @@
 		</where>
 		ORDER BY CREATE_TIME desc
 	</select>
+    <select id="selectListByempIdcardNo" resultType="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail">
+		SELECT
+			<include refid="Base_Column_List"/>
+		FROM
+		  t_insurance_detail
+		<where>
+		    EMP_IDCARD_NO = #{empIdcardNo}
+			AND IS_EFFECT = 0
+			AND IS_USE =0
+			and IS_OVERDUE = 0
+			and DELETE_FLAG = 0
+			and BUY_HANDLE_STATUS =3
+			and (REDUCE_HANDLE_STATUS is null or REDUCE_HANDLE_STATUS = 3)
+		</where>
+		ORDER BY CREATE_TIME desc
+	</select>
 </mapper>

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

@@ -46,7 +46,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/TPaymentInfo.java

@@ -85,11 +85,11 @@ public class TPaymentInfo extends BaseEntity {
     private String empIdcard;
 
     /**
-     * 单位名称
+     * 客户名称
      */
-    @ExcelAttribute(name = "单位名称" )
-    @Schema(description ="单位名称")
-    @ExcelProperty("单位名称")
+    @ExcelAttribute(name = "客户名称" )
+    @Schema(description ="客户名称")
+    @ExcelProperty("客户名称")
     private String unitId;
 
     /**
@@ -542,10 +542,10 @@ public class TPaymentInfo extends BaseEntity {
 	@ExcelProperty("单位公积金基数")
 	private BigDecimal unitProvidentSet;
 	/**
-	 * 单边公积金比例
+	 * 单位公积金比例
 	 */
-	@ExcelAttribute(name = "单边公积金比例"  )
-	@ExcelProperty("单边公积金比例")
+	@ExcelAttribute(name = "单位公积金比例"  )
+	@ExcelProperty("单位公积金比例")
 	private BigDecimal providentPercent;
 	/**
 	 * 单位公积金费用

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

@@ -68,7 +68,7 @@ public class TPreDispatchInfo extends BaseEntity {
      * 日期，格式：2020-12-25
      */
     @Schema(description ="日期，格式：2020-12-25")
-	@ExcelAttribute(name = "日期")
+	@ExcelAttribute(name = "日期", isDate = true)
 	private String date;
 
     /**
@@ -132,7 +132,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="入职日期")
 	@Size(max = 20, message = "入职日期不可超过20位")
-	@ExcelAttribute(name = "入职日期",isDate = true,dateFormatExport = DateUtil.ISO_EXPANDED_DATE_FORMAT)
+	@ExcelAttribute(name = "入职日期", isDate = true)
 	private String entryDate;
 
     /**
@@ -147,7 +147,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="派遣开始日期")
 	@Size(max = 20, message = "派遣开始日期不可超过20位")
-	@ExcelAttribute(name = "派遣开始日期", maxLength = 20)
+	@ExcelAttribute(name = "派遣开始日期", maxLength = 20, isDate = true)
 	private String dispatchStart;
 
     /**
@@ -155,6 +155,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="派遣结束日期")
 	@Size(max = 20, message = "派遣结束日期不可超过20位")
+	@ExcelAttribute(name = "派遣结束日期", maxLength = 20, isDate = true)
     private String dispatchEnd;
 
     /**
@@ -162,7 +163,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="合同开始日期")
 	@Size(max = 20, message = "合同开始日期不可超过20位")
-	@ExcelAttribute(name = "派遣结束日期", maxLength = 20)
+	@ExcelAttribute(name = "合同开始日期", maxLength = 20, isDate = true)
 	private String contractStart;
 
     /**
@@ -170,7 +171,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="合同终止日期")
 	@Size(max = 20, message = "合同终止日期不可超过20位")
-	@ExcelAttribute(name = "合同终止日期",  isDate = true, dateFormatExport = DateUtil.ISO_EXPANDED_DATE_FORMAT)
+	@ExcelAttribute(name = "合同终止日期", isDate = true)
 	private String contractEnd;
 
     /**
@@ -178,7 +179,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="试用开始日期")
 	@Size(max = 20, message = "试用开始日期不可超过20位")
-	@ExcelAttribute(name = "试用开始日期", maxLength = 20)
+	@ExcelAttribute(name = "试用开始日期", maxLength = 20, isDate = true)
 	private String trialStart;
 
     /**
@@ -186,7 +187,7 @@ public class TPreDispatchInfo extends BaseEntity {
      */
     @Schema(description ="试用结束日期")
 	@Size(max = 20, message = "试用结束日期不可超过20位")
-	@ExcelAttribute(name = "试用结束日期", maxLength = 20)
+	@ExcelAttribute(name = "试用结束日期", maxLength = 20, isDate = true)
 	private String trialEnd;
 
     /**
@@ -513,7 +514,7 @@ public class TPreDispatchInfo extends BaseEntity {
      * 离职日期
      */
     @Schema(description ="离职日期")
-	@ExcelAttribute(name = "离职日期")
+	@ExcelAttribute(name = "离职日期", isDate = true)
 	private Date leaveDate;
 
     /**

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

@@ -608,12 +608,12 @@ public class TSocialFundInfo extends BaseEntity {
 	@ExcelProperty("委托备注" )
 	private String trustRemark;
 	/**
-	 * 缴纳类型（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/entity/TSocialInfo.java

@@ -634,12 +634,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

@@ -118,7 +118,7 @@ public class SocialHandleExportVo implements Serializable {
 	/**
 	 * 员工类型
 	 */
-	@ExcelAttribute(name = "员工类型",  errorInfo = "员工类型不能为空", maxLength = 1, isDataId = true,dataType = ExcelAttributeConstants.PERSONNEL_TYPE,needExport = true)
+	@ExcelAttribute(name = "员工类型",  errorInfo = "员工类型不能为空",  isDataId = true,dataType = ExcelAttributeConstants.EMP_NATRUE,needExport = true)
 	@ExcelProperty("员工类型" )
 	private String empType;
 	/**
@@ -138,7 +138,7 @@ public class SocialHandleExportVo implements Serializable {
 	/**
 	 * 户口性质
 	 */
-	@ExcelAttribute(name = "户口性质", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.HOUSEHOLD_NATURE,needExport = true)
+	@ExcelAttribute(name = "户口性质", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMP_REGISTYPE,needExport = true)
 	@Schema(description = "户口性质")
 	@ExcelProperty("户口性质" )
 	private String empRegisType;
@@ -146,7 +146,7 @@ public class SocialHandleExportVo implements Serializable {
 	/**
 	 * 民族
 	 */
-	@ExcelAttribute(name = "民族", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.NATION,needExport = true)
+	@ExcelAttribute(name = "民族", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMP_NATIONAL,needExport = true)
 	@Schema(description = "民族")
 	@ExcelProperty("民族" )
 	private String empNational;
@@ -197,10 +197,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 String paymentType;
 	/**
@@ -213,21 +213,21 @@ public class SocialHandleExportVo implements Serializable {
 	/**
 	 *  缴纳地-省
 	 */
-	@ExcelAttribute(name = "社保缴纳地-省",  maxLength = 32, isDataId = true, isArea = true, parentField = "",needExport = true)
+	@ExcelAttribute(name = "社保缴纳地-省",  maxLength = 32,isArea = true,needExport = true)
 	@Schema(description = "社保缴纳地-省")
 	@ExcelProperty("社保缴纳地-省" )
 	private String socialProvince;
 	/**
 	 *  缴纳地-市
 	 */
-	@ExcelAttribute(name = "社保缴纳地-市",    maxLength = 32, isDataId = true, isArea = true, parentField = "socialProvince",needExport = true)
+	@ExcelAttribute(name = "社保缴纳地-市",    maxLength = 32, isArea = true, parentField = "socialProvince",needExport = true)
 	@Schema(description = "社保缴纳地-市")
 	@ExcelProperty("社保缴纳地-市" )
 	private String socialCity;
 	/**
 	 *  缴纳地-县
 	 */
-	@ExcelAttribute(name = "社保缴纳地-县",   maxLength = 32, isDataId = true, isArea = true, parentField = "socialCity",needExport = true)
+	@ExcelAttribute(name = "社保缴纳地-县",   maxLength = 32, isArea = true, parentField = "socialCity",needExport = true)
 	@Schema(description = "社保缴纳地-县")
 	@ExcelProperty("社保缴纳地-县" )
 	private String socialTown;

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

@@ -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/TDispatchInfoSearchVo.java

@@ -51,11 +51,13 @@ public class TDispatchInfoSearchVo extends TDispatchInfo {
 	/**
 	 * 申请时间起
 	 */
+	@TableField(exist = false)
 	@Schema(description = "申请时间起")
 	private LocalDateTime createTimeStart;
 	/**
 	 * 申请时间止
 	 */
+	@TableField(exist = false)
 	@Schema(description = "申请时间止")
 	private LocalDateTime createTimeEnd;
 	/**

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

@@ -82,12 +82,12 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	@ExcelProperty("身份证号")
 	private String empIdcard;
 	/**
-	 * 单位名称
+	 * 客户名称
 	 */
-	@Length(max = 50, message = "单位名称 不能超过50 个字符")
-	@ExcelAttribute(name = "单位名称", maxLength = 50)
-	@Schema(description = "单位名称")
-	@ExcelProperty("单位名称")
+	@Length(max = 50, message = "客户名称 不能超过50 个字符")
+	@ExcelAttribute(name = "客户名称", maxLength = 50)
+	@Schema(description = "客户名称")
+	@ExcelProperty("客户名称")
 	private String unitId;
 	/**
 	 * 项目名称
@@ -558,11 +558,11 @@ public class TPaymentInfoVo extends RowIndex implements Serializable {
 	@ExcelProperty("单位公积金基数")
 	private BigDecimal unitProvidentSet;
 	/**
-	 * 单边公积金比例
+	 * 单位公积金比例
 	 */
-	@ExcelAttribute(name = "单边公积金比例")
-	@Schema(description ="单边公积金比例")
-	@ExcelProperty("单边公积金比例")
+	@ExcelAttribute(name = "单位公积金比例")
+	@Schema(description ="单位公积金比例")
+	@ExcelProperty("单位公积金比例")
 	private BigDecimal providentPercent;
 	/**
 	 * 单位公积金费用

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

@@ -27,7 +27,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
     /**
      * 日期，格式：2020-12-25
      */
-    @ExcelAttribute(name = "日期")
+    @ExcelAttribute(name = "日期", isDate = true)
     private String date;
     /**
      * 接单分公司
@@ -74,7 +74,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
     /**
      * 入职日期
      */
-    @ExcelAttribute(name = "入职日期")
+    @ExcelAttribute(name = "入职日期", isDate = true)
     private String entryDate;
     /**
      * 正式工资
@@ -85,37 +85,37 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
      * 派遣开始日期
      */
     @Length(max = 20, message = "派遣开始日期不能超过20个字符")
-    @ExcelAttribute(name = "派遣开始日期", maxLength = 20)
+    @ExcelAttribute(name = "派遣开始日期", maxLength = 20, isDate = true)
     private String dispatchStart;
     /**
      * 派遣结束日期
      */
     @Length(max = 20, message = "派遣结束日期不能超过20个字符")
-    @ExcelAttribute(name = "派遣结束日期", maxLength = 20)
+    @ExcelAttribute(name = "派遣结束日期", maxLength = 20, isDate = true)
     private String dispatchEnd;
     /**
      * 合同开始日期
      */
     @Length(max = 20, message = "合同开始日期不能超过20个字符")
-    @ExcelAttribute(name = "合同开始日期", maxLength = 20)
+    @ExcelAttribute(name = "合同开始日期", maxLength = 20, isDate = true)
     private String contractStart;
     /**
      * 合同终止日期
      */
     @Length(max = 20, message = "合同终止日期不能超过20个字符")
-    @ExcelAttribute(name = "合同终止日期", maxLength = 20)
+    @ExcelAttribute(name = "合同终止日期", maxLength = 20, isDate = true)
     private String contractEnd;
     /**
      * 试用开始日期
      */
     @Length(max = 20, message = "试用开始日期不能超过20个字符")
-    @ExcelAttribute(name = "试用开始日期", maxLength = 20)
+    @ExcelAttribute(name = "试用开始日期", maxLength = 20, isDate = true)
     private String trialStart;
     /**
      * 试用结束日期
      */
     @Length(max = 20, message = "试用结束日期不能超过20个字符")
-    @ExcelAttribute(name = "试用结束日期", maxLength = 20)
+    @ExcelAttribute(name = "试用结束日期", maxLength = 20, isDate = true)
     private String trialEnd;
     /**
      * 试用期工资
@@ -383,7 +383,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
     /**
      * 离职日期
      */
-    @ExcelAttribute(name = "离职日期", isDate = true, dateFormatExport = DateUtil.ISO_EXPANDED_DATE_FORMAT)
+    @ExcelAttribute(name = "离职日期", isDate = true)
     private Date leaveDate;
     /**
      * 离职原因
@@ -410,7 +410,7 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
      * 员工类型
      */
     @Length(max = 2, message = "员工类型不能超过2个字符")
-    @ExcelAttribute(name = "员工类型",  maxLength = 2)
+    @ExcelAttribute(name = "员工类型", maxLength = 2)
 	@ExcelProperty(value ="员工类型")
     private String empTypeAdd;
     /**
@@ -543,13 +543,13 @@ public class TPreDispatchUpdateVo extends TPreDispatchInfo {
      * 派单合同开始时间
      */
     @Length(max = 20, message = "派单合同开始时间不能超过20个字符")
-    @ExcelAttribute(name = "派单合同开始时间", maxLength = 20)
+    @ExcelAttribute(name = "派单合同开始时间", maxLength = 20, isDate = true)
     private String contractStartAdd;
     /**
      * 派单合同截止时间
      */
     @Length(max = 20, message = "派单合同截止时间不能超过20个字符")
-    @ExcelAttribute(name = "派单合同截止时间", maxLength = 20)
+    @ExcelAttribute(name = "派单合同截止时间", maxLength = 20, isDate = true)
     private String contractEndAdd;
     /**
      * 派单合同期限

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

@@ -50,8 +50,8 @@ public class TSocialFundHistoryVo extends RowIndex implements Serializable {
 	@ExcelProperty("身份证号")
 	private String empIdcard;
 
-	@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/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

@@ -620,12 +620,12 @@ public class TSocialInfoVo extends RowIndex implements Serializable {
 	@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-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -1103,6 +1103,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			social.setAuditStatus(CommonConstants.ZERO_STRING);
 			social.setHandleStatus(CommonConstants.ZERO_STRING);
 			social.setDeleteFlag(CommonConstants.ZERO_STRING);
+			social.setTrustRemark(excel.getTrustRemark());
 			social.setSocialStartDate(excel.getPensionStart());
 			//  封装单位信息 结算信息
 			social.setBelongUnit(excel.getCustomerId());
@@ -1232,6 +1233,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					}
 				}
 			}
+
 			social.setUnitPersionMoney(BigDecimalUtils.safeMultiply(social.getUnitPensionCardinal(), social.getUnitPensionPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
 			social.setUnitMedicalMoney(BigDecimalUtils.safeMultiply(social.getUnitMedicalCardinal(), social.getUnitMedicalPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
 			social.setUnitBirthMoney(BigDecimalUtils.safeMultiply(social.getUnitBirthCardinal(), social.getUnitBirthPer(),BigDecimal.valueOf(CommonConstants.ONE_OF_PERCENT.doubleValue())));
@@ -1297,7 +1299,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			social.setUnitPersionMoney(null);
 			social.setUnitPensionPer(null);
 			social.setUnitPensionCardinal(null);
-			social.setInsurancePension(null);
 		}
 		if (Common.isEmpty(social.getMedicalStart())){
 			social.setMedicalHandle(null);
@@ -1307,30 +1308,33 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			social.setUnitMedicalMoney(null);
 			social.setUnitMedicalPer(null);
 			social.setUnitMedicalCardinal(null);
-			social.setInsuranceMedical(null);
 		}
 		if (Common.isEmpty(social.getBirthStart())){
 			social.setBirthHandle(null);
 			social.setUnitBirthMoney(null);
 			social.setUnitBirthPer(null);
 			social.setUnitBirthCardinal(null);
-			social.setInsuranceBirth(null);
 		}
 		if (Common.isEmpty(social.getUnemployStart())){
 			social.setUnemployHandle(null);
 			social.setUnitUnemploymentCardinal(null);
 			social.setUnitUnemploymentPer(null);
 			social.setUnitUnemploymentCardinal(null);
-			social.setInsuranceUnemployment(null);
 		}
 		if (Common.isEmpty(social.getWorkInjuryStart())){
 			social.setWorkInjuryHandle(null);
 			social.setUnitInjuryMoney(null);
 			social.setUnitWorkUnjuryPer(null);
 			social.setUnitWorkInjuryCardinal(null);
-			social.setInsuranceInjury(null);
 		}
-		if (Common.isEmpty(social.getBigailmentStart())){
+		if (Common.isEmpty(social.getBigailmentStart())
+				|| (Common.isEmpty(social.getPensionStart())
+				&& Common.isEmpty(social.getMedicalStart())
+				&& Common.isEmpty(social.getBirthStart())
+				&& Common.isEmpty(social.getUnemployStart())
+				&& Common.isEmpty(social.getBigailmentStart())
+				&& Common.isNotNull(social.getWorkInjuryStart())
+				)){
 			social.setBigailmentHandle(null);
 			social.setPersonalBigailmentCardinal(null);
 			social.setPersonalBigailmentPer(null);
@@ -1338,7 +1342,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			social.setUnitBigailmentMoney(null);
 			social.setUnitBigailmentPer(null);
 			social.setUnitBigailmentCardinal(null);
-			social.setInsuranceBigailment(null);
 		}
 	}
 
@@ -1683,6 +1686,16 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), checkRes.getMsg()));
 				return true;
 			}
+			// 校验手机号码重复
+			checkRes = archivesDaprUtil.checkMobile(excel.getEmpMobile());
+			if (Common.isEmpty(checkRes) || checkRes.getCode() != CommonConstants.SUCCESS){
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), checkRes.getMsg()));
+				return true;
+			}
+			if (checkRes.getData().booleanValue()){
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_MOBILE_REPEAT)));
+				return true;
+			}
 		}
 		/*项目档案有可用状态的合同：
 		不对合同做判断，取值：项目档案的合同；
@@ -1897,12 +1910,18 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		if (Common.isNotNull(excel.getRecordBase()) && Common.isNotNull(excel.getSocialHousehold())){
 			// 自定义 只要有一个不相当同的 日期或基数 就要提示
 			if (CommonConstants.ONE_STRING.equals(excel.getPaymentType()) && Common.isEmpty(excel.getTrustRemark())
-					&& (excel.getPensionCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT
-					|| excel.getMedicalCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT
-					|| excel.getUnemploymentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT
-					|| excel.getWorkInjuryCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT
-					|| excel.getBirthCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT
-					|| excel.getBigailmentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT
+					&& ((Common.isNotNull(excel.getPensionCardinal())
+					&& excel.getPensionCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
+					|| (Common.isNotNull(excel.getMedicalCardinal())
+					&& excel.getMedicalCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
+					|| (Common.isNotNull(excel.getUnemploymentCardinal())
+					&& excel.getUnemploymentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
+					|| (Common.isNotNull(excel.getWorkInjuryCardinal())
+					&& excel.getWorkInjuryCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
+					|| (Common.isNotNull(excel.getBirthCardinal())
+					&& excel.getBirthCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
+					|| (Common.isNotNull(excel.getBigailmentCardinal())
+					&& excel.getBigailmentCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)
 					)){
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_SOCIAL_BASE_LIMIT_ERROR)));
 				return true;
@@ -2140,7 +2159,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_FAILED));
 				continue;
 			}
-			errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS,CommonConstants.GREEN));
 		}
 	}
 
@@ -2205,6 +2223,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			}
 		}
 		if (Common.isNotNull(excel.getFundReduceDate())){
+			// 公积金状态：派增（0待审核、1待办理、3办理成功、4办理失败9 审核不通过）、派减（5待审核 6待办理 7 办理成功 8 办理失败 ）
+			if (CommonConstants.THREE_STRING.equals(socialFund.getFundStatus())){
+				temp.append(DispatchConstants.DISPATCH_FUND);
+			}
 			dispatch.setFundHandleStatus(CommonConstants.ZERO_STRING);
 			dispatch.setFundId(socialFund.getFundId());
 			dispatch.setFundReduceDate(excel.getSocialReduceDate());
@@ -2214,10 +2236,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			socialFund.setFundReduceDate(excel.getFundReduceDate());
 			socialFund.setFundStatus(CommonConstants.FIVE_STRING);
 			socialFund.setFundReduceStatus(CommonConstants.ZERO_STRING);
-			// 公积金状态：派增（0待审核、1待办理、3办理成功、4办理失败9 审核不通过）、派减（5待审核 6待办理 7 办理成功 8 办理失败 ）
-			if (CommonConstants.THREE_STRING.equals(socialFund.getFundStatus())){
-				temp.append(DispatchConstants.DISPATCH_FUND);
-			}
 		}
 		dispatch.setDispatchItem(temp.toString());
 		dispatch.setBelongUnitName(socialFund.getUnitName());
@@ -2260,8 +2278,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 		//社保状态：派增（0待审核、1待办理、2办理中 3办理成功、4部分办理失败 5 办理失败）、派减（6待审核 7待办理 8办理成功 9 办理失败）
 		if (Common.isNotNull(excel.getSocialReduceDate())){
-			if (!socialFund.getSocialStatus().equals(CommonConstants.THREE_STRING)
-					&& !socialFund.getSocialStatus().equals(CommonConstants.NINE_STRING)){
+			if (Common.isEmpty(socialFund.getSocialStatus())
+					|| !(socialFund.getSocialStatus().equals(CommonConstants.THREE_STRING)
+					|| socialFund.getSocialStatus().equals(CommonConstants.FOUR_STRING)
+					|| socialFund.getSocialStatus().equals(CommonConstants.NINE_STRING))){
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_REDUCE_SOCIAL_STATUS_ERROR)));
 				return true;
 			}
@@ -2272,8 +2292,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		}
 		//公积金状态：派增（0待审核、1待办理、3办理成功、4办理失败）、派减（5待审核 6待办理 7 办理成功 8 办理失败）
 		if (Common.isNotNull(excel.getFundReduceDate())){
-			if (!socialFund.getFundStatus().equals(CommonConstants.THREE_STRING)
-					&& !socialFund.getFundStatus().equals(CommonConstants.EIGHT_STRING)){
+			if (Common.isEmpty(socialFund.getFundStatus())
+					|| (!socialFund.getFundStatus().equals(CommonConstants.THREE_STRING)
+					&& !socialFund.getFundStatus().equals(CommonConstants.EIGHT_STRING))){
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_REDUCE_FUND_STATUS_ERROR)));
 				return true;
 			}
@@ -2444,8 +2465,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									socialInfo.setDeleteFlag(CommonConstants.ONE_STRING);
 									sf.setSocialAddStatus(CommonConstants.FIVE_STRING);
 									sf.setSocialStatus(CommonConstants.TEN_STRING);
-									// 更新预估数据
-									forecastLibraryService.updateForecastLibaryByDispatchReduce(sf);
 								}
 								socialInfo.setAuditTime(now);
 								socialInfo.setAuditUser(user.getId());
@@ -2495,8 +2514,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									providentFund.setDeleteFlag(CommonConstants.ONE_STRING);
 									sf.setFundAddStatus(CommonConstants.FOUR_STRING);
 									sf.setFundStatus(CommonConstants.NINE_STRING);
-									// 更新预估数据
-									forecastLibraryService.updateForecastLibaryByDispatchReduce(sf);
 								}
 								providentFund.setAuditTime(now);
 								providentFund.setAuditUser(user.getId());
@@ -2507,7 +2524,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 								if (CommonConstants.ZERO_INT == flag.intValue()) {
 									providentFund.setReduceCan(CommonConstants.ONE_STRING);
 									sf.setFundReduceStatus(CommonConstants.ONE_STRING);
-									sf.setFundStatus(CommonConstants.EIGHT_STRING);
+									sf.setFundStatus(CommonConstants.SIX_STRING);
 									// 审核不通过
 								} else if (CommonConstants.ONE_INT == flag.intValue()) {
 									// 作废更新：公积金状态、同步档案的公积金状态
@@ -2532,13 +2549,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					// 派单状态信息拼接
 					if (CommonConstants.ZERO_INT == flag.intValue()) {
 						remark += "审核通过：" + auditRemark;
+						initAuditInfo(auditInfo, remark, CommonConstants.ONE_STRING, user,remark);
 					} else {
 						remark += "审核不通过：" + auditRemark;
+						initAuditInfo(auditInfo, remark, CommonConstants.TWO_STRING, user,remark);
 					}
 					//记录处理意见到派单  最新的意见会覆盖之前的，详情 到流程中查询
 					dis.setHandleRemark(ServiceUtil.ifNullToEmpty(auditRemark));
 					dis.setAuditRemark(ServiceUtil.ifNullToEmpty(auditRemark));
-					initAuditInfo(auditInfo, remark, auditStatus, user,remark);
 					auditInfo.setDispatchInfoId(dis.getId());
 					//更新派单状态
 					if (CommonConstants.ZERO_INT == flag.intValue()) {
@@ -2566,6 +2584,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					dis.setAuditTime(now);
 					baseMapper.updateById(dis);
 					socialFundMapper.updateById(sf);
+					// 派增审核不通过
+					if (CommonConstants.dingleDigitStrArray[0].equals(dis.getType())
+							&& CommonConstants.ONE_INT == flag.intValue()){
+						// 更新预估数据
+						forecastLibraryService.updateForecastLibaryByDispatch(sf);
+					}
 				}
 			} catch (Exception e) {
 				log.error(DispatchConstants.DISPATCH_AUDIT_ERROR , e);
@@ -2725,26 +2749,22 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 								// 社保办理状态补充判断：
 								this.setSocialHandleStatus(handleStatus, socialType, flag, socialInfo, dis,sf);
-								// 派增办理，全部失败，清空社保状态
-								if (CommonConstants.TWO_STRING.equals(socialInfo.getHandleStatus())) {
-									// 同步预估库数据
-									forecastLibraryService.updateForecastLibaryByDispatchReduce(sf);
-								}
+
 								socialMapper.updateById(socialInfo);
 								dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
 								auditInfo.setType(CommonConstants.ONE_STRING);
 								if (CommonConstants.ZERO_INT == flag) {
 									temp.setLength(CommonConstants.ZERO_INT);
 									temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
-									temp.append(socialTypeRemark.toString());
+									temp.append(socialTypeRemark);
 									temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS);
-									initAuditInfo(auditInfo, ( temp + handleRemark), handleStatus, user, temp.toString());
+									initAuditInfo(auditInfo, ( temp + handleRemark), CommonConstants.THREE_STRING, user, temp.toString());
 								} else {
 									temp.setLength(CommonConstants.ZERO_INT);
 									temp.append(DispatchConstants.DISPATCH_SOCIAL_ADD);
-									temp.append(socialTypeRemark.toString());
+									temp.append(socialTypeRemark);
 									temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
-									initAuditInfo(auditInfo, ( temp + handleRemark), handleStatus, user, temp.toString());
+									initAuditInfo(auditInfo, ( temp + handleRemark), CommonConstants.FOUR_STRING, user, temp.toString());
 								}
 								auditInfo.setSocialId(dis.getId());
 							} else {
@@ -2770,15 +2790,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									providentFund.setReduceCan(CommonConstants.dingleDigitStrArray[1]);
 									sf.setFundAddStatus(CommonConstants.THREE_STRING);
 									sf.setFundStatus(CommonConstants.FOUR_STRING);
-									// 同步预估库数据
-									forecastLibraryService.updateForecastLibaryByDispatchReduce(sf);
 								}
 								fundMapper.updateById(providentFund);
 								dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
 								if (CommonConstants.ZERO_INT == flag) {
-									initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_ADD_SUCCESS + handleRemark), handleStatus, user, DispatchConstants.DISPATCH_FUND_ADD_SUCCESS);
+									initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_ADD_SUCCESS + handleRemark), CommonConstants.THREE_STRING, user, DispatchConstants.DISPATCH_FUND_ADD_SUCCESS);
 								} else {
-									initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_ADD_FAIL + handleRemark), handleStatus, user, DispatchConstants.DISPATCH_FUND_ADD_FAIL);
+									initAuditInfo(auditInfo, (DispatchConstants.DISPATCH_FUND_ADD_FAIL + handleRemark), CommonConstants.FOUR_STRING, user, DispatchConstants.DISPATCH_FUND_ADD_FAIL);
 								}
 								auditInfo.setProvidentId(dis.getId());
 							} else {
@@ -2804,8 +2822,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									}
 									sf.setSocialReduceStatus(CommonConstants.TWO_STRING);
 									sf.setSocialStatus(CommonConstants.EIGHT_STRING);
-									// 同步预估库数据
-									forecastLibraryService.updateForecastLibaryByDispatchReduce(sf);
 								}
 								if (CommonConstants.ONE_INT == flag) {
 									//派减办理不通过
@@ -2825,14 +2841,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									temp.append(socialTypeRemark.toString());
 									temp.append(DispatchConstants.DISPATCH_HANDLE_SUCCESS);
 									temp.append(handleRemark);
-									initAuditInfo(auditInfo,temp.toString(), handleStatus, user, temp.toString());
+									initAuditInfo(auditInfo,temp.toString(), CommonConstants.THREE_STRING, user, temp.toString());
 								} else {
 									temp.setLength(CommonConstants.ZERO_INT);
 									temp.append(DispatchConstants.DISPATCH_SOCIAL_REDUCE);
 									temp.append(socialTypeRemark.toString());
 									temp.append(DispatchConstants.DISPATCH_HANDLE_FAIL);
 									temp.append(handleRemark);
-									initAuditInfo(auditInfo,temp.toString(), handleStatus, user, temp.toString());
+									initAuditInfo(auditInfo,temp.toString(), CommonConstants.FOUR_STRING, user, temp.toString());
 								}
 								dis.setSocialHandleStatus(handleStatus);
 								auditInfo.setSocialId(dis.getId());
@@ -2854,8 +2870,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 									}
 									sf.setFundReduceStatus(CommonConstants.TWO_STRING);
 									sf.setFundStatus(CommonConstants.SEVEN_STRING);
-									// 派减办理成功后，同步预估库数据清理
-									forecastLibraryService.updateForecastLibaryByDispatchReduce(sf);
 								}
 								if (CommonConstants.ONE_INT == flag) {
 									//派减办理不通过
@@ -2868,10 +2882,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 								fundMapper.updateById(providentFund);
 								dis.setFundHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
 								if (CommonConstants.ZERO_INT == flag) {
-									initAuditInfo(auditInfo, ("公积金派减办理成功：" + handleRemark), handleStatus, user, "");
+									initAuditInfo(auditInfo, ("公积金派减办理成功：" + handleRemark), CommonConstants.SIX_STRING, user, "");
 									dis.setFundHandleStatus(CommonConstants.ONE_STRING);
 								} else {
-									initAuditInfo(auditInfo, ("公积金派减办理失败：" + handleRemark), handleStatus, user, "");
+									initAuditInfo(auditInfo, ("公积金派减办理失败：" + handleRemark), CommonConstants.FOUR_STRING, user, "");
 									dis.setFundHandleStatus(CommonConstants.TWO_STRING);
 								}
 								auditInfo.setProvidentId(dis.getId());
@@ -2945,6 +2959,23 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						auditInfoMapper.insert(auditInfo);
 						baseMapper.updateById(dis);
 						socialFundMapper.updateById(sf);
+						//1.派增办理失败 刷新预估数据
+						if (CommonConstants.ZERO_STRING.equals(dis.getType())
+								&& Common.isNotNull(socialInfo)
+								&& CommonConstants.TWO_STRING.equals(socialInfo.getHandleStatus())) {
+							// 派增办理，全部失败，清空社保状态
+							if (Common.isNotNull(socialInfo)
+									&& CommonConstants.TWO_STRING.equals(socialInfo.getHandleStatus())) {
+								// 同步预估库数据
+								forecastLibraryService.updateForecastLibaryByDispatch(sf);
+							}
+						}
+						//  2.派减办理成功  处理预估
+						if (CommonConstants.ONE_STRING.equals(dis.getType())
+								&& CommonConstants.ZERO_INT == flag){
+							// 同步预估库数据
+							forecastLibraryService.updateForecastLibaryByDispatchReduce(sf);
+						}
 					} else {
 						errorList.add(new ErrorMessage(-1, "派单数据错误！"));
 					}
@@ -3238,7 +3269,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		if (Common.isNotNull(idStr)){
 			ids = Common.initStrToList(idStr,CommonConstants.COMMA_STRING);
 		}
-		return baseMapper.getSocialRecordRosterListCount(searchVo,ids,settleDomains,sql);
+		return baseMapper.getSocialRecordRosterListCount(searchVo,settleDomains,ids,sql);
 	}
 	/**
 	 * @Author fxj
@@ -3248,7 +3279,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	 * @return
 	 **/
 	private List<SocialHandleExportVo> getRecordRosterList(SocialHandleSearchVo searchVo, String idStr, List<String> settleDomains, String sql) {
-		return baseMapper.getSocialRecordRosterList(searchVo,Common.getList(idStr),settleDomains,sql);
+		return baseMapper.getSocialRecordRosterList(searchVo,settleDomains,Common.getList(idStr),sql);
 	}
 
 	@Override
@@ -3339,12 +3370,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	}
 
 	private List<FundHandleExportVo> getFundRecordList(SocialHandleSearchVo searchVo, String idStr, List<String> settleDomains, String sql) {
-		List<String> ids = Common.getList(idStr);
-		return baseMapper.getFundRecordList(searchVo,Common.getList(idStr),settleDomains,sql);
+		return baseMapper.getFundRecordList(searchVo,settleDomains,Common.getList(idStr),sql);
 	}
 
 	private long getFundRecordCount(SocialHandleSearchVo searchVo, String idStr, List<String> settleDomains, String sql) {
-		return baseMapper.getFundRecordCount(searchVo,Common.getList(idStr),settleDomains,sql);
+		return baseMapper.getFundRecordCount(searchVo,settleDomains,Common.getList(idStr),sql);
 	}
 
 }

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

@@ -1080,7 +1080,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

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

@@ -624,7 +624,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			}
 			baseMapper.insert(info);
 		}
-		return null;
+		return errorList;
 	}
 
 	/**

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

@@ -408,10 +408,10 @@
 					<if test="tDispatchInfo.providentHouseholdName != null and tDispatchInfo.providentHouseholdName.trim() != ''">
 						AND f.PROVIDENT_HOUSEHOLD_NAME like CONCAT(CONCAT(#{tDispatchInfo.providentHouseholdName}), '%')
 					</if>
-					<if test="tDispatchInfo.createTimeStart != null and tDispatchInfo.createTimeStart.trim() != ''">
+					<if test="tDispatchInfo.createTimeStart != null">
 						AND a.CREATE_TIME <![CDATA[ >= ]]> #{tDispatchInfo.createTimeStart}
 					</if>
-					<if test="tDispatchInfo.createTimeEnd != null and tDispatchInfo.createTimeEnd.trim() != ''">
+					<if test="tDispatchInfo.createTimeEnd != null">
 						AND a.CREATE_TIME <![CDATA[ <= ]]> #{tDispatchInfo.createTimeEnd}
 					</if>
 		</if>