排班明细中添加公司筛选条件

ljq
1 parent b65d207c
Showing 2 changed files with 79 additions and 11 deletions
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/newest/list_newest.html
@@ -226,23 +226,30 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         String line = map.get("line").toString();
         String page = map.get("page").toString();
         Map<String, Object> modelMap = new HashMap<String, Object>();
-        
+        String fgs="";
+        if(map.get("fgsdm")!=null){
+            fgs=map.get("fgsdm").toString();
+        }
         String sql ="SELECT sp.xl as xl,MAX(sp.tt_info_names) as tt_info_name, " +
                 "MAX(sp.schedule_from_time) as from_time ,MAX(sp.schedule_to_time) as to_time, " +
                 "MAX(line.name) as name , MAX(us.user_name) as uname, " +
-                "MAX(sp.update_date) as updata_date  " +
+                "MAX(sp.update_date) as updata_date,max(bu.business_name) as business_name  " +
                 "from bsth_c_s_sp sp " +
                 "LEFT JOIN bsth_c_line  line on sp.xl = line.line_code   " +
                 "left join bsth_c_sys_user us  on sp.update_by = us.id " +
+                "LEFT JOIN bsth_c_business bu on line.branche_company = bu.business_code " +
                 "where line.name not like '%测试线路%' and sfyy = '1' " +
                 "and line.destroy = '0' " ;
-            if(!line.equals(" ") && !line.equals("")){
-                sql += "and sp.xl="+line;
-            }
-
+        if(!fgs.equals(" ") && !fgs.equals("")){
+            sql +=" and line.branche_company = '"+fgs+"'";
+        }
+        if(!line.equals(" ") && !line.equals("")){
+            sql += "and sp.xl="+line;
+        }
+         
         sql += " GROUP BY sp.xl ORDER BY MAX(sp.schedule_from_time);";
-        List<Map> list = null;
+            List<Map> list = null;
         try {
               list = jdbcTemplate.query(sql, new RowMapper<Map>() {
                 @Override
@@ -255,7 +262,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
                     map.put("name", rs.getString("name"));
                     map.put("uName", rs.getString("uname"));
                     map.put("updataDate", rs.getString("updata_date"));
-                    
+                    map.put("businessName", rs.getString("business_name"));
                     return map;
                 }
@@ -40,11 +40,16 @@
             </div>
             <div class="portlet-body">
+                <div style="display: none" id="gsdmDiv">
+                    <span class="item-label" style="width: 80px;">公司: </span>
+                    <select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
+                </div>
                 <div class="table-container" style="margin-top: 10px">
                     <table class="table table-striped table-bordered table-hover table-checkable" id="datatable_line">
                         <thead>
                         <tr role="row" class="heading">
                             <th style="width: 70px;">序号</th>
+                            <th style="width: 160px;">分公司</th>
                             <th style="width: 160px;">线路名称</th>
                             <th style="width: 250px;">关联时刻表</th>
                             <th style="width: 150px;">排班开始日期</th>
@@ -54,12 +59,14 @@
                         <tr role="row" class="filter">
                             <td></td>
                             <td>
+                                <select class="form-control" name="fgsdm" id="fgsdm" style="width: 200px;"></select>
+                            </td>
+                            <td>
                                 <select class="form-control" name="line" id="line" style="width: 200px;"></select>
+                            </td>
                             <td>
-                             
                             </td>
                             <td>
-                            
                             </td>
                             <td>
                             </td>
@@ -93,6 +100,52 @@
       if (!$('body').hasClass('page-sidebar-closed'))
           $('.menu-toggler.sidebar-toggler').click();
+
+      var fage=false;
+      var obj = [];
+      var xlList;
+      $.get('/report/lineList',function(result){
+          xlList=result;
+
+          $.get('/user/companyData', function(result){
+              obj = result;
+              console.log(obj);
+              var options = '';
+              for(var i = 0; i < obj.length; i++){
+                  options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+              }
+
+              if(obj.length ==0){
+                  $("#gsdmDiv").css('display','none');
+              }else if(obj.length ==1){
+                  $("#gsdmDiv").css('display','none');
+                  if(obj[0].children.length == 1  || obj[0].children.length ==0)
+                      $('#fgsdmDiv').css('display','none');
+              }
+              $('#gsdm').html(options);
+
+              updateCompany();
+          });
+      });
+
+      $("#gsdm").on("change",updateCompany);
+      function updateCompany(){
+          var company = $('#gsdm').val();
+          var options =[];
+          options.push({id: " ", text: "全部"});
+          for(var i = 0; i < obj.length; i++){
+              if(obj[i].companyCode == company){
+                  var children = obj[i].children;
+                  for(var j = 0; j < children.length; j++){
+                      options.push({id: children[j].code, text: children[j].name});
+                  }
+              }
+          }
+          //$('#fgsdm').html(options);
+          initPinYinSelect2('#fgsdm', options, '');
+      }
+
+
       var tempData = {};
       $.get('/report/lineList', function (xlList) {
@@ -118,14 +171,17 @@
       var list;
       var line = $("#line").val();
+      var fgsdm = $("#fgsdm").val();
       //初始化页面
       load(true);
       $("#query").on("click",function(){
           line = $("#line").val();
+          fgsdm = $("#fgsdm").val();
           load(true);
       });
       $("#notification-trigger").on("click",function(){
-          line = " "; 
+          line = " ";
+          fgsdm = " ";
           $('tr.filter input, select').val(' ').change();
           load(true);
       });
@@ -133,6 +189,7 @@
       function load(pagination){
           var params = {};
           params.line = line;
+          params.fgsdm = fgsdm;
           params.page = page;
           $get('/spc/listwest',params,function(result){
               list = result.list;
@@ -202,8 +259,12 @@
             {{(list.page*10)+(i+1)}}
         </td>
         <td>
+            {{obj.businessName}}
+        </td>
+        <td>
             {{obj.name}}
         </td>
+       
         <td>
             {{obj.ttInfoName}}
         </td>