潘钊 / bsth_control · Commits

Commit 2f3889046146be7186331d78543fa56ef57c4a05

Authored by 徐烜
2 parents 97545ae6 7195f60e
build: skipped

Merge branch 'qingpu' into minhang

Inline Side-by-side
Showing 5 changed files with 68 additions and 78 deletions
src/main/java/com/bsth/service/schedule/SchedulePlanInfoServiceImpl.java
  View file @2f38890
... ... @@ -33,7 +33,7 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl<SchedulePlanInf
33 33 @Transactional
34 34 public int updateGroupInfo(GroupInfoUpdate groupInfoUpdate) {
35 35 int type = groupInfoUpdate.getType();
36   - int result;
  36 + int result = 0;
37 37 if (type == 1) {
38 38 // 换车
39 39 if (groupInfoUpdate.getUpdate().getClId() != groupInfoUpdate.getSrc().getClId()) {
... ... @@ -128,6 +128,6 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl<SchedulePlanInf
128 128 throw new RuntimeException("未知的更新类型，type=" + type);
129 129 }
130 130  
131   - return 0;
  131 + return result;
132 132 }
133 133 }
... ...
src/main/java/com/bsth/service/schedule/SchedulePlanServiceImpl.java
  View file @2f38890
... ... @@ -127,8 +127,8 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl<SchedulePlan, Long>
127 127 DateTime today = new DateTime(new Date());
128 128 DateTime tommorw = new DateTime(today.getYear(), today.getMonthOfYear(), today.getDayOfMonth(), 0, 0).plusDays(1);
129 129 Map<String, Object> param = new HashMap<>();
130   - param.put("scheduleFromTime_le", tommorw);
131   - param.put("scheduleToTime_ge", tommorw);
  130 + param.put("scheduleFromTime_le", tommorw.toDate());
  131 + param.put("scheduleToTime_ge", tommorw.toDate() );
132 132 Iterator<SchedulePlan> schedulePlanIterator = this.list(param).iterator();
133 133 if (schedulePlanIterator.hasNext()) {
134 134 return schedulePlanIterator.next();
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/edit_report.html
  View file @2f38890
... ... @@ -74,18 +74,18 @@
74 74 <div class="form-group has-success has-feedback" ng-if="ctrl.type == 1">
75 75 <label class="col-md-2 control-label">车辆配置-修改后*：</label>
76 76 <div class="col-md-3">
77   - <sa-Select3 model="ctrl.groupInfo"
78   - name="cl_after"
79   - placeholder="请输拼音..."
80   - dcvalue="{{ctrl.groupInfo.clId}}"
  77 + <sa-Select5 name="cl_after"
  78 + model="ctrl.groupInfo"
  79 + cmaps="{'clId' : 'id', 'clZbh': 'insideCode'}"
81 80 dcname="clId"
82 81 icname="id"
83   - dcname2="clZbh"
84   - icname2="insideCode"
85   - icnames="insideCode"
86   - datatype="cci3"
  82 + dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'cci3' } | json }}"
  83 + iterobjname="item"
  84 + iterobjexp="item.insideCode"
  85 + searchph="请输拼音..."
  86 + searchexp="this.insideCode"
87 87 required >
88   - </sa-Select3>
  88 + </sa-Select5>
89 89 </div>
90 90 <!-- 隐藏块，显示验证信息 -->
91 91 <div class="alert alert-danger well-sm" ng-show="myForm.cl_after.$error.required">
... ... @@ -121,21 +121,18 @@
121 121 <div class="form-group has-success has-feedback" ng-if="ctrl.type == 3">
122 122 <label class="col-md-2 control-label">驾驶员-修改后*：</label>
123 123 <div class="col-md-3">
124   - <sa-Select3 model="ctrl.groupInfo"
125   - name="jsy"
126   - placeholder="请输拼音..."
127   - dcvalue="{{ctrl.groupInfo.jsy1Id}}"
  124 + <sa-Select5 name="jsy"
  125 + model="ctrl.groupInfo"
  126 + cmaps="{'jsy1Id' : 'id', 'jsy1Gh': 'jobCode', 'jsy1Name': 'personnelName'}"
