派单调整

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;
@@ -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-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -3259,7 +3259,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
@@ -3269,7 +3269,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
@@ -3361,11 +3361,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);
 	}
 
 }