From b0bc1105028f570156fa42fc116d1b0417222730 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Thu, 22 Jul 2021 17:18:11 +0800 Subject: [PATCH] 1、部分导出功能 --- zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html | 15 +-- zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-sumary.html | 14 +-- zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html | 14 +-- zq-erp/src/main/java/com/matrix/system/hive/statistics/moneyCardUseStatisticsAction.java | 40 ++++++++- zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-item.html | 13 +-- zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java | 43 +++++++++- zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html | 15 +-- zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html | 14 +-- zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html | 15 +-- zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-item.html | 10 - 10 files changed, 113 insertions(+), 80 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java index 81a5f11..f77a707 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.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.SysBeauticianStateDao; 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,13 +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(beauticianStateDao.selectItemDetail(param), beauticianStateDao.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 = {"SHOP_NAME", "yy_time", "consume_time", "SERVICE_NO", "PROJ_NAME", "TYPE_NAME", "VIP_NAME", "COUNT", "PRICE", "extract", "su_name", "SOURCE"}; + + if(!DataAuthUtil.hasAllShopAuth()){ + param.put("shopId", sysUsers.getShopId()); + } + List<Map<String, Object>> dataList = beauticianStateDao.selectItemDetail(param); + OrderStatisticsAction.exportExcel(title, header,column, dataList, response); + } + /** * 项目服务明细统计 @@ -48,12 +66,27 @@ 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(beauticianStateDao.summaryItemDetail(param), beauticianStateDao.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 = {"SHOP_NAME", "PROJ_NAME", "TYPE_NAME", "COUNT", "PRICE"}; + + if(!DataAuthUtil.hasAllShopAuth()){ + param.put("shopId", sysUsers.getShopId()); + } + List<Map<String, Object>> dataList = beauticianStateDao.summaryItemDetail(param); + OrderStatisticsAction.exportExcel(title, header,column, dataList, response); + } + + } \ No newline at end of file diff --git a/zq-erp/src/main/java/com/matrix/system/hive/statistics/moneyCardUseStatisticsAction.java b/zq-erp/src/main/java/com/matrix/system/hive/statistics/moneyCardUseStatisticsAction.java index 51305d5..cab77c6 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/statistics/moneyCardUseStatisticsAction.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/statistics/moneyCardUseStatisticsAction.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.MoneyCardUseDao; 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,11 +35,25 @@ 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(moneyCardUseDao.selectItemDetail(param), moneyCardUseDao.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", "card_name","FAIL_TIME","real_money","gift_money","isOver","is_vip_car","remark","SOURCE","ORDER_NO"}; + + if(!DataAuthUtil.hasAllShopAuth()){ + param.put("shopId", sysUsers.getShopId()); + } + List<Map<String, Object>> dataList = moneyCardUseDao.selectItemDetail(param); + OrderStatisticsAction.exportExcel(title, header,column, dataList, response); } /** @@ -47,12 +63,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(moneyCardUseDao.summaryItemDetail(param), moneyCardUseDao.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 = {"card_name", "real_money", "gift_money"}; + + if(!DataAuthUtil.hasAllShopAuth()){ + param.put("shopId", sysUsers.getShopId()); + } + List<Map<String, Object>> dataList = moneyCardUseDao.summaryItemDetail(param); + OrderStatisticsAction.exportExcel(title, header,column, dataList, response); + } + } \ No newline at end of file diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-item.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-item.html index 70e9301..81a5c7c 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-item.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-item.html @@ -103,14 +103,10 @@ url:basePath+"/admin/moneyCardUseStatistics/showList" }); }); - + function exportExcel(){ - var select_begin = $("#select_begin").val(); - var select_end = $("#select_end").val(); - var select_id = $("#select_id").val(); - var goodsName = $("#goodsName").val(); - var guwen = $("#goodsName").val(); - window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; + var param=MForm.toUrlParam("#serchform"); + window.location.href=basePath+"/admin/moneyCardUseStatistics/exportShowList?"+param; } diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html index 2dfa73f..554ddec 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html @@ -84,15 +84,11 @@ url:basePath+"/admin/moneyCardUseStatistics/summaryItemDetail" }); }); - - function exportExcel(){ - var select_begin = $("#select_begin").val(); - var select_end = $("#select_end").val(); - var select_id = $("#select_id").val(); - var goodsName = $("#goodsName").val(); - var guwen = $("#goodsName").val(); - window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; - } + + function exportExcel(){ + var param=MForm.toUrlParam("#serchform"); + window.location.href=basePath+"/admin/moneyCardUseStatistics/exportSummaryItemDetail?"+param; + } function initFunctionList() { diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html index 2238a29..042aee0 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html @@ -122,15 +122,12 @@ sortOrder:"desc" }); }); - - function exportExcel(){ - var select_begin = $("#select_begin").val(); - var select_end = $("#select_end").val(); - var select_id = $("#select_id").val(); - var goodsName = $("#goodsName").val(); - var guwen = $("#goodsName").val(); - window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; - } + + function exportExcel(){ + var param=MForm.toUrlParam("#serchform"); + window.location.href=basePath+"/admin/serviceStatistics/exportShowList?"+param; + } + function initFunctionList() { diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html index ca2c7ac..8b2b1d3 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html @@ -99,15 +99,11 @@ url:basePath+"/admin/serviceStatistics/summaryItemDetail" }); }); - - function exportExcel(){ - var select_begin = $("#select_begin").val(); - var select_end = $("#select_end").val(); - var select_id = $("#select_id").val(); - var goodsName = $("#goodsName").val(); - var guwen = $("#goodsName").val(); - window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; - } + + function exportExcel(){ + var param=MForm.toUrlParam("#serchform"); + window.location.href=basePath+"/admin/serviceStatistics/exportSummaryItemDetail?"+param; + } function initFunctionList() { diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-item.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-item.html index 852a46c..31773f5 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-item.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-item.html @@ -103,18 +103,15 @@ url:basePath+"/admin/moneyCardUseStatistics/showList" }); }); - + function exportExcel(){ - var select_begin = $("#select_begin").val(); - var select_end = $("#select_end").val(); - var select_id = $("#select_id").val(); - var goodsName = $("#goodsName").val(); - var guwen = $("#goodsName").val(); - window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; + var param=MForm.toUrlParam("#serchform"); + window.location.href=basePath+"/admin/moneyCardUseStatistics/exportShowList?"+param; } - function initFunctionList() { + + function initFunctionList() { $.AjaxProxy({ a: false, c: false, diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html index ca5daba..dc775ce 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html @@ -85,15 +85,12 @@ url:basePath+"/admin/moneyCardUseStatistics/summaryItemDetail" }); }); - - function exportExcel(){ - var select_begin = $("#select_begin").val(); - var select_end = $("#select_end").val(); - var select_id = $("#select_id").val(); - var goodsName = $("#goodsName").val(); - var guwen = $("#goodsName").val(); - window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; - } + + function exportExcel(){ + var param=MForm.toUrlParam("#serchform"); + window.location.href=basePath+"/admin/moneyCardUseStatistics/exportSummaryItemDetail?"+param; + } + function initFunctionList() { diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html index 80f18c5..7fe7948 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html @@ -115,15 +115,12 @@ sortOrder:"desc" }); }); - - function exportExcel(){ - var select_begin = $("#select_begin").val(); - var select_end = $("#select_end").val(); - var select_id = $("#select_id").val(); - var goodsName = $("#goodsName").val(); - var guwen = $("#goodsName").val(); - window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; - } + + + function exportExcel(){ + var param=MForm.toUrlParam("#serchform"); + window.location.href=basePath+"/admin/serviceStatistics/exportShowList?"+param; + } function initFunctionList() { diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-sumary.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-sumary.html index 9913565..aa6588b 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-sumary.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-sumary.html @@ -91,16 +91,10 @@ url:basePath+"/admin/serviceStatistics/summaryItemDetail" }); }); - - function exportExcel(){ - var select_begin = $("#select_begin").val(); - var select_end = $("#select_end").val(); - var select_id = $("#select_id").val(); - var goodsName = $("#goodsName").val(); - var guwen = $("#goodsName").val(); - window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; - } - + function exportExcel(){ + var param=MForm.toUrlParam("#serchform"); + window.location.href=basePath+"/admin/serviceStatistics/exportSummaryItemDetail?"+param; + } function initFunctionList() { $.AjaxProxy({ -- Gitblit v1.9.1