PSM-7

徐烜
1 parent f7603ac9
Showing 6 changed files with 115 additions and 35 deletions
src/main/java/com/bsth/entity/search/PredicatesBuilder.java
src/main/resources/static/pages/scheduleApp/module/common/main.js
src/main/resources/static/pages/scheduleApp/module/common/prj-common-globalservice.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanManage.js
src/main/resources/static/pages/scheduleApp/module/core/ttInfoDetailManage/main.js
 package com.bsth.entity.search;
+import org.joda.time.DateTime;
+
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Predicate;
@@ -56,6 +58,10 @@ public class PredicatesBuilder {
         } else if (leftType.isAssignableFrom(Date.class) &&
                 rightType.isAssignableFrom(Date.class)) { // 判定是否是Date类型的子类
             return cb.greaterThanOrEqualTo((Path<Date>) expression, (Date) object);
+        } else if (leftType.isAssignableFrom(Date.class) &&
+                rightType.isAssignableFrom(String.class)) { // 左边是日期，右边是字符串，尝试转换字符串到日期
+            DateTime dateTime = new DateTime(object);
+            return cb.greaterThanOrEqualTo((Path<Date>) expression, dateTime.toDate());
         } else {
             throw new RuntimeException("ge 不支持类型组合：" + expression.getJavaType() + ">=" + object.getClass());
         }
@@ -83,6 +89,10 @@ public class PredicatesBuilder {
         } else if (leftType.isAssignableFrom(Date.class) &&
                 rightType.isAssignableFrom(Date.class)) { // 判定是否是Date类型的子类
             return cb.lessThanOrEqualTo((Path<Date>) expression, (Date) object);
+        } else if (leftType.isAssignableFrom(Date.class) &&
+                rightType.isAssignableFrom(String.class)) { // 左边是日期，右边是字符串，尝试转换字符串到日期
+            DateTime dateTime = new DateTime(object);
+            return cb.lessThanOrEqualTo((Path<Date>) expression, dateTime.toDate());
         } else {
             throw new RuntimeException("ge 不支持类型组合：" + expression.getJavaType() + ">=" + object.getClass());
         }
@@ -63,27 +63,59 @@ ScheduleApp.factory(&#39;requestNotificationChannel&#39;, [&#39;$rootScope&#39;, function($rootS
 }]);
 // http 拦截器
