From aff43f8ebe077b9daf097e1c583304c0252bf440 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 18:49:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java | 9 ++++
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js | 2 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html | 6 +++
cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java | 3 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite.html | 11 +++++
cloud-server-other/src/main/resources/mapper/SiteMapper.xml | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java | 5 ++
cloud-server-management/src/main/resources/mapper/TStoreMapper.xml | 19 +++++++++
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java | 4 ++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html | 2
10 files changed, 59 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
index 07185a1..4935222 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/StoreMapper.java
@@ -72,4 +72,7 @@
JsDto get(Integer id);
List<SelectDto> getSelect();
+
+ List<TStoreListVo> listAllStore(@Param("page") Page<TStoreListVo> page, @Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode, @Param("name") String name, @Param("phone") String phone, @Param("shopName") String shopName, @Param("id") Integer id);
+
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
index e60548d..42555bb 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -290,7 +290,14 @@
@ResponseBody
public Object list(String provinceCode, String cityCode , String name, String phone,String shopName) {
Page<TStoreListVo> page = new PageFactory<TStoreListVo>().defaultPage();
- List<TStoreListVo> list = storeService.listAll(page,provinceCode,cityCode,name,phone,shopName);
+ String roleid = UserExt.getUser().getRoleid();
+ List<TStoreListVo> list =new ArrayList<>();
+ if("3".equals(roleid)){
+ Integer objectId = UserExt.getUser().getObjectId();
+ list = storeService.listAllStore(page,provinceCode,cityCode,name,phone,shopName,objectId);
+ }else {
+ list = storeService.listAll(page,provinceCode,cityCode,name,phone,shopName);
+ }
page.setRecords(list);
return super.packForBT(page);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
index 01baa7a..8e5af30 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/IStoreService.java
@@ -74,4 +74,9 @@
JsDto get(Integer id);
List<SelectDto> getSelect();
+
+ List<TStoreListVo> listAllStore(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName, Integer objectId);
+
+
+
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
index f66f1c7..c56f7d8 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/StoreServiceImpl.java
@@ -24,6 +24,10 @@
public List<TStoreListVo> listAll(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName) {
return this.baseMapper.listAll(page,provinceCode,cityCode,name,phone,shopName);
}
+ @Override
+ public List<TStoreListVo> listAllStore(Page<TStoreListVo> page, String provinceCode, String cityCode, String name, String phone, String shopName,Integer id) {
+ return this.baseMapper.listAllStore(page,provinceCode,cityCode,name,phone,shopName,id);
+ }
/**
* 获取所有省
diff --git a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
index 8e36a41..b82b63f 100644
--- a/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/TStoreMapper.xml
@@ -142,4 +142,23 @@
</select>
+ <select id="listAllStore" resultType="com.dsh.guns.modular.system.model.TStoreListVo">
+ select t1.*,t2.name userName,t2.phone userPhone,t3.name yysName from t_store t1 left join sys_user t2 on t1.storeStaffId = t2.id left join t_operator t3 on t1.operatorId = t3.id
+ where t1.id =#{id}
+ <if test="provinceCode !=null and provinceCode !=''">
+ and t1.provinceCode = #{provinceCode}
+ </if>
+ <if test="cityCode !=null and cityCode !=''">
+ and t1.cityCode = #{cityCode}
+ </if>
+ <if test="name !=null and name !=''">
+ and t2.name like concat("%",#{name},"%")
+ </if>
+ <if test="phone !=null and phone !=''">
+ and t2.phone like concat("%",#{phone},"%")
+ </if>
+ <if test="shopName !=null and shopName !=''">
+ and t1.name like concat("%",#{shopName},"%")
+ </if>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html
index 9eb2b1f..7cdfae4 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop.html
@@ -40,6 +40,7 @@
</div>
</div>
@}
+ @if(role!='3'){
<div class="col-sm-3">
<#NameCon id="name" name="店长姓名" />
</div>
@@ -49,18 +50,23 @@
<div class="col-sm-3">
<#NameCon id="shopName" name="门店名称" />
</div>
+ @}
+ @if(role!='3'){
<div class="col-sm-3">
<#button name="搜索" icon="fa-search" clickFun="TCompetition.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TCompetition.resetSearch()" space="true"/>
</div>
+ @}
</div>
<div class="hidden-xs" id="TCompetitionTableToolbar" role="group">
+ @if(role !='3'){
<#button name="添加" icon="fa-plus" clickFun="TCompetition.openAddTCompetition()"/>
<#button name="编辑" icon="fa-edit" clickFun="TCompetition.openTCompetitionDetail()" space="true"/>
<#button name="冻结" icon="fa-remove" clickFun="TCompetition.freeze()" space="true"/>
<#button name="解冻" icon="fa-remove" clickFun="TCompetition.unfreeze()" space="true"/>
<#button name="查看详情" icon="fa-remove" clickFun="TCompetition.info()" space="true"/>
<#button name="重置密码" icon="fa-remove" clickFun="TCompetition.reload()" space="true"/>
+ @}
<#button name="免费福利" icon="fa-remove" clickFun="TCompetition.gift()" space="true"/>
<#button name="首页设置" icon="fa-remove" clickFun="TCompetition.indexSet()" space="true"/>
</div>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite.html
index 36b1223..6ae7cb9 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite.html
@@ -40,9 +40,12 @@
</div>
</div>
@}
+
+ @if(objectType !=3){
<div class="col-sm-3">
<#NameCon id="storeName" name="门店名称" />
</div>
+ @}
<div class="col-sm-3">
<div class="input-group">
@@ -63,7 +66,7 @@
<#NameCon id="name" name="场地名称" />
</div>
-
+ @if(objectType !=3){
<div class="col-sm-3">
<div class="input-group">
<div class="input-group-btn open">
@@ -81,6 +84,12 @@
</select>
</div>
</div>
+ @}
+ @if(objectType ==3){
+ <div class="col-sm-3">
+ <#NameCon id="storeName" name="门店名称" />
+ </div>
+ @}
<div class="col-sm-3">
<#button name="搜索" icon="fa-search" clickFun="TSite.search()"/>
<#button name="重置" icon="fa-trash" clickFun="TSite.resetSearch()" space="true"/>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html
index 2612abc..b0a57c3 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html
@@ -88,7 +88,7 @@
@}
</select>
</div>
- </div>
+ </div>
<#input style="width: 300px" id="name" name="*场地名称" type="text"/>
<div class="form-group" >
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
index 8b9c64e..7dcd0eb 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
@@ -756,6 +756,7 @@
// 门店名称
queryData['storeName'] = $("#storeName").val();
queryData['opId'] = $("#opId").val();
+ queryData['storeName'] = $("#storeName").val();
TSite.table.refresh({query: queryData});
};
@@ -770,6 +771,7 @@
$("#name").val("");
$("#insuranceEndTime").val("");
$("#opId").val("");
+ $("#storeName").val("");
TSite.search();
};
diff --git a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
index 7810396..2975d46 100644
--- a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
@@ -111,7 +111,7 @@
and t1.cityManagerId = #{query.objectId}
</if>
<if test="query.objectType == 3">
- and t2.storeStaffId = #{query.objectId}
+ and t2.id = #{query.objectId}
</if>
<if test="query.city!=null and query.city!= ''">
and t1.cityCode = #{query.city}
--
Gitblit v1.7.1