Ver código fonte

fix:单次任务导出修改

ly 10 meses atrás
pai
commit
92b42dcd91

+ 12 - 13
src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrder.java

@@ -42,7 +42,6 @@ public class BizWorkOrder extends BaseEntity {
     @TableField(exist = false)
     private String companyName;
 
-    @Excel(name = "税号", width = 30, sort = 2)
     @ApiModelProperty("税号")
     @TableField(exist = false)
     private String socialCreditCode;
@@ -63,7 +62,7 @@ public class BizWorkOrder extends BaseEntity {
     /**
      * 工单类型 1循环 2代办
      */
-    @Excel(name = "工单类型", sort = 3)
+
     @ApiModelProperty(value = "工单类型 1循环 2代办")
     private String orderType;
 
@@ -88,7 +87,7 @@ public class BizWorkOrder extends BaseEntity {
     @TableField(exist = false)
     private String taskTypeName;
 
-    @Excel(name = "项目", sort = 4)
+    @Excel(name = "项目", sort = 3)
     @TableField(exist = false)
     private String projectType;
 
@@ -206,7 +205,7 @@ public class BizWorkOrder extends BaseEntity {
     @ApiModelProperty("服务人员")
     private Long serviceId;
 
-    @Excel(name = "执行人", sort = 6)
+    @Excel(name = "执行人", sort = 10)
     @TableField(exist = false)
     private String serviceName;
 
@@ -217,8 +216,8 @@ public class BizWorkOrder extends BaseEntity {
     private BizEntrust entrust;
     @TableField(exist = false)
     @Excels({
-            @Excel(name = "交接单",targetAttr="resultStatus",readConverterExp = "2=暂停办理,0=中止任务,1=完成任务", sort = 20),
-            @Excel(name = "状态",targetAttr="status",readConverterExp = "0=未开始,1=办理中,3=已完成,4=暂停中", sort = 21)
+            @Excel(name = "交接单",targetAttr="resultStatus",readConverterExp = "2=暂停办理,0=中止任务,1=完成任务", sort = 12),
+            @Excel(name = "状态",targetAttr="status",readConverterExp = "0=未开始,1=办理中,3=已完成,4=暂停中", sort = 6)
     })
     private BizWorkOrderRecord record;
 
@@ -238,18 +237,18 @@ public class BizWorkOrder extends BaseEntity {
     @TableField(exist = false)
     private String inputDistrict;
     @TableField(exist = false)
-    @Excel(name = "说明", sort = 5)
+    @Excel(name = "说明", sort = 13)
     private String explain;
 
     /**
      * 办理人时间
      */
-    @Excel(name = "领取时间", sort = 8, dateFormat = "yyyy-MM-dd HH:mm")
+    @Excel(name = "领取时间", sort = 5, dateFormat = "yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @TableField(exist = false)
     private Date handlerTime;
     @TableField(exist = false)
-    @Excel(name = "领取人", sort = 7)
+    @Excel(name = "领取人", sort = 4)
     private String handlerName;
 
 
@@ -260,25 +259,25 @@ public class BizWorkOrder extends BaseEntity {
      * 委托时间
      */
     @TableField(exist = false)
-    @Excel(name = "委托时间", sort = 5, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "委托时间", sort = 8, dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date entrustTime;
 
     @TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    @Excel(name = "完成时间", sort = 10, dateFormat = "yyyy-MM-dd HH:mm")
+    @Excel(name = "完成时间", sort = 7, dateFormat = "yyyy-MM-dd HH:mm")
     private Date finishTime;
 
     @TableField(exist = false)
     private Integer recordStatus;
-
+    @Excel(name = "来源", width = 30, sort = 2)
     @TableField(exist = false)
     private String accountName;
     @TableField(exist = false)
     @Excel(name = "已收款", sort = 11)
     private BigDecimal arriveAmount;
     @TableField(exist = false)
-    @Excel(name = "任务进度", sort = 12)
+    @Excel(name = "任务进度", sort = 9)
     private String onWorkDetail;
     @TableField(exist = false)
     private Integer resultStatus;