From 02b99a09475f5b4497a7864635d196a301d4ba71 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 13:37:50 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java | 2 +-
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java | 29 +++++++++++++++++++++++++++--
2 files changed, 28 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 c55642e..2a7d445 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
@@ -34,7 +34,7 @@
@ApiModelProperty(value = "床位")
private String bed;
- @ApiModelProperty(value = "状态")
+ @ApiModelProperty(value = "状态 1-待预约 2-待派单 3-待配料 4-待服务 5-服务中 6-服务完成 7-服务单结束")
private String status;
@ApiModelProperty(value = "服务项目信息")
@@ -101,6 +101,31 @@
}
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;
+ default:
+ this.status = "1";
+ break;
+ }
}
}
diff --git a/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java b/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java
index 1e0f5a7..4fe5642 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java
@@ -47,7 +47,7 @@
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
if ("dev".equals(evn)) {
- SysUsers sysUsers = sysUsersDao.selectById(1037L);
+ SysUsers sysUsers = sysUsersDao.selectById(1012L);
request.getSession().setAttribute(MatrixConstance.LOGIN_KEY, sysUsers);
return true;
}
--
Gitblit v1.9.1