128 127 dcname="jsy1Id"
129   - icname="jsyId"
130   - dcname2="jsy1Gh"
131   - icname2="jsyGh"
132   - dcname3="jsy1Name"
133   - icname3="jsyName"
134   - icnames="jsyName"
135   - datatype="eci"
136   - mlp="true"
  128 + icname="id"
  129 + dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'ry' } | json }}"
  130 + iterobjname="item"
  131 + iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
  132 + searchph="请输拼音..."
  133 + searchexp="this.personnelName + '（' + this.jobCode + '）'"
137 134 required >
138   - </sa-Select3>
  135 + </sa-Select5>
139 136 </div>
140 137 <!-- 隐藏块，显示验证信息 -->
141 138 <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
... ... @@ -145,26 +142,24 @@
145 142 <div class="form-group" ng-if="ctrl.type == 3">
146 143 <label class="col-md-2 control-label">售票员-修改前：</label>
147 144 <div class="col-md-3">
148   - <input type="text" class="form-control" name="jsy_before" ng-value="ctrl.groupInfo_src.spy1Name + '（' + ctrl.groupInfo_src.spy1Gh + '）'" readonly/>
  145 + <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/>
149 146 </div>
150 147 </div>
151 148 <div class="form-group" ng-if="ctrl.type == 3">
152 149 <label class="col-md-2 control-label">售票员-修改后：</label>
153 150 <div class="col-md-3">
154   - <sa-Select3 model="ctrl.groupInfo"
155   - name="spy"
156   - placeholder="请输拼音..."
157   - dcvalue="{{ctrl.groupInfo.spy1Id}}"
  151 + <sa-Select5 name="spy"
  152 + model="ctrl.groupInfo"
  153 + cmaps="{'spy1Id' : 'id', 'spy1Gh': 'jobCode', 'spy1Name': 'personnelName'}"
158 154 dcname="spy1Id"
159   - icname="spyId"
160   - dcname2="spy1Gh"
161   - icname2="spyGh"
162   - dcname3="spy1Name"
163   - icname3="spyName"
164   - icnames="spyName"
165   - datatype="eci2"
166   - mlp="true">
167   - </sa-Select3>
  155 + icname="id"
  156 + dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'ry' } | json }}"
  157 + iterobjname="item"
  158 + iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
  159 + searchph="请输拼音..."
  160 + searchexp="this.personnelName + '（' + this.jobCode + '）'"
  161 + >
  162 + </sa-Select5>
168 163 </div>
169 164 </div>
170 165  
... ... @@ -196,21 +191,18 @@
196 191 <div class="form-group has-success has-feedback" ng-if="ctrl.type == 5">
197 192 <label class="col-md-2 control-label">驾驶员-修改后*：</label>
198 193 <div class="col-md-3">
199   - <sa-Select3 model="ctrl.groupInfo"
200   - name="jsy"
201   - placeholder="请输拼音..."
202   - dcvalue="{{ctrl.groupInfo.jsy2Id}}"
  194 + <sa-Select5 name="jsy"
  195 + model="ctrl.groupInfo"
  196 + cmaps="{'jsy2Id' : 'id', 'jsy2Gh': 'jobCode', 'jsy2Name': 'personnelName'}"
203 197 dcname="jsy2Id"
204   - icname="jsyId"
205   - dcname2="jsy2Gh"
206   - icname2="jsyGh"
207   - dcname3="jsy2Name"
208   - icname3="jsyName"
209   - icnames="jsyName"
210   - datatype="eci"
211   - mlp="true"
  198 + icname="id"
  199 + dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'ry' } | json }}"
  200 + iterobjname="item"
  201 + iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
  202 + searchph="请输拼音..."
  203 + searchexp="this.personnelName + '（' + this.jobCode + '）'"
212 204 required >
213   - </sa-Select3>
  205 + </sa-Select5>
