审核导出顺序调整

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

@@ -40,6 +40,18 @@ import java.util.Date;
 @Schema(description = "派单审核导出Vo")
 public class TDispatchAuditExportVo {
 
+	@ExcelAttribute(name = "派单类型", readConverterExp = "0=增加派单,1=减少派单")
+	@Schema(description = "派单类型：0派增1派减")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("派单类型")
+	private String type;
+
+	@Schema(description = "创建时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("创建时间")
+	private LocalDateTime createTime;
+
 	@ExcelAttribute(name = "员工姓名", maxLength = 50)
 	@Schema(description = "员工姓名")
 	@HeadFontStyle(fontHeightInPoints = 11)
@@ -64,12 +76,6 @@ public class TDispatchAuditExportVo {
 	@ExcelProperty("项目名称")
 	private String settleDomainName;
 
-	@ExcelAttribute(name = "派单类型", readConverterExp = "0=增加派单,1=减少派单")
-	@Schema(description = "派单类型：0派增1派减")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("派单类型")
-	private String type;
-
 	@ExcelAttribute(name = "社保户", maxLength = 50)
 	@Schema(description = "社保户")
 	@HeadFontStyle(fontHeightInPoints = 11)
@@ -82,6 +88,14 @@ public class TDispatchAuditExportVo {
 	@ExcelProperty("公积金户")
 	private String providentHouseholdName;
 
+	/**
+	 * 合同类型（字典值）
+	 */
+	@ExcelAttribute(name = "合同类型",maxLength = 10)
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty(value ="合同类型")
+	private String contractName;
+
 	/**
 	 * 合同起始时间
 	 */
@@ -92,14 +106,6 @@ public class TDispatchAuditExportVo {
 	@ExcelProperty("合同起始时间" )
 	private Date contractStart;
 
-	/**
-	 * 合同类型（字典值）
-	 */
-	@ExcelAttribute(name = "合同类型",maxLength = 10)
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty(value ="合同类型")
-	private String contractName;
-
 	/**
 	 * 合同到期时间
 	 */
@@ -110,17 +116,21 @@ public class TDispatchAuditExportVo {
 	@ExcelProperty("合同到期时间" )
 	private Date contractEnd;
 
+	/**
+	 * 工时制：1标准工时 2 综合工时 3不定时工时制
+	 */
+	@Length(max = 1, message = "工时制 不能超过1个字符" )
+	@ExcelAttribute(name = "工时制", maxLength = 1, readConverterExp = "1=标准工时,2=综合工时,3=不定时工时制")
+	@Schema(description = "工时制：1标准工时 2 综合工时 3不定时工时制" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("工时制" )
+	private String workingHours;
+
 	@Schema(description = "创建人姓名")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("创建人姓名")
 	private String createName;
 
-	@Schema(description = "创建时间")
-	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("创建时间")
-	private LocalDateTime createTime;
-
 	/**
 	 * 委托备注
 	 */
@@ -141,16 +151,6 @@ public class TDispatchAuditExportVo {
 	@ExcelProperty("备案基数" )
 	private String recordBase;
 
-	/**
-	 * 工时制：1标准工时 2 综合工时 3不定时工时制
-	 */
-	@Length(max = 1, message = "工时制 不能超过1个字符" )
-	@ExcelAttribute(name = "工时制", maxLength = 1, readConverterExp = "1=标准工时,2=综合工时,3=不定时工时制")
-	@Schema(description = "工时制：1标准工时 2 综合工时 3不定时工时制" )
-	@HeadFontStyle(fontHeightInPoints = 11)
-	@ExcelProperty("工时制" )
-	private String workingHours;
-
 	@ExcelAttribute(name = "缴纳类型", readConverterExp = "0=最低,1=自定义,2=最高")
 	@Schema(description = "缴纳类型（0最低、1自定义、2最高）")
 	@HeadFontStyle(fontHeightInPoints = 11)