非税查询导出调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/taskordernontaxrecord/vo/TaskOrderNonTaxRecordRespVO.java

@@ -21,32 +21,60 @@ public class TaskOrderNonTaxRecordRespVO {
     @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8583")
     private String id;
 
+    @Schema(description = "任务单号（导出用）")
+    @ExcelProperty("任务单号")
+    private String orderNosStr;
+
     @Schema
     @ExcelProperty("开单人")
     private String handledByName;
 
     @Schema(description = "开单日期")
-    @ExcelProperty("开单时间")
+    @ExcelProperty("开单日期")
     private LocalDateTime openDate;
 
+    @Schema(description = "缴费金额")
+    @ExcelProperty("任务单金额")
+    private BigDecimal totalAmount;
+
+    @Schema(description = "实际金额")
+    @ExcelProperty("拆单金额")
+    private BigDecimal actualAmount;
+
     @Schema(description = "付款人")
     @ExcelProperty("缴费单位（个人）")
     private String payer;
 
+    @Schema(description = "设备类型名称")
+    @ExcelProperty("设备类型")
+    private String equipMainTypeName;
+
+    @Schema(description = "缴费通知书")
+    @ExcelProperty("缴费通知书")
+    private String paymentInstructionNo;
+
+    @Schema(description = "付款状态名称")
+    @ExcelProperty("缴费单状态")
+    private String payStatusName;
+
+    @Schema(description = "单位名称", example = "张三")
+    @ExcelProperty("缴费单位")
+    private String unitName;
+
+    @Schema(description = "付款日期")
+    @ExcelProperty("收款日期")
+    private LocalDateTime payDate;
+
+    @Schema(description = "票据编号")
+    @ExcelProperty("财政票据号")
+    private String billNumber;
+
     @Schema(description = "联系电话")
     private String contactPhone;
 
     @Schema(description = "联系人邮箱")
     private String email;
 
-    @Schema(description = "缴费金额")
-    @ExcelProperty("缴费金额")
-    private BigDecimal totalAmount;
-
-    @Schema(description = "实际金额")
-    @ExcelProperty("实际金额")
-    private BigDecimal actualAmount;
-
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
@@ -80,10 +108,6 @@ public class TaskOrderNonTaxRecordRespVO {
     @Schema(description = "付款状态 100 待缴费 200 已缴费  300 已作废", example = "2")
     private Integer payStatus;
 
-    @Schema(description = "付款状态名称")
-    @ExcelProperty("付款状态")
-    private String payStatusName;
-
     /**
      * 设置付款状态时，自动更新付款状态名称
      */
@@ -111,26 +135,12 @@ public class TaskOrderNonTaxRecordRespVO {
         }
     }
 
-    @Schema(description = "缴费通知书")
-    @ExcelProperty("缴费通知书")
-    private String paymentInstructionNo;
-
     @Schema(description = "任务单号列表")
     private List<String> orderNos;
 
-    @Schema(description = "任务单号（导出用）")
-    @ExcelProperty("任务单号")
-    private String orderNosStr;
-
     @Schema(description = "部门", example = "25182")
     private String deptId;
 
-    @Schema(description = "付款日期")
-    private LocalDateTime payDate;
-
-    @Schema(description = "票据编号")
-    private String billNumber;
-
     @Schema(description = "缴费通知书")
     private String paymentInstruction;
 
@@ -140,19 +150,12 @@ public class TaskOrderNonTaxRecordRespVO {
     @Schema(description = "检验日期")
     private LocalDate checkDate;
 
-    @Schema(description = "单位名称", example = "张三")
-    private String unitName;
-
     @Schema(description = "使用单位名称", example = "张三")
     private String useUnitName;
 
     @Schema(description = "设备类型 200锅炉 300管道", example = "1")
     private Integer equipMainType;
 
-    @Schema(description = "设备类型名称")
-    @ExcelProperty("设备类型")
-    private String equipMainTypeName;
-
     /**
      * 设置设备类型时，自动更新设备类型名称
      */