From d8d88d8f5e3c333fa79f76b46d43b21d130b2322 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 15 Jan 2021 15:13:41 +0800
Subject: [PATCH] Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api
---
zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java
index 5d2a8de..4a405f6 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java
@@ -13,7 +13,7 @@
@ApiModelProperty(value = "查询参数")
private String queryKey;
- @ApiModelProperty(value = "状态 0/全部 1/带预约 2/带配料 3/待服务 4/服务中 5/已完成")
+ @ApiModelProperty(value = "状态 0/全部 1/待确认 2/待排班 3/待配料 4/待服务 5/服务中 6/已完成")
private String status;
@ApiModelProperty(hidden = true)
@@ -56,19 +56,22 @@
this.status = "";
break;
case "1":
+ this.status = "待确认";
+ break;
+ case "2":
this.status = "待预约";
break;
- case "2" :
- this.status = "带配料";
- break;
case "3" :
- this.status = "待服务";
+ this.status = "需配料";
break;
case "4" :
- this.status = "服务中";
+ this.status = "配料完成";
break;
case "5" :
- this.status = "已完成";
+ this.status = "服务中";
+ break;
+ case "6" :
+ this.status = "服务完成";
break;
default:
this.status = "";
--
Gitblit v1.9.1