From 4adcef1e676bf1e9ff8e130f00ffe329dea1bfd5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 06 Jan 2021 18:08:30 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java |   45 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
index 292ba6c..d0786df 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
@@ -18,10 +18,13 @@
     @ApiModelProperty(value = "服务单Id")
     private Long id;
 
+    @ApiModelProperty(value = "下单顾问ID")
+    private Long createStaffId;
+
     @ApiModelProperty(value = "服务单编号")
     private String serviceNo;
 
-    @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM)
+    @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
     @ApiModelProperty(value = "预约时间")
     private Date time;
 
@@ -34,11 +37,19 @@
     @ApiModelProperty(value = "床位")
     private String bed;
 
-    @ApiModelProperty(value = "状态")
+    @ApiModelProperty(value = "状态 1-待预约 2-待派单 3-待配料 4-待服务 5-服务中 6-服务完成 7-服务单结束")
     private String status;
 
     @ApiModelProperty(value = "服务项目信息")
     private List<ServiceOrderListProjVo> projs;
+
+    public Long getCreateStaffId() {
+        return createStaffId;
+    }
+
+    public void setCreateStaffId(Long createStaffId) {
+        this.createStaffId = createStaffId;
+    }
 
     public List<ServiceOrderListProjVo> getProjs() {
         return projs;
@@ -101,6 +112,34 @@
     }
 
     public void setStatus(String status) {
-        this.status = status;
+        switch (status) {
+            case "待预约" :
+                this.status = "1";
+                break;
+            case "预约成功待处理" :
+                this.status = "2";
+                break;
+            case "需配料" :
+                this.status = "3";
+                break;
+            case "配料完成" :
+                this.status = "4";
+                break;
+            case "服务中" :
+                this.status = "5";
+                break;
+            case "服务完成" :
+                this.status = "6";
+                break;
+            case "服务单结束" :
+                this.status = "7";
+                break;
+            case "预约取消" :
+                this.status = "8";
+                break;
+            default:
+                this.status = "0";
+                break;
+        }
     }
 }

--
Gitblit v1.9.1