Merge branch 'qingpu' into minhang

徐烜
2 parents 97545ae6 7195f60e
Showing 5 changed files with 68 additions and 78 deletions
src/main/java/com/bsth/service/schedule/SchedulePlanInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/SchedulePlanServiceImpl.java
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/edit_report.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list_report.html
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanReportManage.js
@@ -33,7 +33,7 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl&lt;SchedulePlanInf
     @Transactional
     public int updateGroupInfo(GroupInfoUpdate groupInfoUpdate) {
         int type = groupInfoUpdate.getType();
-        int result;
+        int result = 0;
         if (type == 1) {
             // 换车
             if (groupInfoUpdate.getUpdate().getClId() != groupInfoUpdate.getSrc().getClId()) {
@@ -128,6 +128,6 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl&lt;SchedulePlanInf
             throw new RuntimeException("未知的更新类型，type=" + type);
         }
-        return 0;
+        return result;
     }
 }
@@ -127,8 +127,8 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
         DateTime today = new DateTime(new Date());
         DateTime tommorw = new DateTime(today.getYear(), today.getMonthOfYear(), today.getDayOfMonth(), 0, 0).plusDays(1);
         Map<String, Object> param = new HashMap<>();
-        param.put("scheduleFromTime_le", tommorw);
-        param.put("scheduleToTime_ge", tommorw);
+        param.put("scheduleFromTime_le", tommorw.toDate());
+        param.put("scheduleToTime_ge", tommorw.toDate()     );
         Iterator<SchedulePlan> schedulePlanIterator = this.list(param).iterator();
         if (schedulePlanIterator.hasNext()) {
             return schedulePlanIterator.next();
@@ -74,18 +74,18 @@
                 <div class="form-group has-success has-feedback" ng-if="ctrl.type == 1">
                     <label class="col-md-2 control-label">车辆配置-修改后*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.groupInfo"
-                                    name="cl_after"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.groupInfo.clId}}"
+                        <sa-Select5 name="cl_after"
+                                    model="ctrl.groupInfo"
+                                    cmaps="{'clId' : 'id', 'clZbh': 'insideCode'}"
                                     dcname="clId"
                                     icname="id"
-                                    dcname2="clZbh"
-                                    icname2="insideCode"
-                                    icnames="insideCode"
-                                    datatype="cci3"
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'cci3' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.insideCode"
+                                    searchph="请输拼音..."
+                                    searchexp="this.insideCode"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.cl_after.$error.required">
@@ -121,21 +121,18 @@
                 <div class="form-group has-success has-feedback" ng-if="ctrl.type == 3">
                     <label class="col-md-2 control-label">驾驶员-修改后*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.groupInfo"
-                                    name="jsy"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.groupInfo.jsy1Id}}"
+                        <sa-Select5 name="jsy"
+                                    model="ctrl.groupInfo"
+                                    cmaps="{'jsy1Id' : 'id', 'jsy1Gh': 'jobCode', 'jsy1Name': 'personnelName'}"
                                     dcname="jsy1Id"
-                                    icname="jsyId"
-                                    dcname2="jsy1Gh"
-                                    icname2="jsyGh"
-                                    dcname3="jsy1Name"
-                                    icname3="jsyName"
-                                    icnames="jsyName"
-                                    datatype="eci"
-                                    mlp="true"
+                                    icname="id"
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'ry' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                    searchph="请输拼音..."
+                                    searchexp="this.personnelName + '（' + this.jobCode + '）'"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
@@ -145,26 +142,24 @@
                 <div class="form-group" ng-if="ctrl.type == 3">
                     <label class="col-md-2 control-label">售票员-修改前：</label>
                     <div class="col-md-3">
-                        <input type="text" class="form-control" name="jsy_before" ng-value="ctrl.groupInfo_src.spy1Name + '（' + ctrl.groupInfo_src.spy1Gh + '）'" readonly/>
+                        <input type="text" class="form-control" name="spy_before" ng-value="ctrl.groupInfo_src.spy1Id == null ? '' : (ctrl.groupInfo_src.spy1Name + '（' + ctrl.groupInfo_src.spy1Gh + '）')" readonly/>
                     </div>
                 </div>
                 <div class="form-group" ng-if="ctrl.type == 3">
                     <label class="col-md-2 control-label">售票员-修改后：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.groupInfo"
-                                    name="spy"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.groupInfo.spy1Id}}"
+                        <sa-Select5 name="spy"
+                                    model="ctrl.groupInfo"
+                                    cmaps="{'spy1Id' : 'id', 'spy1Gh': 'jobCode', 'spy1Name': 'personnelName'}"
                                     dcname="spy1Id"
-                                    icname="spyId"
-                                    dcname2="spy1Gh"
-                                    icname2="spyGh"
-                                    dcname3="spy1Name"
-                                    icname3="spyName"
-                                    icnames="spyName"
-                                    datatype="eci2"
-                                    mlp="true">
-                        </sa-Select3>
+                                    icname="id"
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'ry' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                    searchph="请输拼音..."
+                                    searchexp="this.personnelName + '（' + this.jobCode + '）'"
+                                    >
+                        </sa-Select5>
                     </div>
                 </div>