-ScheduleApp.factory('myInterceptor', ['requestNotificationChannel', function(requestNotificationChannel) {
-    return {
-        request: function(config) {
-            requestNotificationChannel.requestStarted();
-            return config;
-        },
-        requestError: function(rejection) {
-            requestNotificationChannel.requestEnded();
-            return rejection;
-        },
-        response: function(response) {
-            requestNotificationChannel.requestEnded();
-            return response;
-        },
-        responseError: function(rejection) {
-            requestNotificationChannel.requestEnded();
-            return rejection;
-        }
-    };
+ScheduleApp.factory(
+    'myInterceptor',
+    [
+        'requestNotificationChannel',
+        '$q',
+        function(requestNotificationChannel, $q) {
+            return {
+                request: function(config) {
+                    requestNotificationChannel.requestStarted();
+                    return config;
+                },
+                requestError: function(rejection) {
+                    requestNotificationChannel.requestEnded();
+                    return rejection;
+                },
+                response: function(response) {
+                    requestNotificationChannel.requestEnded();
-}]);
+                    return response;
+                },
+                responseError: function(rejection) {
+                    requestNotificationChannel.requestEnded();
+
+                    // 处理错误，springboot会包装返回的错误数据
+                    // 如：{"timestamp":1478674739246,"status":500,"error":"Internal Server Error","exception":"java.lang.ClassCastException","message":"java.lang.String cannot be cast to java.lang.Long","path":"/tidc/importfile"}
+
+                    var status = rejection.status;
+                    var path = rejection.data.path;
+                    var message = rejection.data.message;
+                    var output = [];
+                    output.push("状态编码：" + status);
+                    output.push("访问路径：" + path);
+                    output.push("错误消息：" + message);
+                    if (status) {
+                        if (status == 500) {
+                            alert("服务端错误：" + "\n" + output.join("\n"));
+                        } else if (status == 407) {
+                            alert("请重新登录：" + "\n" + output.join("\n"));
+                        } else if (status == -1) {
+                            alert("貌似服务端连接不上");
+                        } else {
+                            alert("其他错误：" + "\n" + output.join("\n"));
+                        }
+                    } else {
+                        alert("我擦，后台返回连个状态码都没返回，见鬼了！");
+                    }
+
+                    return $q.reject(rejection);
+                }
+            };
+        }
+    ]
+);
 ScheduleApp.config(['$httpProvider', function($httpProvider) {
     $httpProvider.defaults.headers.common["X-Requested-With"] = "XMLHttpRequest";
@@ -416,7 +416,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanManageService_g&#39;, [&#39;$resource
     return {
         rest : $resource(
             '/spc/:id',
-            {order: 'createDate', direction: 'DESC', id: '@id_route'},
+            {order: 'xl.id,createDate', direction: 'DESC,DESC', id: '@id_route'},
             {
                 list: {
                     method: 'GET',
@@ -452,7 +452,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;SchedulePlanInfoManageService_g&#39;, [&#39;$reso
     return {
         rest : $resource(
             '/spic/:id',
-            {order: 'scheduleDate,lp,fcno', direction: 'ASC', id: '@id_route'},
+            {order: 'scheduleDate,lp,fcno', direction: 'ASC,ASC,ASC', id: '@id_route'},
             {
                 list: {
                     method: 'GET',
@@ -4,13 +4,13 @@
         <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
             <thead>
             <tr role="row" class="heading">
-                <th style="width: 5%;">序号</th>
-                <th style="width: 15%;">线路</th>
-                <th style="width: 20%;">时刻表</th>
-                <th>排班开始时间</th>
-                <th>排班结束时间</th>
-                <th>修改时间</th>
-                <th style="width: 21%">操作</th>
+                <th style="width: 50px;">序号</th>
+                <th style="width: 150px;">线路</th>
+                <th style="width: 100%;">关联时刻表</th>
+                <th style="width: 150px;">排班开始日期</th>
+                <th style="width: 150px;">排班结束日期</th>
+                <th style="width: 180px;">排班操作时间</th>
+                <th style="width: 180px;">操作</th>
             </tr>
             <tr role="row" class="filter">
                 <td></td>
@@ -25,9 +25,37 @@
                                 datatype="xl">
                     </sa-Select3>
                 </td>
-                <td></td>
-                <td></td>
-                <td></td>
+                <td>
+                    <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().name_like" placeholder="输入时刻表名称..."/>
+                </td>
+                <td>
+                    <div class="input-group">
+                        <input type="text" class="form-control input-sm"
+                               name="scheduleFromTime" placeholder="选择日期..."
+                               uib-datepicker-popup="yyyy-MM-dd"
+                               is-open="ctrl.scheduleFromTime"
+                               ng-model="ctrl.searchCondition()['scheduleFromTime_ge']" readonly/>
+                        <span class="input-group-btn">
+                            <button type="button" class="btn btn-default btn-sm" ng-click="ctrl.scheduleFromTime_open()">
+                                <i class="glyphicon glyphicon-calendar"></i>
+                            </button>
+                        </span>
+                    </div>
+                </td>
+                <td>
+                    <div class="input-group">
+                        <input type="text" class="form-control input-sm"
+                               name="scheduleToTime" placeholder="选择日期..."
+                               uib-datepicker-popup="yyyy-MM-dd"
+                               is-open="ctrl.scheduleToTime"
+                               ng-model="ctrl.searchCondition()['scheduleToTime_le']" readonly/>
+                        <span class="input-group-btn">
+                            <button type="button" class="btn btn-default btn-sm" ng-click="ctrl.scheduleToTime_open()">
+                                <i class="glyphicon glyphicon-calendar"></i>
+                            </button>
+                        </span>
+                    </div>
+                </td>
                 <td></td>
                 <td>
                     <button class="btn btn-sm green btn-outline filter-submit margin-bottom"
@@ -65,9 +93,9 @@
                     <!--<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, xlname : info.xl.name, ttname : info.ttInfo.name, stime : info.scheduleFromTime, etime : info.scheduleToTime})"
-                       class="btn default blue-stripe btn-sm"> 排班明细 </a>
+                       class="btn btn-info btn-sm"> 明细 </a>
                     <a ng-click="ctrl.deletePlan(info.id)"
-                       class="btn default blue-stripe btn-sm"> 删除 </a>
+                       class="btn btn-danger btn-sm"> 删除 </a>
                 </td>
             </tr>
             </tbody>
@@ -78,6 +78,16 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;SchedulePlanManageListCtrl&#39;, [&#39;Schedul
         infos: []
     };
+    // 日期 日期控件开关
+    self.scheduleFromTime = false;
+    self.scheduleFromTime_open = function() {
+        self.scheduleFromTime = true;
+    };
+    self.scheduleToTime = false;
+    self.scheduleToTime_open = function() {
+        self.scheduleToTime = true;
+    };
+
     // 初始创建的时候，获取一次列表数据
     schedulePlanManageService.getPage().then(
         function(result) {
@@ -109,7 +109,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // TODO：edit操作暂时使用旧版本的js文件
-            // {"timestamp":1478674739246,"status":500,"error":"Internal Server Error","exception":"java.lang.ClassCastException","message":"java.lang.String cannot be cast to java.lang.Long","path":"/tidc/importfile"}
+
         }
     ]
 );
 \ No newline at end of file