Skip to content

S
sunac_report
Commit 94ceb8ea by sunxin
Options

跟踪页面 业务类型 类别 逻辑修复

parent f61e2c34
Showing with 132 additions and 49 deletions
src/main/java/com/ejweb/modules/report/web/ReportController.java
......@@ -654,26 +654,37 @@ public class ReportController extends BaseController {
}
}
/*封装业务类型map*/
Map<String,String> typeMap=new HashMap();
if(oldType != ""){
String[] typeArr= oldType.split(",");
CtBbtcBusType ctBbtcBusType002=null;
for (String arr:typeArr) {
ctBbtcBusType002 = CtBbtcBusTypeService.get(arr);
typeMap.put(ctBbtcBusType002.getName(),arr);
if(ctBbtcBusType002 != null){
typeMap.put(ctBbtcBusType002.getName(),arr);
}
}
}
/*封装业务类别map*/
Map<String,String> catgoryMap=new HashMap();
if(oldCat != ""){
String[] typeArr= oldCat.split(",");
CtBbtcBusCategory ctBbtcBusCategory002=null;
for (String arr:typeArr) {
ctBbtcBusCategory002 = ctBbtcBusCategoryService.get(arr);
catgoryMap.put(ctBbtcBusCategory002.getName(),arr);
if(ctBbtcBusCategory002 != null){
catgoryMap.put(ctBbtcBusCategory002.getName(),arr);
}
}
}
/*
System.out.println("类别map大小:"+catgoryMap.size());
System.out.println("类型map大小:"+typeMap.size());
*/
model.addAttribute("page", page);
model.addAttribute("user", userEntity);
model.addAttribute("userName", user.getName());
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
......@@ -102,10 +102,8 @@
/*页面一加载，跟据举报集团 查询对应区域列表 业务列表 跟据业务列表查询类别列表 */
getRegion();
getType();
getDepartment();
getTranArea();
getBusCategory();
/* var checkedNumber = "${report.supplementType}";
......@@ -538,10 +536,46 @@
}
/*跟据 集团区域 查询类型*/
function getType(){
/*跟据 集团区域 查询类型 02 当改变区域的时候修改*/
function getType02() {
var selectNode = $("#supplementType");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
var ts_describe1= $("#supplementGroup").val();
var ts_describe2= $("#supplementArea").val();
if(ts_describe1 != null && ts_describe1 != '' && ts_describe2 != null && ts_describe2 != '' ){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcBusType/getTypeList?groupId="+ts_describe1+"&area="+ts_describe2,
dataType: "json",
success: function(returnedData) {
var data2 = returnedData.ctBbtcTypeList;
var supplementType="${report.supplementType}";
supplementType=supplementType+",";
alert(supplementType);
if (data2 != '') {
var slsb=$("#supplementType");
for (var i = 0;i < data2.length;i++){
var value=data2[i].parentId;
var label=data2[i].typeName;
slsb.append("<option value="+value+" >"+label+"</option>");
}
getBusCategory();
}
},error:function(data){
alert("系统错误");
}
});
}else{
/*top.$.jBox.tip('请选择所属集团', 'warning');*/
}
}
/*跟据 集团区域 查询类型*/
function getType(){
var ts_describe1= $("#supplementGroup").val();
var ts_describe2= $("#supplementArea").val();
......@@ -553,6 +587,8 @@
success: function(returnedData) {
var data2 = returnedData.ctBbtcTypeList;
var supplementType="${report.supplementType}";
supplementType=supplementType+",";
alert(supplementType);
if (data2 != '') {
var slsb=$("#supplementType");
......@@ -560,26 +596,26 @@
/* slsb.append(new Option(data1[i].name,data1[i].id) );*/
var value=data2[i].parentId;
var label=data2[i].typeName;
if(supplementType != ''){
if(supplementType.search(label) != -1){
/*slsb.append("<option value="+value+" selected='true' >"+label+"</option>");*/
/* try {
$('#s2id_supplementType').find('.select2-choices').append(label+",");
} catch (e) {
console.log(e);
}*/
if(supplementType != ''){
if(supplementType.search(label+",") != -1 ){
/*slsb.append("<option value="+value+" selected='true' >"+label+"</option>");*/
/* try {
$('#s2id_supplementType').find('.select2-choices').append(label+",");
} catch (e) {
console.log(e);
}*/
}else{
slsb.append("<option value="+value+" >"+label+"</option>");
}
}else{
slsb.append("<option value="+value+" >"+label+"</option>");
}
}else{
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
slsb.append("<option value="+value+" >"+label+"</option>");
}
}
getBusCategory();
}
},error:function(data){
alert("系统错误");
......@@ -686,13 +722,54 @@
}
/*
*联动查询类型下的类别
*/
function getBusCategory(){
/*
*联动查询类型下的类别02 改变业务类型时执行的，和初始化查询不同
*/
function getBusCategory02(){
var selectNode = $("#supplementCategory");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
/*获取类型选项框中的多个值 逗号分隔*/
var ts_describe= $("#supplementType").val();
/*alert(ts_describe);*/
if(ts_describe != null && ts_describe != ''){
$.ajax({
type: "POST",
url: "${ctx}/report/ctBbtcBusCategory/getBusCategoryList?typeId="+ts_describe,
dataType: "json",
success: function(returnedData) {
var data = returnedData.ctBbtcBusCategoryList;
var supplementCategory="${report.supplementCategory}";
supplementCategory=supplementCategory+",";
if (data != '') {
var slsb=$("#supplementCategory");
for (var i = 0;i < data.length;i++){
/* slsb.append(new Option(data1[i].name,data1[i].id) );*/
var value=data[i].id;
var label=data[i].name;
slsb.append("<option value="+value+" >"+label+"</option>");
}
}
},error:function(data){
alert("系统错误");
}
});
}else{
/*top.$.jBox.tip('请选择业务类型', 'warning');*/
}
}
/*
*联动查询类型下的类别
*/
function getBusCategory(){
/*获取类型选项框中的多个值 逗号分隔*/
var ts_describe= $("#supplementType").val();
/*alert(ts_describe);*/
......@@ -702,16 +779,10 @@
url: "${ctx}/report/ctBbtcBusCategory/getBusCategoryList?typeId="+ts_describe,
dataType: "json",
success: function(returnedData) {
console.log(returnedData);
var data = returnedData.ctBbtcBusCategoryList;
console.log(data[0].name);
/* var selectNode = $("#supplementCategory");
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");*/
// selectNode.append("<option value=''>请选择</option>");
var supplementCategory="${report.supplementCategory}";
supplementCategory=supplementCategory+",";
if (data != '') {
var slsb=$("#supplementCategory");
......@@ -719,22 +790,23 @@
/* slsb.append(new Option(data1[i].name,data1[i].id) );*/
var value=data[i].id;
var label=data[i].name;
if(supplementCategory != ''){
if(supplementCategory.search(label) != -1){
/* slsb.append("<option value="+value+" selected='true' >"+label+"</option>");*/
/* try {
$('#s2id_supplementCategory').find('.select2-choices').append(label+",");
} catch (e) {
console.log(e);
}*/
/*如果因为改变业务类型而改变 则需清空列表*/
if(supplementCategory != ''){
if(supplementCategory.search(label+",") != -1){
/* slsb.append("<option value="+value+" selected='true' >"+label+"</option>");*/
/* try {
$('#s2id_supplementCategory').find('.select2-choices').append(label+",");
} catch (e) {
console.log(e);
}*/
}else{
slsb.append("<option value="+value+" >"+label+"</option>");
}
}else{
slsb.append("<option value="+value+" >"+label+"</option>");
}
}else{
selectNode.empty();//每次需要将上一次的数据进行清空
selectNode.append("<option value=''>请选择</option>");
slsb.append("<option value="+value+" >"+label+"</option>");
}
}
......@@ -970,7 +1042,7 @@
&lt;%&ndash;<options items="${ctBbtcRegionList}" itemLabel="name" itemValue="id"&ndash;%&gt;
&lt;%&ndash;htmlEscape="false"/></select>&ndash;%&gt;
</select>--%>
<form:select id="supplementArea" path="supplementArea" class="input-small required" onchange="getType();" cssStyle="width: 280px">
<form:select id="supplementArea" path="supplementArea" class="input-small required" onchange="getType02();" cssStyle="width: 280px">
<form:option value="">请选择</form:option>
</form:select>
<span class="help-inline"><font color="red">*</font> </span>
......@@ -990,10 +1062,10 @@
</select>--%>
<select id="supplementType" name="supplementType" class="selectpicker bla bla bli" onchange="getBusCategory()" style="width: 280px" multiple data-live-search="true" >
<select id="supplementType" name="supplementType" class="selectpicker bla bla bli" onchange="getBusCategory02()" style="width: 280px" multiple data-live-search="true" >
<option value="">请选择</option>
<c:if test="${report.supplementType != null}">
<c:if test="${ not empty typeMap}">
<c:forEach items="${typeMap}" var="type" >
<option selected value="${type.value}">${type.key}</option>
</c:forEach>
......@@ -1018,7 +1090,7 @@
<select id="supplementCategory" name="supplementCategory" class="selectpicker bla bla bli" onchange="resetPageNo()" style="width: 280px" multiple data-live-search="true" >
<option value="">请选择</option>
<c:if test="${report.supplementCategory != null}">
<c:if test="${not empty catgoryMap}">
<c:forEach items="${catgoryMap}" var="catgory" >
<option selected value="${catgory.value}">${catgory.key}</option>
</c:forEach>
......
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