@@ -196,21 +191,18 @@
                 <div class="form-group has-success has-feedback" ng-if="ctrl.type == 5">
                     <label class="col-md-2 control-label">驾驶员-修改后*：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.groupInfo"
-                                    name="jsy"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.groupInfo.jsy2Id}}"
+                        <sa-Select5 name="jsy"
+                                    model="ctrl.groupInfo"
+                                    cmaps="{'jsy2Id' : 'id', 'jsy2Gh': 'jobCode', 'jsy2Name': 'personnelName'}"
                                     dcname="jsy2Id"
-                                    icname="jsyId"
-                                    dcname2="jsy2Gh"
-                                    icname2="jsyGh"
-                                    dcname3="jsy2Name"
-                                    icname3="jsyName"
-                                    icnames="jsyName"
-                                    datatype="eci"
-                                    mlp="true"
+                                    icname="id"
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'ry' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                    searchph="请输拼音..."
+                                    searchexp="this.personnelName + '（' + this.jobCode + '）'"
                                     required >
-                        </sa-Select3>
+                        </sa-Select5>
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
@@ -220,26 +212,24 @@
                 <div class="form-group" ng-if="ctrl.type == 5">
                     <label class="col-md-2 control-label">售票员-修改前：</label>
                     <div class="col-md-3">
-                        <input type="text" class="form-control" name="jsy_before" ng-value="ctrl.groupInfo_src.spy2Name + '（' + ctrl.groupInfo_src.spy2Gh + '）'" readonly/>
+                        <input type="text" class="form-control" name="jsy_before" ng-value="ctrl.groupInfo_src.spy2Id == null ? '' : (ctrl.groupInfo_src.spy2Name + '（' + ctrl.groupInfo_src.spy2Gh + '）')" readonly/>
                     </div>
                 </div>
                 <div class="form-group" ng-if="ctrl.type == 5">
                     <label class="col-md-2 control-label">售票员-修改后：</label>
                     <div class="col-md-3">
-                        <sa-Select3 model="ctrl.groupInfo"
-                                    name="spy"
-                                    placeholder="请输拼音..."
-                                    dcvalue="{{ctrl.groupInfo.spy2Id}}"
+                        <sa-Select5 name="spy"
+                                    model="ctrl.groupInfo"
+                                    cmaps="{'spy2Id' : 'id', 'spy2Gh': 'jobCode', 'spy2Name': 'personnelName'}"
                                     dcname="spy2Id"
-                                    icname="spyId"
-                                    dcname2="spy2Gh"
-                                    icname2="spyGh"
-                                    dcname3="spy2Name"
-                                    icname3="spyName"
-                                    icnames="spyName"
-                                    datatype="eci2"
-                                    mlp="true">
-                        </sa-Select3>
+                                    icname="id"
+                                    dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'ry' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
+                                    searchph="请输拼音..."
+                                    searchexp="this.personnelName + '（' + this.jobCode + '）'"
+                                >
+                        </sa-Select5>
                     </div>
                 </div>
@@ -252,7 +242,8 @@
                 <div class="row">
                     <div class="col-md-offset-3 col-md-4">
                         <button type="submit" class="btn green"
-                                ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
+                                ng-disabled="!myForm.$valid"
+                                ><i class="fa fa-check"></i> 提交</button>
                         <a type="button" class="btn default" ui-sref="schedulePlanReportManage" ><i class="fa fa-times"></i> 取消</a>
                     </div>
                 </div>
@@ -5,10 +5,10 @@
             <thead>
             <tr role="row" class="heading">
                 <th style="width: 50px;">序号</th>
-                <th style="width: 230px;">线路</th>
+                <th style="width: 180px;">线路</th>
                 <th style="width: 180px">日期</th>
-                <th style="width: 60px">路牌</th>
-                <th style="width: 100px;">车辆</th>
+                <th style="width: 50px">路牌</th>
+                <th style="width: 130px;">车辆</th>
                 <th style="width: 80px;">出场1</th>
                 <th style="width: 100px;">驾工1</th>
                 <th style="width: 100px;">驾1</th>
@@ -215,7 +215,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;SchedulePlanReportManageFormCtrl&#39;, [
     'SchedulePlanReportManageService',
     '$stateParams',
     '$state',
-    function(schedulePlanReportManageService, $stateParams, $state) {
+    '$scope',
+    function(schedulePlanReportManageService, $stateParams, $state, $scope) {
         var self = this;
         // 传过来的值
@@ -238,14 +239,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;SchedulePlanReportManageFormCtrl&#39;, [
                 src: self.groupInfo_src,
                 update: self.groupInfo
             };
+
+            //console.log($scope);
+            //console.log(param);
             schedulePlanReportManageService.updateDetail(param).then(
                 function(result) {
-                    if (result.status == 'SUCCESS') {
-                        alert("保存成功！");
-                        $state.go("schedulePlanReportManage");
-                    } else {
-                        alert("保存异常！");
-                    }
+                    $state.go("schedulePlanReportManage");
                 },
                 function(result) {
                     alert("出错啦！");