update

徐烜
1 parent c49536a5
Showing 5 changed files with 55 additions and 4 deletions
src/main/java/com/bsth/controller/schedule/SchedulePlanInfoController.java
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/index_info.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanInfoManage.js
src/main/resources/static/pages/scheduleApp/module/main.js
@@ -2,9 +2,18 @@ package com.bsth.controller.schedule;
  
 import com.bsth.controller.BaseController;
 import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.google.common.base.Splitter;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 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.RestController;
  
+import java.util.List;
+import java.util.Map;
+
 /**
  * Created by xu on 16/6/16.
  */
@@ -12,4 +21,32 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("spic")
 public class SchedulePlanInfoController extends BaseController<SchedulePlanInfo, Long> {
  
+    /**
+     *
+     * @Title: list
+     * @Description: TODO(多条件分页查询)
+     * @param @param map 查询条件
+     * @param @param page 页码
+     * @param @param size 每页显示数量
+     * @throws
+     */
+    @RequestMapping(method = RequestMethod.GET)
+    public Page<SchedulePlanInfo> list(@RequestParam Map<String, Object> map,
+                        @RequestParam(defaultValue = "0") int page,
+                        @RequestParam(defaultValue = "10") int size,
+                        @RequestParam(defaultValue = "id") String order,
+                        @RequestParam(defaultValue = "DESC") String direction){
+
+        Sort.Direction d;
+
+        if(null != direction && direction.equals("ASC"))
+            d = Sort.Direction.ASC;
+        else
+            d = Sort.Direction.DESC;
+
+        // order由 col1,col2,col3 这样传入
+        List<String> list = Splitter.on(",").trimResults().splitToList(order);
+        return baseService.list(map, new PageRequest(page, size, new Sort(d, list)));
+    }
+
 }
@@ -28,7 +28,11 @@
             <div class="portlet-title">
                 <div class="caption font-dark">
                     <i class="fa fa-database font-dark"></i>
-                    <span class="caption-subject bold uppercase">85路（85路0328平表-时刻表）排班明细</span>
+                    <span class="caption-subject bold uppercase">
+                        {{xlname + "（" + ttname + "-时刻表）"}}
+                        <span ng-bind="stime | date: 'yyyy-MM-dd ' + '至'"></span>
+                        <span ng-bind="etime | date: 'yyyy-MM-dd ' + '排班明细列表'"></span>
+                    </span>
                 </div>
                 <div class="actions">
                     <a href="javascirpt:" class="btn btn-circle blue" >
@@ -66,7 +66,8 @@
             <td>
                 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
                 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
-                <a ui-sref="schedulePlanInfoManage({spid : info.id})" class="btn default blue-stripe btn-sm"> 排班明细 </a>
+                <a ui-sref="schedulePlanInfoManage({spid : info.id, xlname : info.xl.name, ttname : info.ttInfo.name, stime : info.scheduleFromTime, etime : info.scheduleToTime})"
+                   class="btn default blue-stripe btn-sm"> 排班明细 </a>
             </td>
         </tr>
         </tbody>
@@ -49,7 +49,16 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService&#39;, [&#39;Schedul
 angular.module('ScheduleApp').controller('SchedulePlanInfoManageCtrl', ['SchedulePlanInfoManageService', '$state', '$stateParams', '$scope', function(schedulePlanInfoManageService, $state, $stateParams, $scope) {
     var self = this;
     var spid = $stateParams.spid; // 排班规则id
+    var xlname = $stateParams.xlname; // 线路名字
+    var ttname = $stateParams.ttname; // 时刻表名字
+    var stime = $stateParams.stime; // 开始时间
+    var etime = $stateParams.etime; // 结束时间
+
     $scope.spid = spid;
+    $scope.xlname = xlname;
+    $scope.ttname = ttname;
+    $scope.stime = stime;
+    $scope.etime = etime;
  
     // 切换到form状态
     self.goForm = function() {
@@ -733,7 +733,7 @@ ScheduleApp.config([&#39;$stateProvider&#39;, &#39;$urlRouterProvider&#39;, function($stateProvi
  
         // 排班计划明细管理模块
         .state("schedulePlanInfoManage", {
-            url: '/schedulePlanInfoManage/:spid',
+            url: '/schedulePlanInfoManage/:spid/:xlname/:ttname/:stime/:etime',
             views: {
                 "": {
                     templateUrl: 'pages/scheduleApp/module/core/schedulePlanManage/index_info.html'
@@ -1069,7 +1069,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
     return {
         rest : $resource(
             '/spic/:id',
-            {order: 'scheduleDate', direction: 'ASC', id: '@id_route'},
+            {order: 'scheduleDate,lp,fcno', direction: 'ASC', id: '@id_route'},
             {
                 list: {
                     method: 'GET',