From df4e5be0eafc7d67d31f40d9cf08ac3d37975811 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 30 Nov 2021 20:56:05 +0800
Subject: [PATCH] 项目余次表新增门店展示和条件

---
 zq-erp/src/main/java/com/matrix/system/hive/statistics/ProjUseStatisticsAction.java              |    4 ++--
 zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html     |    9 ++++++++-
 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml                                  |    5 ++++-
 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html |    9 +++++++++
 4 files changed, 23 insertions(+), 4 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 955fba1..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
@@ -46,8 +46,8 @@
     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", "PROJ_NAME", "FAIL_TIME", "SURPLUS_COUNT", "PRICE", "TYPE_NAME", "type", "IS_OVER", "remark", "SOURCE", "ORDER_NO"};
+        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());
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
index 17b4ddf..5a13c18 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -728,15 +728,18 @@
         a.type,
         a.SOURCE,
         e.ORDER_NO,
-        a.remark
+        a.remark,
+        s.SHOP_NAME
         from sys_proj_use a
         left join shopping_goods b on a.proj_id = b.id
         left join sys_vip_info c on c.ID = a.VIP_ID
+            left join sys_shop_info s on c.SHOP_ID=s.id
         left join sys_order_item d on d.id = a.ORDER_ITEM_ID
         left join sys_order e on e.id = d.ORDER_ID
         left join shopping_goods_category f on f.id = b.cate_id
 
 
+
         <where>
             <if test="shopId != null and  shopId != ''">
                 and c.shop_id =#{shopId}
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html
index 02bf9f9..46bd288 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html
@@ -43,6 +43,14 @@
 				<input autocomplete="off" placeholder="姓名/编号/电话"  name="vipQueryKey" type="text" class="form-control"  >
 			</div>
 
+			<div class="form-group mr-20">
+				<label >所属门店</label> <select
+					class="form-control autoFull"
+					data-url="/admin/shopInfo/findShops" data-value="id"
+					data-filed="shopName"  name="shopId">
+				<option value="">--请选择所属门店--</option>
+			</select>
+			</div>
 
 			<div class="form-group mr-20">
 				<label>到期时间</label><!--    入库时间的查询增加一个查询的其实时间两个字段 -->
@@ -58,6 +66,7 @@
 				<tr>
 					<th data-formatter="MGrid.indexfn" data-align="center"  data-width="30px" >序号</th>
 					<th data-field="VIP_NAME" >客户名</th>
+					<th data-field="SHOP_NAME" >客户门店</th>
 					<th data-field="PROJ_NAME" >服务名称</th>
 					<th data-field="FAIL_TIME"  data-formatter="MGrid.getTime"  data-sortable="true"   >到期日期</th>
       			    <th data-field="SURPLUS_COUNT"  data-sortable="true"     >剩余次数</th>
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html
index ab0f0cb..de59d16 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html
@@ -42,7 +42,14 @@
 				<label>会员</label>
 				<input autocomplete="off" placeholder="姓名/编号/电话"  name="vipQueryKey" type="text" class="form-control"  >
 			</div>
-
+			<div class="form-group mr-20">
+				<label >所属门店</label> <select
+					class="form-control autoFull"
+					data-url="/admin/shopInfo/findShops" data-value="id"
+					data-filed="shopName"  name="shopId">
+				<option value="">--请选择所属门店--</option>
+			</select>
+			</div>
 
 			<div class="form-group mr-20">
 				<label>到期时间</label><!--    入库时间的查询增加一个查询的其实时间两个字段 -->

--
Gitblit v1.9.1