From a116f8c675a50bf4127202dabf5d927cedd52148 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 13:09:30 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 6 ++++++
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 3 +++
zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java | 35 ++++++++++++++++++++++++++++++++++-
3 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
index 15a03bd..d7800f5 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
@@ -155,6 +155,9 @@
int limit = orderListDto.getPageSize();
pageVo.setOffset(offset);
pageVo.setLimit(limit);
+
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ orderListDto.setShopId(user.getShopId());
return AjaxResult.buildSuccessInstance(projServicesService.findApiServiceOrderListInPage(orderListDto, pageVo), projServicesService.findApiServiceOrderListTotal(orderListDto));
}
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 e27d06a..3fb885a 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
@@ -16,6 +16,17 @@
@ApiModelProperty(value = "状态 0/全部 1/带预约 2/带配料 3/待服务 4/服务中 5/已完成")
private String status;
+ @ApiModelProperty(hidden = true)
+ private Long shopId;
+
+ public Long getShopId() {
+ return shopId;
+ }
+
+ public void setShopId(Long shopId) {
+ this.shopId = shopId;
+ }
+
public String getQueryKey() {
return queryKey;
}
@@ -29,6 +40,28 @@
}
public void setStatus(String status) {
- this.status = status;
+ switch (status) {
+ case "0" :
+ this.status = "";
+ break;
+ case "1":
+ this.status = "待预约";
+ break;
+ case "2" :
+ this.status = "带配料";
+ break;
+ case "3" :
+ this.status = "待服务";
+ break;
+ case "4" :
+ this.status = "服务中";
+ break;
+ case "5" :
+ this.status = "已完成";
+ break;
+ default:
+ this.status = "";
+ break;
+ }
}
}
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
index 6d8c7e1..57fe46a 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -498,6 +498,9 @@
<if test="record.status != null and record.status != ''">
and a.state = #{record.status}
</if>
+ <if test="record.shopId != null">
+ and a.shop_id=#{record.shopId}
+ </if>
</where>
<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
order by a.yy_time desc
@@ -524,6 +527,9 @@
<if test="record.status != null and record.status != ''">
and a.state = #{record.status}
</if>
+ <if test="record.shopId != null">
+ and a.shop_id=#{record.shopId}
+ </if>
</where>
</select>
</mapper>
--
Gitblit v1.9.1