Commit 388faa44 by yanru

修改各省份系统管理权限查询界面专项业务省厅负责人(审批人)、技术维护人员的显示

parent 356d0cf5
......@@ -7,11 +7,15 @@ import com.xzxtshiro.service.SysRoleService;
import com.xzxtshiro.service.SysUserService;
import com.xzxtshiro.util.TokenUtil;
import com.xzxtshiro.util.ZtreeDataUtil;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.session.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.annotation.MultipartConfig;
......@@ -39,8 +43,12 @@ public class SearchController {
* 地市/县级管理员(页面跳转)
*/
@RequestMapping(value = "/dsxjglyListIndex",method = RequestMethod.GET)
public String search(Model model){
public String search(Model model, @RequestParam(value = "provinceId",required = false) String provinceId){
//获取unit字典码数据
if(!StringUtils.isEmpty(provinceId)){
Session session = SecurityUtils.getSubject().getSession();
session.setAttribute("provinceId",provinceId.substring(0,2));
}
setZtreeData(model,userService,dictitemService,roleService);
return "admin/search/dsxjglyList";
}
......
......@@ -130,35 +130,27 @@
</select>
<!-- 专项案件省厅负责人审批-->
<select id="selectZxajstfzrUserByCondition" resultMap="BaseResultMap">
<select id="selectZxajstfzrUserByCondition" resultType="com.xzxtshiro.pojo.SysUser">
select * from (
select t.*,rownum rn from (
select *
from sys_user
where id in(select distinct(userid) from Vw_User_Permission where id in (
SELECT id FROM SYS_PERMISSION_NEW WHERE TYPE='B' AND LENGTH(id)>=7 and name like '%审%'
<if test="type !=null"> and id like #{type}||'%'</if>
))
and scbz='0' and username != 'admin'
<if test="trueName !=null"> and true_name like '%'||#{trueName}||'%'</if>
<if test="policemanid !=null"> and policemanid like '%'||#{policemanid}||'%'</if>
<if test="telephone !=null"> and telephone like '%'||#{telephone}||'%'</if>
<if test="unitcode !=null"> and unitcode like '%'||#{unitcode}||'%'</if>
select TRUE_NAME as trueName,
POLICEMANID as policemanid,
TELEPHONE as telephone,
UNITNAME as unitname
from SYS_USER_ZXAJSP
where 1=1
<if test="type !=null"> and MODULECODE = #{type}</if>
) t where ROWNUM <![CDATA[<=]]>
${limit*page}
) where rn > ${(page-1)*limit}
</select>
<!--专项案件省厅负责人审批总数-->
<select id="selectZxajstfzrUserCountByCondition" resultMap="BaseResultMap">
select count(1)
from sys_user
where id in(select distinct(userid) from Vw_User_Permission where id in (SELECT id FROM SYS_PERMISSION_NEW WHERE TYPE='B' AND LENGTH(id)>=7 and name like '%审%'))
and scbz='0' and username != 'admin'
<if test="trueName !=null"> and true_name like '%'||#{trueName}||'%'</if>
<if test="policemanid !=null"> and policemanid like '%'||#{policemanid}||'%'</if>
<if test="telephone !=null"> and telephone like '%'||#{telephone}||'%'</if>
<if test="unitcode !=null"> and UNITCODE like '%'||#{unitcode}||'%'</if>
<select id="selectZxajstfzrUserCountByCondition" resultType="java.lang.Integer">
select count(*)
from SYS_USER_ZXAJSP
where 1=1
<if test="type !=null"> and MODULECODE = #{type}</if>
</select>
<!--侦查指令联络员-->
......
......@@ -64,7 +64,7 @@
</div>
</div>
<div class="layui-form-mid">
<div class="layui-input-inline" style="padding-top: 16px">
<div class="layui-input-inline" style="padding-top: 16px;padding-left:60px;">
<input type="radio" name="grade" class="radio_inp" checked value="D">地市
<input type="radio" name="grade" class="radio_inp" value="X">县级
<input type="hidden" id="grade" value="">
......
......@@ -28,6 +28,7 @@
<colgroup>
<col width="150">
<col width="150">
<%--<col width="300">--%>
<col width="300">
<col>
</colgroup>
......@@ -35,26 +36,72 @@
<tr>
<th>序号</th>
<th>姓名</th>
<th>负责模块</th>
<%--<th>负责模块</th>--%>
<th>服务电话</th>
<th>服务微信</th>
</tr>
</thead>
<tbody>
<tr>
<%--<tr>
<td>1</td>
<td>闫茹</td>
<td>专项案件</td>
<td rowspan="3">15810117980</td>
<td rowspan="3">15810117980</td>
<td rowspan="3">15810117980</td>
</tr>
<tr>
<td>2</td>
<td>曹崟</td>
<td>侦查协作、侦查指令</td>
</tr>
<tr>
<td>3</td>
</tr>--%>
<tr class="fwxx xj">
<td>1</td>
<td>王焱</td>
<td>后台服务器、数据维护</td>
<%--<td>后台服务器、数据维护</td>--%>
<td>15810117980</td>
<td>15810117980</td>
</tr>
<tr class="fwxx gs">
<td>1</td>
<td>高天</td>
<td>15810115280</td>
<td></td>
</tr>
<tr class="fwxx an">
<td>1</td>
<td>杜延春</td>
<td>13876003295</td>
<td>243585763</td>
</tr>
<tr class="fwxx nm">
<td>1</td>
<td>乌云图</td>
<td>15810118290</td>
<td></td>
</tr>
<tr class="fwxx sx">
<td>1</td>
<td>武一忠</td>
<td>15810115310</td>
<td></td>
</tr>
<tr class="fwxx sn">
<td>1</td>
<td>沙芝</td>
<td>15810116560</td>
<td></td>
</tr>
<tr class="fwxx sc">
<td>1</td>
<td>何翰殊</td>
<td>02886305354</td>
<td></td>
</tr>
<tr class="fwxx xz">
<td>1</td>
<td>秦蔼筠</td>
<td>18202810893</td>
<td>11768643</td>
</tr>
</tbody>
</table>
......@@ -65,7 +112,36 @@
<div class="main-table-div"></div>
</article>
</div>
<script type="text/javascript"
src="${pageContext.request.contextPath}/resources/h-ui/lib/jquery/1.9.1/jquery.min.js"></script>
<script src="${pageContext.request.contextPath}/resources/layui/layui.js"></script>
</body>
<script type="text/javascript">
var provinceId = "${sessionScope.provinceId}";
$(function(){
if(provinceId){
if("65"==provinceId||"66"==provinceId){
provinceId="xj";
}else if("62"==provinceId){//甘肃
provinceId="gs";
}else if("46"==provinceId){//海南
provinceId="an";
}else if("15"==provinceId){//内蒙
provinceId="nm";
}else if("14"==provinceId){//山西
provinceId="sx";
}else if("61"==provinceId){//陕西
provinceId="sn";
}else if("51"==provinceId){//四川
provinceId="sc";
}else if("56"==provinceId){//西藏
provinceId="xz";
}
}else{
provinceId="";
}
$(".fwxx").not("."+provinceId).hide();//将服务信息下除了某个省份的所有隐藏
});
</script>
</html>
......@@ -8,7 +8,7 @@
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<header class="heade-box"><h1 class="page-title">系统管理权限查询界面</h1></header>
<aside class="left-menu-box">
<aside class="top-menu-box clearfix">
<ul class="left-list">
<li class="left-list-ttitle">
<i class="fa fa-user"></i> <a href="${pageContext.request.contextPath}/admin/search/dsxjglyListIndex">地市/县级管理员</a>
......
......@@ -28,6 +28,7 @@
<script src="${pageContext.request.contextPath}/resources/ztree/ztree/jquery.ztree.excheck.js"></script>
<script src="${pageContext.request.contextPath}/resources/ztree/ztree/jquery.ztree.exhide.js"></script>
<script src="${pageContext.request.contextPath}/resources/common/common.js"></script>
<script src="${pageContext.request.contextPath}/resources/search/js/base.js"></script>
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/search/css/bootstrap.min.css">
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/search/css/font-awesome.min.css">
<link rel="stylesheet" href="${pageContext.request.contextPath}/resources/search/css/base_initialize.css">
......
......@@ -27,60 +27,22 @@
<div class="layui-row">
<div class="layui-col-xs12 layui-col-sm12 layui-col-md12 searchDiv">
<div class="layui-form-mid">
<label class="layui-form-label">姓名:</label>
<div class="layui-input-inline">
<input type="text" name="trueName" id="trueName" lay-verify="required"
class="layui-input">
</div>
</div>
<div class="layui-form-mid">
<label class="layui-form-label">警号:</label>
<div class="layui-input-inline">
<input type="text" name="policemanid" id="policemanid" lay-verify="required"
class="layui-input">
</div>
</div>
<div class="layui-form-mid">
<label class="layui-form-label" style="width:auto;">手机号:</label>
<div class="layui-input-inline">
<input type="text" name="telephone" id="telephone" lay-verify="required"
class="layui-input">
</div>
</div>
<div class="layui-form-mid">
<label class="layui-form-label">单位:</label>
<div class="layui-input-inline">
<input type="text" name="unitname" autocomplete="off" id="unitname" lay-verify="required"
class="layui-input code-icon" onclick="checkTree('myUnitTree');">
<input type="text" id="unitcode" Name="unitcode" style="display: none;">
<%--<span class="layui-btn" id="checkPer" onclick="checkTree('myUnitTree');">选择单位</span>--%>
<div id="myUnitTree" style="display: none">
<div class="ISearch">
<input type="text" autocomplete="off">
<span class="layui-btn layui-btn-normal inpSearch">搜索</span>
<span class="layui-btn layui-btn-normal clearSer">清空</span>
<span class="layui-btn layui-btn-normal entSelect">确定</span>
</div>
<ul id="unit" class="ztree"></ul>
</div>
</div>
</div>
<div class="layui-form-mid">
<div style="margin: 16px 0">
<input type="radio" name="type" class="radio_inp" value="B01">命案
<input type="radio" name="type" class="radio_inp" value="B02">未知名尸体
<input type="radio" name="type" class="radio_inp" value="B03">失踪人员
<input type="radio" name="type" class="radio_inp" value="B04">涉枪
<input type="radio" name="type" class="radio_inp" value="B05">拐卖
<input type="hidden" id="type" value="">
<div style="margin: 16px 0;padding-left:60px;">
<input type="radio" name="type" class="radio_inp queryUserList" value="B01" checked="checked">命案
<input type="radio" name="type" class="radio_inp queryUserList" value="B02">涉枪
<input type="radio" name="type" class="radio_inp queryUserList" value="B03">拐卖
<input type="radio" name="type" class="radio_inp queryUserList" value="B04">未知名尸体
<input type="radio" name="type" class="radio_inp queryUserList" value="B05">失踪人员
<input type="hidden" id="type" value="B01">
</div>
</div>
<div class="layui-form-item" style="display: inline-block;width:100%;text-align: center;">
<%--<div class="layui-form-item" style="display: inline-block;width:100%;text-align: center;">
<div class="layui-form-item demoTable">
<button class="layui-btn layui-btn-normal queryUserList" data-type="reload" style="margin-left: 20px;">查询</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 20px;" onclick="reset();">清空</button>
</div>
</div>
</div>--%>
<table class="layui-table" id="userTable"
lay-filter="user">
......@@ -125,11 +87,11 @@
});
</script>
<script>
$(document).ready(function() {
/*$(document).ready(function() {
$('input[type=radio][name=type]').change(function() {
$('#type').attr("value",this.value);
});
});
});*/
layui.use('table', function(){
var table = layui.table;
//方法级渲染
......@@ -137,6 +99,7 @@
elem: '#userTable',
limit: 10,//默认采用10
url: '${pageContext.request.contextPath}/admin/search/zxywstfzrList',
where: {type:"B01"},
cols: [[
{field:'rn',title:'序号',align:'center', width:60},
{field:'trueName',title:'姓名',align:'center', width:90, sort: true},
......@@ -162,10 +125,10 @@
var type = cheNull($('#type').val());
table.reload('testReload', {
where: {
trueName: trueName,
/*trueName: trueName,
policemanid:policemanid,
telephone:telephone,
unitcode:unitcode,
unitcode:unitcode,*/
type:type
},
page: {
......@@ -177,11 +140,16 @@
});
}
};
$('.queryUserList').on('click', function(){
var type = $(this).data('type');
$('input[type=radio][name=type]').change(function() {
$('#type').attr("value",this.value);
//var type = $(this).data('type');
var type="reload";
active[type] ? active[type].call(this) : '';
});
/*$('.queryUserList').on('click', function(){
var type = $(this).data('type');
active[type] ? active[type].call(this) : '';
});*/
});
function cheNull(str) {
if (str==""){
......
......@@ -64,7 +64,7 @@ a:visited {
.left-list .left-list-ttitle{
height: 40px;
line-height: 40px;
font-family: helvetica;
/*font-family: helvetica;*/
padding-left: 13px;
color: #e5e5e5;
font-size: 18px;
......@@ -198,7 +198,8 @@ input[type=radio]{
margin-top: 10px;
}
.layui-form-mid{
width: 25%;
width: 33%;
margin-right: 0;
}
.layui-form-label{
width:30%;
......@@ -209,5 +210,52 @@ input[type=radio]{
padding: 9px 15px;
}
.searchDiv .layui-input{
height: 36px;
height: 34px;
}
/*横向栏*/
body{
background:url(../img/ocean.jpg) no-repeat center;
border-bottom-color: #fff;
}
.back{
background: none;
width: 1200px;
/*height: 500px;*/
/* overflow: hidden; */
margin: 0 auto;
}
.heade-box{
border: none;
}
.main-cen-box{
margin-left: 0;
width: 1200px;
box-shadow: 3px 3px 15px rgba(0, 0, 0, 0.6);
}
.top-menu-box{
margin-top: 20px;
position: relative;
bottom: -1px;
}
.top-menu-box .left-list li{
height: 40px;
line-height: 40px;
float: left;
padding: 0 12px;
background: rgba(0, 0, 0, 0.1);
margin-right:1px;
/* border: 1px solid rgba(204,204,204,0.3); */
}
.top-menu-box .left-list li:first-child{
border-radius: 8px 0 0 0;
}
.top-menu-box .left-list li:last-child{
border-radius: 0 8px 0 0;
}
.top-menu-box .left-list li.active{
background: #f1f1f1;
color: #333
}
.top-menu-box .left-list li.active a{
color: #333;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment