优化修改

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TWorkHandlerInfo.java

@@ -117,7 +117,7 @@ public class TWorkHandlerInfo {
 	/**
 	 * 执行结果
 	 */
-	@ExcelAttribute(name = "执行结果", maxLength = 5)
+	@ExcelAttribute(name = "执行结果", readConverterExp = "0=未执行,1=部分成功,2=全部成功")
 	@Length(max = 5, message = "执行结果不能超过5个字符")
 	@ExcelProperty("执行结果")
 	@Schema(description = "执行结果")

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

+package com.yifu.cloud.plus.v1.yifu.archives.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @Author fxj
+ * @Date 2022/6/27
+ * @Description
+ * @Version 1.0
+ */
+@Data
+public class TWorkHandlerInfoVo implements Serializable {
+
+	/**
+	 * 项目编码
+	 */
+	@ExcelAttribute(name = "项目编码", isNotEmpty = true, errorInfo = "项目编码不能为空", maxLength = 32)
+	@NotBlank(message = "项目编码不能为空")
+	@Length(max = 32, message = "项目编码不能超过32个字符")
+	@ExcelProperty("项目编码")
+	@Schema(description = "项目编码")
+	private String departNo;
+	/**
+	 * 项目名称
+	 */
+	@ExcelAttribute(name = "项目名称", isNotEmpty = true, errorInfo = "项目名称不能为空", maxLength = 50)
+	@NotBlank(message = "项目名称不能为空")
+	@Length(max = 50, message = "项目名称不能超过50个字符")
+	@ExcelProperty("项目名称")
+	@Schema(description = "项目名称")
+	private String departName;
+	/**
+	 * 员工姓名
+	 */
+	@ExcelAttribute(name = "员工姓名", maxLength = 32)
+	@Length(max = 32, message = "员工姓名不能超过32个字符")
+	@ExcelProperty("员工姓名")
+	@Schema(description = "员工姓名")
+	private String empName;
+	/**
+	 * 员工身份证
+	 */
+	@ExcelAttribute(name = "员工身份证", maxLength = 32)
+	@Length(max = 32, message = "员工身份证不能超过32个字符")
+	@ExcelProperty("员工身份证")
+	@Schema(description = "员工身份证")
+	private String empIdcard;
+	/**
+	 * 联动端口
+	 */
+	@ExcelAttribute(name = "联动端口", maxLength = 8)
+	@Length(max = 8, message = "联动端口不能超过8个字符")
+	@ExcelProperty("联动端口")
+	@Schema(description = "联动端口")
+	private String infoFrom;
+	/**
+	 * 操作人
+	 */
+	@ExcelAttribute(name = "操作人", maxLength = 32)
+	@Length(max = 32, message = "操作人不能超过32个字符")
+	@ExcelProperty("操作人")
+	@Schema(description = "操作人")
+	private String operUser;
+	/**
+	 * 操作时间
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "操作时间")
+	@TableField(fill = FieldFill.INSERT)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("操作时间")
+	private LocalDateTime operTime;
+	/**
+	 * 执行结果
+	 */
+	@ExcelAttribute(name = "执行结果")
+	@Length(max = 5, message = "执行结果不能超过5个字符")
+	@ExcelProperty("执行结果")
+	@Schema(description = "执行结果")
+	private String operResult;
+	/**
+	 * 执行详情
+	 */
+	@ExcelAttribute(name = "执行详情", maxLength = 255)
+	@Length(max = 255, message = "执行详情不能超过255个字符")
+	@ExcelProperty("执行详情")
+	@Schema(description = "执行详情")
+	private String operInfo;
+	/**
+	 * 原因
+	 */
+	@ExcelAttribute(name = "原因", maxLength = 255)
+	@Length(max = 255, message = "原因不能超过255个字符")
+	@ExcelProperty("原因")
+	@Schema(description = "原因")
+	private String reason;
+
+}

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TWorkHandlerInfoMapper.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TWorkHandlerInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TWorkHandlerInfoSearchVo;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TWorkHandlerInfoVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -44,5 +45,5 @@ public interface TWorkHandlerInfoMapper extends BaseMapper<TWorkHandlerInfo> {
 
 	Integer noPageCountDiy(@Param("tWorkHandlerInfo") TWorkHandlerInfoSearchVo tWorkHandlerInfo);
 
-	List<TWorkHandlerInfo> noPageDiy(@Param("tWorkHandlerInfo") TWorkHandlerInfoSearchVo tWorkHandlerInfo);
+	List<TWorkHandlerInfoVo> noPageDiy(@Param("tWorkHandlerInfo") TWorkHandlerInfoSearchVo tWorkHandlerInfo);
 }

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

@@ -27,6 +27,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.TWorkHandlerInfoSearchVo;
 import com.yifu.cloud.plus.v1.yifu.archives.mapper.TWorkHandlerInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.archives.service.TWorkHandlerInfoService;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.InsertWorkHandlerVo;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TWorkHandlerInfoVo;
 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.DateUtil;
@@ -68,14 +69,14 @@ public class TWorkHandlerInfoServiceImpl extends ServiceImpl<TWorkHandlerInfoMap
     public void listExport(HttpServletResponse response, TWorkHandlerInfoSearchVo searchVo){
         String fileName = "任务处理清单表批量导出" + DateUtil.getThisTime() + ".xlsx";
         //获取要导出的列表
-        List<TWorkHandlerInfo> list = new ArrayList<>();
+        List<TWorkHandlerInfoVo> list = new ArrayList<>();
         Integer count = baseMapper.noPageCountDiy(searchVo);
         try (ServletOutputStream out = response.getOutputStream()) {
             response.setContentType(CommonConstants.MULTIPART_FORM_DATA);
             response.setCharacterEncoding("utf-8");
             response.setHeader(CommonConstants.CONTENT_DISPOSITION, CommonConstants.ATTACHMENT_FILENAME + URLEncoder.encode(fileName  , CommonConstants.UTF8));
             // 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
-			ExcelWriter excelWriter = EasyExcel.write(out, TWorkHandlerInfo.class).includeColumnFieldNames(searchVo.getExportFields()).build();
+			ExcelWriter excelWriter = EasyExcel.write(out, TWorkHandlerInfoVo.class).includeColumnFieldNames(searchVo.getExportFields()).build();
 
 			int index = 0;
             if (count >  CommonConstants.ZERO_INT){

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

@@ -37,6 +37,7 @@
     <result property="operInfo" column="OPER_INFO"/>
     <result property="reason" column="REASON"/>
   </resultMap>
+
     <sql id="Base_Column_List">
                 a.ID,
                 a.DEPART_NO,
@@ -51,7 +52,19 @@
                 a.OPER_INFO,
                 a.REASON
     </sql>
-    <sql id="tWorkHandlerInfo_where">
+	<resultMap id="tWorkHandlerInfoVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TWorkHandlerInfoVo">
+		<result property="departNo" column="DEPART_NO"/>
+		<result property="departName" column="DEPART_NAME"/>
+		<result property="empName" column="EMP_NAME"/>
+		<result property="empIdcard" column="EMP_IDCARD"/>
+		<result property="infoFrom" column="INFO_FROM"/>
+		<result property="operUser" column="OPER_USER"/>
+		<result property="operTime" column="OPER_TIME"/>
+		<result property="operResult" column="OPER_RESULT"/>
+		<result property="operInfo" column="OPER_INFO"/>
+		<result property="reason" column="REASON"/>
+	</resultMap>
+	<sql id="tWorkHandlerInfo_where">
         <if test="tWorkHandlerInfo != null">
                     <if test="tWorkHandlerInfo.departNo != null and tWorkHandlerInfo.departNo.trim() != ''">
                         AND a.DEPART_NO = #{tWorkHandlerInfo.departNo}
@@ -104,9 +117,21 @@
 		</where>
 	</select>
 
-	<select id="noPageDiy" resultMap="tWorkHandlerInfoMap">
+	<select id="noPageDiy" resultMap="tWorkHandlerInfoVoMap">
 		SELECT
-		<include refid="Base_Column_List"/>
+			a.DEPART_NO,
+			a.DEPART_NAME,
+			a.EMP_NAME,
+			a.EMP_IDCARD,
+			a.INFO_FROM,
+			a.OPER_USER,
+			a.OPER_TIME,
+			CASE WHEN a.OPER_RESULT=0 THEN "未执行"
+			WHEN a.OPER_RESULT =1 THEN "部分成功"
+			WHEN a.OPER_RESULT =2 THEN "全部成功"
+			ELSE a.OPER_RESULT END as "OPER_RESULT",
+			a.OPER_INFO,
+			a.REASON
 		FROM t_work_handler_info a
 		<where>
 			1=1
@@ -115,4 +140,4 @@
 		order by a.OPER_TIME desc
 		limit #{tWorkHandlerInfo.limitStart},#{tWorkHandlerInfo.limitEnd}
 	</select>
-</mapper>
+</mapper>
\ No newline at end of file

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

@@ -457,6 +457,30 @@ public interface ErrorCodes {
 	 * 派增异常： 社保派单基数不可小于最低基数且不可大于最高基数
 	 */
 	String EMP_DISPATCH_SOCIAL_LIMIT_ERROR = "emp.dispatch.social.limit.error";
+	/**
+	 * 派增异常： 社保派单养老基数不可小于最低基数且不可大于最高基数
+	 */
+	String YL_DISPATCH_SOCIAL_LIMIT_ERROR = "yl.dispatch.social.limit.error";
+	/**
+	 * 派增异常： 社保派单医疗基数不可小于最低基数且不可大于最高基数
+	 */
+	String YB_DISPATCH_SOCIAL_LIMIT_ERROR = "yb.dispatch.social.limit.error";
+	/**
+	 * 派增异常： 社保派单工伤基数不可小于最低基数且不可大于最高基数
+	 */
+	String GS_DISPATCH_SOCIAL_LIMIT_ERROR = "gs.dispatch.social.limit.error";
+	/**
+	 * 派增异常： 社保派单失业基数不可小于最低基数且不可大于最高基数
+	 */
+	String SY_DISPATCH_SOCIAL_LIMIT_ERROR = "sy.dispatch.social.limit.error";
+	/**
+	 * 派增异常： 社保派单生育基数不可小于最低基数且不可大于最高基数
+	 */
+	String BIR_DISPATCH_SOCIAL_LIMIT_ERROR = "bir.dispatch.social.limit.error";
+	/**
+	 * 派增异常： 社保派单大病基数不可小于最低基数且不可大于最高基数
+	 */
+	String DB_DISPATCH_SOCIAL_LIMIT_ERROR = "db.dispatch.social.limit.error";
 	/**
 	 * 派增异常： 公积金派单基数不可小于最低基数且不可大于最高基数
 	 */

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

@@ -166,7 +166,12 @@ emp.dispatch.emp.project.not.used=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5BF9\u5E94\u9
 
 emp.dispatch.emp.not.used=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5BF9\u5E94\u8EAB\u4EFD\u8BC1\u7684\u4EBA\u5458\u6863\u6848\u5DF2\u51CF\u6863\uFF0C\u8BF7\u53BB\u4EBA\u5458\u6863\u6848\u5904\u590D\u6863
 
-emp.dispatch.social.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u201C\u7F34\u7EB3\u7C7B\u578B\u201D\u4E3A\u201C\u81EA\u5B9A\u4E49\u201D\u65F6\uFF0C\u8D2D\u4E70\u57FA\u6570\u9700\u2265\u8BE5\u793E\u4FDD\u6237\u7684\u6700\u4F4E\u57FA\u6570\uFF0C\u4E14\u2264\u6700\u9AD8\u57FA\u6570
+yl.dispatch.social.limit.error=\u793E\u4FDD\u201C\u7F34\u7EB3\u7C7B\u578B\u201D\u4E3A\u201C\u81EA\u5B9A\u4E49\u201D\u65F6\uFF0C\u517B\u8001\u8D2D\u4E70\u57FA\u6570\u9700\u2265\u8BE5\u793E\u4FDD\u6237\u7684\u517B\u8001\u6700\u4F4E\u57FA\u6570\uFF0C\u4E14\u2264\u517B\u8001\u6700\u9AD8\u57FA\u6570
+yb.dispatch.social.limit.error=\u793E\u4FDD\u201C\u7F34\u7EB3\u7C7B\u578B\u201D\u4E3A\u201C\u81EA\u5B9A\u4E49\u201D\u65F6\uFF0C\u533B\u7597\u8D2D\u4E70\u57FA\u6570\u9700\u2265\u8BE5\u793E\u4FDD\u6237\u7684\u533B\u7597\u6700\u4F4E\u57FA\u6570\uFF0C\u4E14\u2264\u533B\u7597\u6700\u9AD8\u57FA\u6570
+gs.dispatch.social.limit.error=\u793E\u4FDD\u201C\u7F34\u7EB3\u7C7B\u578B\u201D\u4E3A\u201C\u81EA\u5B9A\u4E49\u201D\u65F6\uFF0C\u5DE5\u4F24\u8D2D\u4E70\u57FA\u6570\u9700\u2265\u8BE5\u793E\u4FDD\u6237\u7684\u5DE5\u4F24\u6700\u4F4E\u57FA\u6570\uFF0C\u4E14\u2264\u5DE5\u4F24\u6700\u9AD8\u57FA\u6570
+sy.dispatch.social.limit.error=\u793E\u4FDD\u201C\u7F34\u7EB3\u7C7B\u578B\u201D\u4E3A\u201C\u81EA\u5B9A\u4E49\u201D\u65F6\uFF0C\u5931\u4E1A\u8D2D\u4E70\u57FA\u6570\u9700\u2265\u8BE5\u793E\u4FDD\u6237\u7684\u5931\u4E1A\u6700\u4F4E\u57FA\u6570\uFF0C\u4E14\u2264\u5931\u4E1A\u6700\u9AD8\u57FA\u6570
+bir.dispatch.social.limit.error=\u793E\u4FDD\u201C\u7F34\u7EB3\u7C7B\u578B\u201D\u4E3A\u201C\u81EA\u5B9A\u4E49\u201D\u65F6\uFF0C\u751F\u80B2\u8D2D\u4E70\u57FA\u6570\u9700\u2265\u8BE5\u793E\u4FDD\u6237\u7684\u751F\u80B2\u6700\u4F4E\u57FA\u6570\uFF0C\u4E14\u2264\u751F\u80B2\u6700\u9AD8\u57FA\u6570
+db.dispatch.social.limit.error=\u793E\u4FDD\u201C\u7F34\u7EB3\u7C7B\u578B\u201D\u4E3A\u201C\u81EA\u5B9A\u4E49\u201D\u65F6\uFF0C\u5927\u75C5\u8D2D\u4E70\u57FA\u6570\u9700\u2265\u8BE5\u793E\u4FDD\u6237\u7684\u5927\u75C5\u6700\u4F4E\u57FA\u6570\uFF0C\u4E14\u2264\u5927\u75C5\u6700\u9AD8\u57FA\u6570
 
 emp.dispatch.fund.limit.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u516C\u79EF\u91D1\u8D2D\u4E70\u57FA\u6570\u9700\u2265\u8BE5\u516C\u79EF\u91D1\u6237\u7684\u6700\u4F4E\u57FA\u6570\uFF0C\u4E14\u2264\u6700\u9AD8\u57FA\u6570
 

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

@@ -1628,34 +1628,34 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				social.setUnitBirthPer(socialSet.getUnitBirthPro());
 				//按最低
 				if (CommonConstants.ZERO_STRING.equals(excel.getPaymentType())){
-					social.setPersonalPensionCardinal(socialSet.getLowerLimit());
-					social.setPersonalMedicalCardinal(socialSet.getLowerLimit());
-					social.setPersonalUnemploymentCardinal(socialSet.getLowerLimit());
-
-					social.setUnitPensionCardinal(socialSet.getLowerLimit());
-					social.setUnitMedicalCardinal(socialSet.getLowerLimit());
-					social.setUnitUnemploymentCardinal(socialSet.getLowerLimit());
-					social.setUnitWorkInjuryCardinal(socialSet.getLowerLimit());
-					social.setUnitBirthCardinal(socialSet.getLowerLimit());
+					social.setPersonalPensionCardinal(socialSet.getLowerPersion());
+					social.setPersonalMedicalCardinal(socialSet.getLowerMedical());
+					social.setPersonalUnemploymentCardinal(socialSet.getLowerUnemployment());
+
+					social.setUnitPensionCardinal(socialSet.getLowerPersion());
+					social.setUnitMedicalCardinal(socialSet.getLowerMedical());
+					social.setUnitUnemploymentCardinal(socialSet.getLowerUnemployment());
+					social.setUnitWorkInjuryCardinal(socialSet.getLowerInjury());
+					social.setUnitBirthCardinal(socialSet.getLowerBirth());
 					if (CommonConstants.ZERO_STRING.equals(social.getIsIllness())){
-						social.setUnitBigailmentCardinal(socialSet.getLowerLimit());
-						social.setPersonalBigailmentCardinal(socialSet.getLowerLimit());
+						social.setUnitBigailmentCardinal(socialSet.getLowerBig());
+						social.setPersonalBigailmentCardinal(socialSet.getLowerBig());
 					}
 				}
 				//按最高
 				if (CommonConstants.TWO_STRING.equals(excel.getPaymentType())){
-					social.setPersonalPensionCardinal(socialSet.getUpperLimit());
-					social.setPersonalMedicalCardinal(socialSet.getUpperLimit());
-					social.setPersonalUnemploymentCardinal(socialSet.getUpperLimit());
-
-					social.setUnitPensionCardinal(socialSet.getUpperLimit());
-					social.setUnitMedicalCardinal(socialSet.getUpperLimit());
-					social.setUnitUnemploymentCardinal(socialSet.getUpperLimit());
-					social.setUnitWorkInjuryCardinal(socialSet.getUpperLimit());
-					social.setUnitBirthCardinal(socialSet.getUpperLimit());
+					social.setPersonalPensionCardinal(socialSet.getUpPersion());
+					social.setPersonalMedicalCardinal(socialSet.getUpMedical());
+					social.setPersonalUnemploymentCardinal(socialSet.getUpUnemployment());
+
+					social.setUnitPensionCardinal(socialSet.getUpPersion());
+					social.setUnitMedicalCardinal(socialSet.getUpMedical());
+					social.setUnitUnemploymentCardinal(socialSet.getUpUnemployment());
+					social.setUnitWorkInjuryCardinal(socialSet.getUpInjury());
+					social.setUnitBirthCardinal(socialSet.getUpBirth());
 					if (CommonConstants.ZERO_STRING.equals(social.getIsIllness())){
-						social.setPersonalBigailmentCardinal(socialSet.getUpperLimit());
-						social.setUnitBigailmentCardinal(socialSet.getUpperLimit());
+						social.setPersonalBigailmentCardinal(socialSet.getUpBig());
+						social.setUnitBigailmentCardinal(socialSet.getUpBig());
 					}
 				}
 				if (CommonConstants.ZERO_STRING.equals(social.getIsIllness())){
@@ -2512,28 +2512,43 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	}
 
 	private boolean validSocialBaseInfo(List<ErrorMessage> errorMessageList, TDispatchImportVo excel, DispatchEmpVo empVo, SysBaseSetInfo socialSet, Date contractDateTemp) {
-		if (Common.isNotNull(socialSet) && CommonConstants.ONE_STRING.equals(excel.getPaymentType())
-				&& ((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;
+		if (Common.isNotNull(socialSet) && CommonConstants.ONE_STRING.equals(excel.getPaymentType())) {
+			if (Common.isNotNull(excel.getPensionCardinal())
+					&& (excel.getPensionCardinal().compareTo(socialSet.getUpPersion()) > CommonConstants.ZERO_INT
+					|| excel.getPensionCardinal().compareTo(socialSet.getLowerPersion())< CommonConstants.ZERO_INT)) {
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.YL_DISPATCH_SOCIAL_LIMIT_ERROR)));
+				return true;
+			}
+			if (Common.isNotNull(excel.getMedicalCardinal())
+					&& (excel.getMedicalCardinal().compareTo(socialSet.getUpMedical()) > CommonConstants.ZERO_INT
+					|| excel.getMedicalCardinal().compareTo(socialSet.getLowerMedical())< CommonConstants.ZERO_INT)) {
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.YB_DISPATCH_SOCIAL_LIMIT_ERROR)));
+				return true;
+			}
+			if (Common.isNotNull(excel.getUnemploymentCardinal())
+					&& (excel.getUnemploymentCardinal().compareTo(socialSet.getUpUnemployment()) > CommonConstants.ZERO_INT
+					|| excel.getUnemploymentCardinal().compareTo(socialSet.getLowerUnemployment())< CommonConstants.ZERO_INT)) {
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.SY_DISPATCH_SOCIAL_LIMIT_ERROR)));
+				return true;
+			}
+			if (Common.isNotNull(excel.getWorkInjuryCardinal())
+					&& (excel.getWorkInjuryCardinal().compareTo(socialSet.getUpInjury()) > CommonConstants.ZERO_INT
+					|| excel.getWorkInjuryCardinal().compareTo(socialSet.getLowerInjury())< CommonConstants.ZERO_INT)) {
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.GS_DISPATCH_SOCIAL_LIMIT_ERROR)));
+				return true;
+			}
+			if (Common.isNotNull(excel.getBirthCardinal())
+					&& (excel.getBirthCardinal().compareTo(socialSet.getUpBirth()) > CommonConstants.ZERO_INT
+					|| excel.getBirthCardinal().compareTo(socialSet.getLowerBirth())< CommonConstants.ZERO_INT)) {
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.BIR_DISPATCH_SOCIAL_LIMIT_ERROR)));
+				return true;
+			}
+			if (Common.isNotNull(excel.getBigailmentCardinal())
+					&& (excel.getBigailmentCardinal().compareTo(socialSet.getUpBig()) > CommonConstants.ZERO_INT
+					|| excel.getBigailmentCardinal().compareTo(socialSet.getLowerBig())< CommonConstants.ZERO_INT)) {
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.DB_DISPATCH_SOCIAL_LIMIT_ERROR)));
+				return true;
+			}
 		}
 		// 备案基数和养老基数 养老起缴日期 必填在前面已必填校验，这里不重复校验
 		if (Common.isNotNull(excel.getRecordBase()) && Common.isNotNull(excel.getSocialHousehold())){
@@ -2580,10 +2595,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				return true;
 			}
 			if (CommonConstants.ZERO_STRING.equals(excel.getPaymentType())){
-				excel.setPensionCardinal(socialSet.getLowerLimit());
+				excel.setPensionCardinal(socialSet.getLowerPersion());
 			}
 			if (CommonConstants.TWO_STRING.equals(excel.getPaymentType())){
-				excel.setPensionCardinal(socialSet.getUpperLimit());
+				excel.setPensionCardinal(socialSet.getUpPersion());
 			}
 			if (!CommonConstants.ONE_STRING.equals(excel.getPaymentType()) && Common.isEmpty(excel.getTrustRemark())
 					&& (excel.getPensionCardinal().compareTo(excel.getRecordBase()) != CommonConstants.ZERO_INT)){