214 206 </div>
215 207 <!-- 隐藏块，显示验证信息 -->
216 208 <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
... ... @@ -220,26 +212,24 @@
220 212 <div class="form-group" ng-if="ctrl.type == 5">
221 213 <label class="col-md-2 control-label">售票员-修改前：</label>
222 214 <div class="col-md-3">
223   - <input type="text" class="form-control" name="jsy_before" ng-value="ctrl.groupInfo_src.spy2Name + '（' + ctrl.groupInfo_src.spy2Gh + '）'" readonly/>
  215 + <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/>
224 216 </div>
225 217 </div>
226 218 <div class="form-group" ng-if="ctrl.type == 5">
227 219 <label class="col-md-2 control-label">售票员-修改后：</label>
228 220 <div class="col-md-3">
229   - <sa-Select3 model="ctrl.groupInfo"
230   - name="spy"
231   - placeholder="请输拼音..."
232   - dcvalue="{{ctrl.groupInfo.spy2Id}}"
  221 + <sa-Select5 name="spy"
  222 + model="ctrl.groupInfo"
  223 + cmaps="{'spy2Id' : 'id', 'spy2Gh': 'jobCode', 'spy2Name': 'personnelName'}"
233 224 dcname="spy2Id"
234   - icname="spyId"
235   - dcname2="spy2Gh"
236   - icname2="spyGh"
237   - dcname3="spy2Name"
238   - icname3="spyName"
239   - icnames="spyName"
240   - datatype="eci2"
241   - mlp="true">
242   - </sa-Select3>
  225 + icname="id"
  226 + dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'ry' } | json }}"
  227 + iterobjname="item"
  228 + iterobjexp="item.personnelName + '（' + item.jobCode + '）'"
  229 + searchph="请输拼音..."
  230 + searchexp="this.personnelName + '（' + this.jobCode + '）'"
  231 + >
  232 + </sa-Select5>
243 233 </div>
244 234 </div>
245 235  
... ... @@ -252,7 +242,8 @@
252 242 <div class="row">
253 243 <div class="col-md-offset-3 col-md-4">
254 244 <button type="submit" class="btn green"
255   - ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
  245 + ng-disabled="!myForm.$valid"
  246 + ><i class="fa fa-check"></i> 提交</button>
256 247 <a type="button" class="btn default" ui-sref="schedulePlanReportManage" ><i class="fa fa-times"></i> 取消</a>
257 248 </div>
258 249 </div>
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list_report.html
  View file @2f38890
... ... @@ -5,10 +5,10 @@
5 5 <thead>
6 6 <tr role="row" class="heading">
7 7 <th style="width: 50px;">序号</th>
8   - <th style="width: 230px;">线路</th>
  8 + <th style="width: 180px;">线路</th>
9 9 <th style="width: 180px">日期</th>
10   - <th style="width: 60px">路牌</th>
11   - <th style="width: 100px;">车辆</th>
  10 + <th style="width: 50px">路牌</th>
  11 + <th style="width: 130px;">车辆</th>
12 12 <th style="width: 80px;">出场1</th>
13 13 <th style="width: 100px;">驾工1</th>
14 14 <th style="width: 100px;">驾1</th>
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/schedulePlanReportManage.js
  View file @2f38890
... ... @@ -215,7 +215,8 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;SchedulePlanReportManageFormCtrl&#39;, [
215 215 'SchedulePlanReportManageService',
216 216 '$stateParams',
217 217 '$state',
218   - function(schedulePlanReportManageService, $stateParams, $state) {
  218 + '$scope',
  219 + function(schedulePlanReportManageService, $stateParams, $state, $scope) {
219 220 var self = this;
220 221  
221 222 // 传过来的值
... ... @@ -238,14 +239,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;SchedulePlanReportManageFormCtrl&#39;, [
238 239 src: self.groupInfo_src,
239 240 update: self.groupInfo
240 241 };
  242 +
  243 + //console.log($scope);
  244 + //console.log(param);
241 245 schedulePlanReportManageService.updateDetail(param).then(
242 246 function(result) {
243   - if (result.status == 'SUCCESS') {
244   - alert("保存成功！");
245   - $state.go("schedulePlanReportManage");
246   - } else {
247   - alert("保存异常！");
248   - }
  247 + $state.go("schedulePlanReportManage");
249 248 },
250 249 function(result) {
251 250 alert("出错啦！");
... ...