Skip to content

S
sunac_report
Commit 0bb4990b by sunxin
Options

移交部门搜索条件添加

parent 953df9c1
Showing with 179 additions and 10 deletions
src/main/resources/mappings/modules/report/ReportDao.xml
......@@ -172,6 +172,18 @@
<if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if>
</if>
<if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup}
</if>
<if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE
<if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{transferDepartment}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{transferDepartment}, '%')</if>
</if>
<if test="reportSource != null and reportSource != ''">
AND r.report_source = #{reportSource}
</if>
......@@ -230,6 +242,16 @@
<if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if>
</if>
<if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup}
</if>
<if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE
<if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{transferDepartment}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{transferDepartment}, '%')</if>
</if>
</where>
</select>
......@@ -353,6 +375,16 @@
<if test="dbName == 'mssql'">'%'+#{supplementCategory}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{supplementCategory}, '%')</if>
</if>
<if test="transferGroup != null and transferGroup != ''">
AND r.transferGroup = #{transferGroup}
</if>
<if test="transferDepartment != null and transferDepartment != ''">
AND r.transfer_department LIKE
<if test="dbName == 'oracle'">'%'||#{transferDepartment}||'%'</if>
<if test="dbName == 'mssql'">'%'+#{transferDepartment}+'%'</if>
<if test="dbName == 'mysql'">CONCAT('%', #{transferDepartment}, '%')</if>
</if>
<if test="reportSource != null and reportSource != ''">
AND r.report_source = #{reportSource}
</if>
......
src/main/webapp/WEB-INF/classes/mappings/modules/sys/UserDao.xml
......@@ -81,6 +81,7 @@
a.update_by AS "updateBy.id",
a.update_date,
a.del_flag,
a.supplement_group AS supplementGroup,
c.name AS "company.name",
c.parent_id AS "company.parent.id",
c.parent_ids AS "company.parentIds",
......@@ -102,7 +103,10 @@
ou.id AS "office.primaryPerson.id",
ou.name AS "office.primaryPerson.name",
ou2.id AS "office.deputyPerson.id",
ou2.name AS "office.deputyPerson.name"<!-- ,
ou2.name AS "office.deputyPerson.name"
<!-- ,
r.id AS "roleList.id",
r.office_id AS "roleList.office.id",
r.name AS "roleList.name",
......@@ -119,9 +123,13 @@
LEFT JOIN ct_bbtc_sys_user cu ON cu.id = c.primary_person
LEFT JOIN ct_bbtc_sys_user cu2 ON cu2.id = c.deputy_person
LEFT JOIN ct_bbtc_sys_user ou ON ou.id = o.primary_person
LEFT JOIN ct_bbtc_sys_user ou2 ON ou2.id = o.deputy_person<!--
LEFT JOIN ct_bbtc_sys_user ou2 ON ou2.id = o.deputy_person
<!--
LEFT JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id
LEFT JOIN ct_bbtc_sys_role r ON r.id = ur.role_id -->
LEFT JOIN ct_bbtc_sys_role r ON r.id = ur.role_id
-->
</sql>
<!-- 根据编号获得用户 -->
......@@ -148,9 +156,12 @@
<select id="findList" resultType="User">
SELECT
role.id AS roleId,
cr.name AS areaName,
<include refid="userColumns"/>
FROM ct_bbtc_sys_user a
<include refid="userJoins"/>
LEFT JOIN ct_bbtc_region CR ON a.area = CR.id
<if test="role != null and role.id != null and role.id != ''">
JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id AND ur.role_id = #{role.id}
</if>
......@@ -210,9 +221,12 @@
<!-- 查询全部用户 -->
<select id="findAllList" resultType="User">
SELECT
cr.name AS areaName,
<include refid="userColumns"/>
FROM ct_bbtc_sys_user a
<include refid="userJoins"/>
LEFT JOIN ct_bbtc_region CR ON a.area = CR.id
WHERE a.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY c.code, o.code, a.name
</select>
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
......@@ -190,6 +190,7 @@
slsb.append(new Option(data1[i].name,data1[i].id));
}
}
var selectNode = $("#supplementType");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
......@@ -200,6 +201,7 @@
slsb.append(new Option(data2[i].name,data2[i].id));
}
}
},error:function(data){
alert("系统错误");
}
......@@ -243,6 +245,36 @@
}
function getTransferDepartment(ts_describe){
if(ts_describe != null && ts_describe != ''){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcRegion/getRegionList?groupId="+ts_describe,
dataType: "json",
success: function(returnedData) {
var data2 = returnedData.ctBbtcBusTypeList;
//移交部门赋值
var selectNode = $("#transferDepartment");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
if (data2 != '') {
console.log(data2[0].name);
var slsb=document.getElementById("transferDepartment");
for (var i = 0;i < data2.length;i++){
slsb.append(new Option(data2[i].name,data2[i].id));
}
}
},error:function(data){
alert("系统错误");
}
});
}else{
top.$.jBox.tip('请选择业务类型', 'warning');
}
}
function resetPageNo() {
$("#pageNo").val(0);
}
......@@ -417,6 +449,25 @@
</form:select>
</li>
<li><label>移交集团：</label>
<%-- <form:select onchange="resetPageNo();" path="transferGroup" class="input-small" id="transferGroup" value="${report.transferGroup}">
<form:option value="">请选择</form:option>
</form:select>--%>
<form:select id="transferGroup" path="transferGroup" class="input-small required" onchange="getTransferDepartment(value)">
<form:option value="">请选择</form:option>
<form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id"
htmlEscape="false"/>
</form:select>
</li>
<li><label>移交部门：</label>
<%-- <form:select onchange="resetPageNo();" path="transferDepartment" class="input-small" id="transferDepartment" value="${report.transferDepartment}">
<form:option value="">请选择</form:option>
</form:select>--%>
<form:select id="transferDepartment" onchange="resetPageNo();" path="transferDepartment" class="input-small" value="${report.transferDepartment}">
<form:option value="">请选择</form:option>
</form:select>
</li>
<li><label>处理结论：</label><form:select onchange="resetPageNo();" path="dealResult" class="input-small">
<form:option value=" ">请选择</form:option>
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
......@@ -496,7 +547,7 @@
<th>举报时间</th>
<th>状态</th>
<th>处理结论</th>
<th>移交部门</th>
<th><%--<td>移交集团</td><td>移交部门</td>--%>移交部门</th>
<th>处理人</th>
<c:if test="${isAdmin eq '1'||isAdmin eq '2'}">
<th>移交给</th>
......@@ -508,6 +559,7 @@
<th>邮件发送</th>
<th style="width:10%">操作</th>
</tr>
</thead>
<tbody>
<c:if test="${page.list.size()>0}">
......
src/main/webapp/WEB-INF/views/modules/report/reportQyList.jsp
......@@ -248,6 +248,37 @@
}
function getTransferDepartment(ts_describe){
if(ts_describe != null && ts_describe != ''){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcRegion/getRegionList?groupId="+ts_describe,
dataType: "json",
success: function(returnedData) {
var data2 = returnedData.ctBbtcBusTypeList;
//移交部门赋值
var selectNode = $("#transferDepartment");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
if (data2 != '') {
console.log(data2[0].name);
var slsb=document.getElementById("transferDepartment");
for (var i = 0;i < data2.length;i++){
slsb.append(new Option(data2[i].name,data2[i].id));
}
}
},error:function(data){
alert("系统错误");
}
});
}else{
top.$.jBox.tip('请选择业务类型', 'warning');
}
}
function resetPageNo() {
$("#pageNo").val(0);
}
......@@ -416,7 +447,24 @@
<form:option value="">请选择</form:option>
</form:select>
</li>
<li><label>移交集团：</label>
<%-- <form:select onchange="resetPageNo();" path="transferGroup" class="input-small" id="transferGroup" value="${report.transferGroup}">
<form:option value="">请选择</form:option>
</form:select>--%>
<form:select id="transferGroup" path="transferGroup" class="input-small required" onchange="getTransferDepartment(value)">
<form:option value="">请选择</form:option>
<form:options items="${fns:getDictList('supplement_group')}" itemLabel="label" itemValue="id"
htmlEscape="false"/>
</form:select>
</li>
<li><label>移交部门：</label>
<%-- <form:select onchange="resetPageNo();" path="transferDepartment" class="input-small" id="transferDepartment" value="${report.transferDepartment}">
<form:option value="">请选择</form:option>
</form:select>--%>
<form:select id="transferDepartment" onchange="resetPageNo();" path="transferDepartment" class="input-small" value="${report.transferDepartment}">
<form:option value="">请选择</form:option>
</form:select>
</li>
<li><label>处理结论：</label><form:select onchange="resetPageNo();" path="dealResult" class="input-small">
<form:option value="">请选择</form:option>
<form:options items="${fns:getDictList('deal_result')}" itemLabel="label" itemValue="value"
......
target/report_sunac/WEB-INF/classes/mappings/modules/sys/UserDao.xml
......@@ -81,6 +81,7 @@
a.update_by AS "updateBy.id",
a.update_date,
a.del_flag,
a.supplement_group AS supplementGroup,
c.name AS "company.name",
c.parent_id AS "company.parent.id",
c.parent_ids AS "company.parentIds",
......@@ -102,7 +103,10 @@
ou.id AS "office.primaryPerson.id",
ou.name AS "office.primaryPerson.name",
ou2.id AS "office.deputyPerson.id",
ou2.name AS "office.deputyPerson.name"<!-- ,
ou2.name AS "office.deputyPerson.name"
<!-- ,
r.id AS "roleList.id",
r.office_id AS "roleList.office.id",
r.name AS "roleList.name",
......@@ -119,9 +123,13 @@
LEFT JOIN ct_bbtc_sys_user cu ON cu.id = c.primary_person
LEFT JOIN ct_bbtc_sys_user cu2 ON cu2.id = c.deputy_person
LEFT JOIN ct_bbtc_sys_user ou ON ou.id = o.primary_person
LEFT JOIN ct_bbtc_sys_user ou2 ON ou2.id = o.deputy_person<!--
LEFT JOIN ct_bbtc_sys_user ou2 ON ou2.id = o.deputy_person
<!--
LEFT JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id
LEFT JOIN ct_bbtc_sys_role r ON r.id = ur.role_id -->
LEFT JOIN ct_bbtc_sys_role r ON r.id = ur.role_id
-->
</sql>
<!-- 根据编号获得用户 -->
......@@ -148,9 +156,12 @@
<select id="findList" resultType="User">
SELECT
role.id AS roleId,
cr.name AS areaName,
<include refid="userColumns"/>
FROM ct_bbtc_sys_user a
<include refid="userJoins"/>
LEFT JOIN ct_bbtc_region CR ON a.area = CR.id
<if test="role != null and role.id != null and role.id != ''">
JOIN ct_bbtc_sys_user2role ur ON ur.user_id = a.id AND ur.role_id = #{role.id}
</if>
......@@ -210,9 +221,12 @@
<!-- 查询全部用户 -->
<select id="findAllList" resultType="User">
SELECT
cr.name AS areaName,
<include refid="userColumns"/>
FROM ct_bbtc_sys_user a
<include refid="userJoins"/>
LEFT JOIN ct_bbtc_region CR ON a.area = CR.id
WHERE a.del_flag = #{DEL_FLAG_NORMAL}
ORDER BY c.code, o.code, a.name
</select>
......
target/report_sunac/WEB-INF/views/modules/sys/userForm.jsp
......@@ -147,7 +147,7 @@
<label class="control-label">所属区域:</label>
<div class="controls">
<form:select id="supplementArea" path="area" class="input-small required">
<form:option value=" "></form:option>
<form:option value="">请选择</form:option>
<%-- <form:options items="${fns:getDictList('supplement_area')}" itemLabel="label" itemValue="value"
htmlEscape="false"/>--%>
</form:select>
......
target/report_sunac/WEB-INF/views/modules/sys/userList.jsp
......@@ -62,7 +62,7 @@
</form:form>
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed">
<thead><tr><%--<th>归属公司</th><th>归属部门</th>--%><th class="sort-column login_name">登录名</th><th class="sort-column name">姓名</th><th>电话</th><th>手机</th><%--<th>角色</th> --%><shiro:hasPermission name="sys:user:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<thead><tr><%--<th>归属公司</th><th>归属部门</th>--%><th class="sort-column login_name">登录名</th><th class="sort-column name">姓名</th><th>所属集团</th><th>所属区域</th><th>电话</th><th>手机</th><%--<th>角色</th> --%><shiro:hasPermission name="sys:user:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<tbody>
<c:forEach items="${page.list}" var="user">
<tr>
......@@ -70,6 +70,15 @@
<td>${user.office.name}</td>--%>
<td><a href="${ctx}/sys/user/form?id=${user.id}">${user.loginName}</a></td>
<td>${user.name}</td>
<td align="center">
<c:if test="${user.supplementGroup eq '3437402691677202102'}">集团本部</c:if>
<c:if test="${user.supplementGroup eq '3510129313047280678'}">区域集团</c:if>
<c:if test="${user.supplementGroup eq '3565898923067676254'}">服务集团</c:if>
<c:if test="${user.supplementGroup eq '3806696792996264972'}">文化集团</c:if>
<c:if test="${user.supplementGroup eq '3770618512934949260'}">文旅集团</c:if>
<c:if test="${user.supplementGroup eq null}">--</c:if>
</td>
<td>${user.areaName}</td>
<td>${user.phone}</td>
<td>${user.mobile}</td><%--
<td>${user.roleNames}</td> --%>
......
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