浏览代码

no message

FengChaoYu 9 月之前
父节点
当前提交
944fb2614d

+ 2 - 2
mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/DailyIncrDecrCostCountVO.java

@@ -36,10 +36,10 @@ public class DailyIncrDecrCostCountVO {
     private DoStatusEnum doStatus;
 
     @ApiModelProperty(value = "导入操作人")
-    private Date importBy;
+    private String importBy;
 
     @ApiModelProperty(value = "导入时间")
-    private String importTime;
+    private Date importTime;
 
     @ApiModelProperty(value = "汇总操作人")
     private String doBy;

+ 18 - 6
mall-server-api/src/main/java/com/gree/mall/manager/bean/settle/repair/DailyReduceCostVO.java

@@ -1,7 +1,7 @@
 package com.gree.mall.manager.bean.settle.repair;
 
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.repair.settle.SummaryStatusEnum;
+import com.gree.mall.manager.enums.repair.settle.DoStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,17 +17,29 @@ public class DailyReduceCostVO {
     @ZfireField(hide = true)
     private String id;
 
+    @ApiModelProperty(value = "所属商户")
+    private String companyWechatName;
+
     @ApiModelProperty(value = "派工序号")
     private String dispatchOrderNo;
 
     @ApiModelProperty(value = "自编编号")
     private String selfNo;
 
-    @ApiModelProperty(value = "工单状态")
-    private SummaryStatusEnum summaryStatus;
+    @ApiModelProperty(value = "执行状态")
+    private DoStatusEnum doStatus;
+
+    @ApiModelProperty(value = "执行时间")
+    private Date doTime;
 
-    @ApiModelProperty(value = "导入批次号")
-    private String importBatchNo;
+    @ApiModelProperty(value = "执行操作人")
+    private String doBy;
+
+    @ApiModelProperty(value = "扣回时间")
+    private Date reduceDate;
+
+    @ApiModelProperty(value = "工单状态")
+    private String orderStatus;
 
     @ApiModelProperty(value = "新结算单位号")
     private String summaryNumber;
@@ -146,7 +158,7 @@ public class DailyReduceCostVO {
     @ApiModelProperty(value = "安装网点号")
     private String installWebsitNo;
 
-    @ApiModelProperty(value = "安装网点名")
+    @ApiModelProperty(value = "安装网点名")
     private String installWebsitName;
 
     @ApiModelProperty(value = "新维修单位号")