From a56551a91812ec1f620d49c7e6e06f9f15eabdbb Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 12 Jan 2021 17:39:29 +0800
Subject: [PATCH] 1、修改服务单看板时间查询了未确认的和已取消的bug 2、跟进记录根据时间倒序排序
---
zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 3fb885a..07ec313 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
@@ -19,6 +19,17 @@
@ApiModelProperty(hidden = true)
private Long shopId;
+ @ApiModelProperty(hidden = true)
+ private Long userId;
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
public Long getShopId() {
return shopId;
}
@@ -48,16 +59,16 @@
this.status = "待预约";
break;
case "2" :
- this.status = "带配料";
+ this.status = "需配料";
break;
case "3" :
- this.status = "待服务";
+ this.status = "配料完成";
break;
case "4" :
this.status = "服务中";
break;
case "5" :
- this.status = "已完成";
+ this.status = "服务完成";
break;
default:
this.status = "";
--
Gitblit v1.9.1