From c025b8924951a17e1bd1a10cea671a6c1534bdc0 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 17 十月 2023 11:36:20 +0800
Subject: [PATCH] 10.18
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java | 27 +++++++-
cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js | 82 +++++++++++++++++++-------
cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/ExpireSiteSearchVO.java | 3 +
cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite.html | 38 +++++++++---
cloud-server-other/src/main/resources/mapper/SiteMapper.xml | 11 ++-
cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteDTO.java | 7 ++
cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/TSiteDTO.java | 2
cloud-server-other/src/main/java/com/dsh/other/model/vo/siteVo/ExpireSiteSearchVO.java | 2
8 files changed, 132 insertions(+), 40 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteDTO.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteDTO.java
index 87831ca..3b35d5b 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteDTO.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TSiteDTO.java
@@ -113,4 +113,11 @@
*/
@TableField("insertTime")
private Date insertTime;
+ @TableField(exist = false)
+ private String operator;
+
+
+
+
+
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
index 83902c9..f31cd13 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TSiteController.java
@@ -126,13 +126,28 @@
QueryWrapper<TSiteType> wrapper = new QueryWrapper<>();
wrapper.eq("state",1);
List<TSiteType> siteType = siteTypeService.list(wrapper);
- model.addAttribute("list",set);
+
+ List<TCity> list3 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+
+
+
+
+
+
+
+ model.addAttribute("list",list3);
model.addAttribute("siteType",siteType);
String roleid = UserExt.getUser().getRoleid();
model.addAttribute("role",roleid);
model.addAttribute("objectType",objectType);
model.addAttribute("objectId",objectId);
model.addAttribute("type",1);
+
+
+ List<TOperator> list5 = tOperatorService.list();
+
+ model.addAttribute("list5",list5);
+
return PREFIX + "TSite.html";
}
/**
@@ -280,7 +295,10 @@
for (String s : nextName.split(",")) {
strings1.add(s);
}
- model.addAttribute("nextNames",strings1);
+
+ if (!strings1.get(0).equals("")){
+ System.out.println("=========执行nextNames====");
+ model.addAttribute("nextNames",strings1);}
ArrayList<String> strings3 = new ArrayList<>();
strings3.add("普通场地");
@@ -459,7 +477,7 @@
JSONObject jsonObject = JSONObject.parseObject(s);
JSONObject data = jsonObject.getJSONObject("data");
String spaceId = data.getString("space_id");
- Integer integer = Integer.valueOf(spaceId);
+// Integer integer = Integer.valueOf(spaceId);
for (String s1 : site.getIds().split(",")) {
HashMap<String, String> map1 = new HashMap<>();
@@ -563,7 +581,7 @@
*/
@RequestMapping(value= "/listExipre")
@ResponseBody
- public List<TSiteDTO> listExipre(String province,String city,String storeName,Integer siteTypeId,String name) {
+ public List<TSiteDTO> listExipre(String province,String city,String storeName,Integer siteTypeId,String name,Integer opId) {
// 对象类型
Integer type = UserExt.getUser().getObjectType();
// 对象类型Id
@@ -576,6 +594,7 @@
vo.setName(name);
vo.setObjectType(type);
vo.setObjectId(objectId);
+ vo.setOpId(opId);
return siteClient.listExipre(vo);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/ExpireSiteSearchVO.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/ExpireSiteSearchVO.java
index 631c990..5c3aab5 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/ExpireSiteSearchVO.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/ExpireSiteSearchVO.java
@@ -1,5 +1,6 @@
package com.dsh.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
@Data
@@ -37,4 +38,6 @@
// 登陆人类型
private Integer typeId ;
+ private Integer opId;
+
}
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 6851fc7..36b1223 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
@@ -18,10 +18,10 @@
所在省
</button>
</div>
- <select class="form-control" id="pCode" onchange="TSite.oneChange(1)">
+ <select class="form-control" id="pCode" onchange="TSite.oneChange1(this)">
<option value="">全部</option>
@for(obj in list){
- <option value="${obj}">${obj}</option>
+ <option value="${obj.code}">${obj.name}</option>
@}
</select>
</div>
@@ -30,15 +30,14 @@
@if(objectType==1){
<div class="col-sm-3">
<div class="input-group">
- <div class="input-group-btn open">
- <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
- 所在市
- </button>
+ <div class="input-group-btn open">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+ 所在市
+ </button>
+ </div>
+ <select class="form-control" id="cCode">
+ </select>
</div>
- <select class="form-control" id="cCode">
- <option value="">请先选择省</option>
- </select>
- </div>
</div>
@}
<div class="col-sm-3">
@@ -63,6 +62,25 @@
<div class="col-sm-3">
<#NameCon id="name" name="场地名称" />
</div>
+
+
+ <div class="col-sm-3">
+ <div class="input-group">
+ <div class="input-group-btn open">
+ <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button" aria-expanded="true">
+ 所属运营商
+ </button>
+ </div>
+ <select class="form-control" id="opId" >
+ <option value="">全部</option>
+ <option value="0">平台</option>
+
+ @for(obj in list5){
+ <option value="${obj.id}">${obj.name}</option>
+ @}
+ </select>
+ </div>
+ </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/static/modular/system/tSite/tSite.js b/cloud-server-management/src/main/webapp/static/modular/system/tSite/tSite.js
index 3b639f7..14fbd63 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
@@ -22,20 +22,30 @@
return [
{field: 'selectItem', checkbox: true},
{title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
- {title: '省', field: 'province', visible: objectType==1?true:false, align: 'center', valign: 'middle',width:'20%',
+ {
+ title: '所属运营商', field: 'operator', visible: true, align: 'center', valign: 'middle',
+ formatter: function(value, row, index) {
+ if (!value || value.trim() === '' || value.trim() === 0) {
+ return '平台';
+ } else {
+ return value;
+ }
+ }
},
- {title: '市', field: 'city', visible: objectType==1?true:false, align: 'center', valign: 'middle',
+ {
+ title: '省', field: 'province', visible: objectType === 1 ? true : false, align: 'center', valign: 'middle', width: '20%',
+ },
+ {
+ title: '市', field: 'city', visible: objectType === 1 ? true : false, align: 'center', valign: 'middle',
},
{title: '门店名称', field: 'storeName', visible: true, align: 'center', valign: 'middle'},
- {title: '场地类型', field: 'siteTypeName', visible: true, align: 'center', valign: 'middle',
- },
- {title: '场地名称', field: 'name', visible: true, align: 'center', valign: 'middle',
- },
- {title: '场地责任险有效期', field: 'insuranceEndTime', visible: true, align: 'center', valign: 'middle',
- },
- {title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',
- formatter:function (data) {
- return {1:"上架中",2:"下架中"}[data]
+ {title: '场地类型', field: 'siteTypeName', visible: true, align: 'center', valign: 'middle'},
+ {title: '场地名称', field: 'name', visible: true, align: 'center', valign: 'middle'},
+ {title: '场地责任险有效期', field: 'insuranceEndTime', visible: true, align: 'center', valign: 'middle'},
+ {
+ title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',
+ formatter: function(data) {
+ return {1: '上架中', 2: '下架中'}[data];
}
}
];
@@ -215,22 +225,45 @@
$("#cCode").empty().append(content);
}
});
- if (val === ""){
- citySelect.innerHTML = '<option value="">请先选择省</option>';
-
- }
- if (e===2){
- accountSelect.innerHTML = '<option value="">请先选择省/市</option>';
- storeSelect.innerHTML = '<option value="">请先选择省/市</option>';
- }
- if (val === ""){
- startTime.disabled = true;
- endTime.disabled = true;
- }
+ // if (val === ""){
+ // citySelect.innerHTML = '<option value="">请先选择省</option>';
+ //
+ // }
+ // if (e===2){
+ // accountSelect.innerHTML = '<option value="">请先选择省/市</option>';
+ // storeSelect.innerHTML = '<option value="">请先选择省/市</option>';
+ // }
+ // if (val === ""){
+ // startTime.disabled = true;
+ // endTime.disabled = true;
+ // }
ajax.set("province",province);
ajax.start();
};
+
+
+
+TSite.oneChange1 = function (e) {
+ console.log(111)
+ var oneId=$(e).val();
+ var ajax = new $ax(Feng.ctxPath + "/tCompetition/onChange", function(data){
+ if(data!=null){
+
+ var content='<option value="">选择市</option>';
+
+ $.each(data, function(k,v) {
+ content += "<option value='"+v.code+"'>"+v.name+"</option>";
+ });
+ $("#cCode").empty().append(content);
+ }
+ });
+ ajax.set("oneId",oneId);
+ ajax.start();
+}
+
+
+
TSite.oneChangeNext = function (e) {
var startTime = document.getElementById('start-time');
@@ -641,6 +674,8 @@
queryData['name'] = $("#name").val();
// 门店名称
queryData['storeName'] = $("#storeName").val();
+ queryData['opId'] = $("#opId").val();
+
TSite.table.refresh({query: queryData});
};
@@ -653,6 +688,7 @@
$("#siteTypeId").val("");
$("#name").val("");
$("#insuranceEndTime").val("");
+ $("#opId").val("");
TSite.search();
};
diff --git a/cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/TSiteDTO.java b/cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/TSiteDTO.java
index 1d01f40..e1e95e8 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/TSiteDTO.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/model/dto/siteDto/TSiteDTO.java
@@ -94,4 +94,6 @@
* 添加时间
*/
private Date insertTime;
+
+ private String operator;
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/model/vo/siteVo/ExpireSiteSearchVO.java b/cloud-server-other/src/main/java/com/dsh/other/model/vo/siteVo/ExpireSiteSearchVO.java
index 99a28e9..2812514 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/model/vo/siteVo/ExpireSiteSearchVO.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/model/vo/siteVo/ExpireSiteSearchVO.java
@@ -36,5 +36,7 @@
// 登陆人类型
private Integer typeId ;
+ private Integer opId;
+
}
diff --git a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
index b4b93a9..7810396 100644
--- a/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
+++ b/cloud-server-other/src/main/resources/mapper/SiteMapper.xml
@@ -102,9 +102,10 @@
</where>
</select>
<select id="listExipre" resultType="com.dsh.other.model.dto.siteDto.TSiteDTO">
- select t1.*,t2.name storeName,t3.name siteTypeName from t_site t1
+ select t1.*,t2.name storeName,t3.name siteTypeName ,t4.name operator from t_site t1
inner join t_store t2 on t1.storeId = t2.id
left join t_site_type t3 on t1.siteTypeId = t3.id
+ left join t_operator t4 on t1.operatorId = t4.id
<where>
<if test="query.objectType == 2">
and t1.cityManagerId = #{query.objectId}
@@ -113,10 +114,10 @@
and t2.storeStaffId = #{query.objectId}
</if>
<if test="query.city!=null and query.city!= ''">
- and t1.city = #{query.city}
+ and t1.cityCode = #{query.city}
</if>
<if test="query.province!=null and query.province!= ''">
- and t1.province = #{query.province}
+ and t1.provinceCode = #{query.province}
</if>
<if test="query.siteTypeId!=null and query.siteTypeId!= ''">
and t1.siteTypeId = #{query.siteTypeId}
@@ -127,6 +128,10 @@
<if test="query.name!=null and query.name!= ''">
and t1.name like concat('%',#{query.name},'%')
</if>
+
+ <if test="query.opId!=null ">
+ and t1.operatorId =#{query.opId}
+ </if>
and t1.state != 3
</where>
--
Gitblit v1.7.1