From 85dce973eb29eb2372c76d5b95b30354da9c41c8 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:08:51 +0800
Subject: [PATCH] fead:新增收银员字段
---
zq-erp/src/main/java/com/matrix/system/hive/statistics/ProjUseStatisticsAction.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/ProjUseStatisticsAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/ProjUseStatisticsAction.java
index 8c6133c..75a215f 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/ProjUseStatisticsAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/ProjUseStatisticsAction.java
@@ -4,7 +4,7 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.common.constance.AppConstance;
+import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.hive.dao.SysProjUseDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -12,6 +12,8 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
import java.util.Map;
/**
@@ -33,12 +35,29 @@
public @ResponseBody
AjaxResult showList( @RequestParam Map<String , Object> param) {
SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
- if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
- param.put("shopId",sysUsers.getShopId());
+ if(!DataAuthUtil.hasAllShopAuth()){
+ param.put("shopId", sysUsers.getShopId());
}
return AjaxResult.buildSuccessInstance(projUseDao.selectItemDetail(param),
projUseDao.selectItemDetailTotal(param));
}
+
+ @RequestMapping(value = "/exportShowList")
+ public void exportShowList( @RequestParam Map<String , Object> param, HttpServletResponse response) throws Exception {
+ SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ String title = "项目剩余次数明细";
+ String[] header = {"客户名", "客户所属门店", "服务名称", "到期日期", "剩余次数", "单价", "项目类型", "套餐类型", "是否使用完成", "备注", "来源", "订单号"};
+ String[] column = {"VIP_NAME", "SHOP_NAME", "PROJ_NAME", "FAIL_TIME", "SURPLUS_COUNT", "PRICE", "TYPE_NAME", "type", "IS_OVER", "remark", "SOURCE", "ORDER_NO"};
+
+ if(!DataAuthUtil.hasAllShopAuth()){
+ param.put("shopId", sysUsers.getShopId());
+ }
+ List<Map<String, Object>> dataList = projUseDao.selectItemDetail(param);
+ OrderStatisticsAction.exportExcel(title, header,column, dataList, response);
+ }
+
+
+
/**
* 项目剩余次数统计
@@ -47,12 +66,26 @@
public @ResponseBody
AjaxResult summaryItemDetail( @RequestParam Map<String , Object> param) {
SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
- if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){
- param.put("shopId",sysUsers.getShopId());
+ if(!DataAuthUtil.hasAllShopAuth()){
+ param.put("shopId", sysUsers.getShopId());
}
return AjaxResult.buildSuccessInstance(projUseDao.summaryItemDetail(param),
projUseDao.summaryItemDetailTotal(param));
}
+ @RequestMapping(value = "/exportSummaryItemDetail")
+ public void exportSummaryItemDetail( @RequestParam Map<String , Object> param, HttpServletResponse response) throws Exception {
+ SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ String title = "项目剩余次数统计";
+ String[] header = {"服务名称", "项目类型", "剩余次数", "剩余消耗总额"};
+ String[] column = {"PROJ_NAME", "TYPE_NAME", "SURPLUS_COUNT", "PRICE"};
+
+ if(!DataAuthUtil.hasAllShopAuth()){
+ param.put("shopId", sysUsers.getShopId());
+ }
+ List<Map<String, Object>> dataList = projUseDao.summaryItemDetail(param);
+ OrderStatisticsAction.exportExcel(title, header,column, dataList, response);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1