From ecbc9879142993ab2e99e2712b5d5bba282c4b72 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:40:21 +0800
Subject: [PATCH] fead:新增服务单划扣人
---
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
index 020b110..f8b24a4 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
@@ -25,6 +25,7 @@
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.constance.Dictionary;
+import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.dto.ServiceOrderTimeDto;
@@ -195,6 +196,7 @@
if (!DataAuthUtil.hasAllShopAuth()) {
projService.setShopId(getMe().getShopId());
}
+ QueryUtil.setQueryLimitCom(projService);
List<SysProjServices> dataList = projServicesSerivce.findInPage(projService, pageVo);
AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, projServicesSerivce.findTotal(projService));
return result;
@@ -728,7 +730,7 @@
String title = "服务订单明细";
orderSheet.setSheetName(title);
orderSheet.setTitle(title);
- String[] header = {"服务单号","会员名称", "会员手机号", "消耗金额","服务状态", "下单时间","预约时间","是否超时(超时分钟)", "床位", "美疗师", "配料师", "健康顾问", "所属门店"};
+ String[] header = {"服务单号","会员名称", "会员手机号", "消耗金额","服务状态", "下单时间","预约时间","状态","是否超时(超时分钟)", "床位", "美疗师", "配料师", "健康顾问", "划扣人", "所属门店"};
orderSheet.setHeaders(header);
List<SysProjServices> dataList = projServicesSerivce.findByModel(projServices);
@@ -749,6 +751,7 @@
temp.add(item.getBeautiName());
temp.add(item.getPlsName());
temp.add(item.getCreateStaffName());
+ temp.add(item.getCashierName());
temp.add(item.getShopName());
list.add(temp);
}
--
Gitblit v1.9.1