潘钊 / bsth_control · Commits

Commit f8aace49566911dc3a9191c301b28062dcf319bf

Authored by 潘钊
2 parents 9df28ec5 c972b387
build: skipped

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Inline Side-by-side
Showing 2 changed files with 238 additions and 38 deletions
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
  View file @f8aace4
@@ -843,8 +843,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ @@ -843,8 +843,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ
843 /** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */ 843 /** 获取路段路由信息 @pararm：<lineId：线路ID；directions：方向> */
844 List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions); 844 List<Object[]> sobje = routeRepository.sectionRouteVector(lineId,directions);
845 if(sobje.size()==1) { 845 if(sobje.size()==1) {
846 - int dsleepStr = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(0)[2].toString());  
847 - sleepStr = "\t" + String.valueOf(dsleepStr); 846 + double dsleepStrt = sobje.get(0)[2] == null ? 60d : Double.valueOf(sobje.get(0)[2].toString());
  847 + sleepStr = "\t" + new DecimalFormat("0").format(dsleepStrt);
  848 +// int dsleepStr = sobje.get(0)[2] == null || sobje.get(0)[2].equals("") ? 60 : Integer.valueOf(sobje.get(0)[2].toString());
  849 +// sleepStr = "\t" + String.valueOf(dsleepStr);
848 }else if(sobje.size()>1){ 850 }else if(sobje.size()>1){
849 for(int j =0;j<sobje.size();j++) { 851 for(int j =0;j<sobje.size();j++) {
850 double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString()); 852 double dsleepStrt = sobje.get(j)[2] == null || sobje.get(j)[2].equals("") ? 60d : Double.valueOf(sobje.get(j)[2].toString());
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/edit.html
  View file @f8aace4
1 -<div ng-controller="SchedulePlanInfoManageEditCtrl as ctrl">  
2 - <div class="page-head">  
3 - <div class="page-title">  
4 - <h1>排班明细管理</h1>  
5 - </div>  
6 - </div>  
7 -  
8 - <ul class="page-breadcrumb breadcrumb">  
9 - <li>  
10 - <a href="/pages/home.html" data-pjax>首页</a>  
11 - <i class="fa fa-circle"></i>  
12 - </li>  
13 - <li>  
14 - <span class="active">运营计划管理</span>  
15 - <i class="fa fa-circle"></i>  
16 - </li>  
17 - <li>  
18 - <a href="javascript:" ng-click="ctrl.toPlanPage()">排班计划管理</a>  
19 - <i class="fa fa-circle"></i>  
20 - </li>  
21 - <li>  
22 - <a href="javascript:" ng-click="ctrl.toPlanInfoListPage()">排班计划管理</a>  
23 - <i class="fa fa-circle"></i>  
24 - </li>  
25 - <li>  
26 - <span class="active">修改计划班次明细</span>  
27 - </li>  
28 - </ul>  
29 -  
30 - <h1>TODO</h1>  
31 -  
32 -  
33 -  
34 -  
35 -</div>  
36 - 1 +<div ng-controller="SchedulePlanInfoManageEditCtrl as ctrl">
  2 + <div class="page-head">
  3 + <div class="page-title">
  4 + <h1>排班明细管理</h1>
  5 + </div>
  6 + </div>
  7 +
  8 + <ul class="page-breadcrumb breadcrumb">
  9 + <li>
  10 + <a href="/pages/home.html" data-pjax>首页</a>
  11 + <i class="fa fa-circle"></i>
  12 + </li>
  13 + <li>
  14 + <span class="active">运营计划管理</span>
  15 + <i class="fa fa-circle"></i>
  16 + </li>
  17 + <li>
  18 + <a href="javascript:" ng-click="ctrl.toPlanPage()">排班计划管理</a>
  19 + <i class="fa fa-circle"></i>
  20 + </li>
  21 + <li>
  22 + <a href="javascript:" ng-click="ctrl.toPlanInfoListPage()">排班计划管理</a>
  23 + <i class="fa fa-circle"></i>
  24 + </li>
  25 + <li>
  26 + <span class="active">修改计划班次明细</span>
  27 + </li>
  28 + </ul>
  29 +
  30 + <div class="portlet light bordered">
  31 + <div class="portlet-title">
  32 + <div class="caption">
  33 + <i class="icon-equalizer font-red-sunglo"></i>
  34 + <span class="caption-subject font-red-sunglo bold uppercase">
  35 + {{ctrl.schedulePlanInfoForSave.xlName}}
  36 + {{ctrl.schedulePlanInfoForSave.ttInfoName}}
  37 + {{"路牌" + ctrl.schedulePlanInfoForSave.lpName}}
  38 + <span ng-bind="ctrl.schedulePlanInfoForSave.scheduleDate | date: 'yyyy-MM-dd ' "></span>
  39 + <span>计划班次信息</span>
  40 + </span>
  41 + </div>
  42 + </div>
  43 +
  44 + <div class="portlet-body form">
  45 + <form ng-submit="ctrl.submit()" class="form-horizontal" novalidate name="myForm">
  46 + <div class="form-body">
  47 + <div class="form-group has-success has-feedback">
  48 + <label class="col-md-2 control-label">线路*：</label>
  49 + <div class="col-md-3">
  50 + <input type="text" class="form-control"
  51 + ng-value="ctrl.schedulePlanInfoForSave.xlName"
  52 + readonly/>
  53 + </div>
  54 +
  55 + </div>
  56 + <div class="form-group has-success has-feedback">
  57 + <label class="col-md-2 control-label">时刻表名称*：</label>
  58 + <div class="col-md-3">
  59 + <input type="text" class="form-control"
  60 + ng-value="ctrl.schedulePlanInfoForSave.ttInfoName"
  61 + readonly/>
  62 + </div>
  63 + </div>
  64 + <div class="form-group has-success has-feedback">
  65 + <label class="col-md-2 control-label">路牌*：</label>
  66 + <div class="col-md-3">
  67 + <input type="text" class="form-control"
  68 + ng-value="ctrl.schedulePlanInfoForSave.lpName"
  69 + readonly/>
  70 + </div>
  71 +
  72 + </div>
  73 + <div class="form-group has-success has-feedback">
  74 + <label class="col-md-2 control-label">班次类型*：</label>
  75 + <div class="col-md-3">
  76 + <input type="text" class="form-control"
  77 + ng-value="ctrl.schedulePlanInfoForSave.bcType | dict:'ScheduleType':'未知' "
  78 + readonly/>
  79 + </div>
  80 +
  81 + </div>
  82 + <div class="form-group has-success has-feedback">
  83 + <label class="col-md-2 control-label">发车时间*：</label>
  84 + <div class="col-md-3">
  85 + <input type="text" class="form-control"
  86 + ng-value="ctrl.schedulePlanInfoForSave.fcsj"
  87 + readonly/>
  88 + </div>
  89 +
  90 + </div>
  91 +
  92 + <div class="form-group has-success has-feedback">
  93 + <label class="col-md-2 control-label">方向*：</label>
  94 + <div class="col-md-3">
  95 + <sa-Radiogroup model="ctrl.schedulePlanInfoForSave.xlDir" dicgroup="LineTrend" name="xlDir" required disabled="true"></sa-Radiogroup>
  96 + </div>
  97 + <!-- 隐藏块，显示验证信息 -->
  98 + <div class="alert alert-danger well-sm" ng-show="myForm.xlDir.$error.required">
  99 + 请选择线路上下行
  100 + </div>
  101 +
  102 + </div>
  103 +
  104 + <div class="form-group has-success has-feedback">
  105 + <label class="col-md-2 control-label">起点站*：</label>
  106 + <div class="col-md-4">
  107 + <sa-Select5 name="qdz"
  108 + model="ctrl.schedulePlanInfoForSave"
  109 + cmaps="{'qdzCode' : 'zcode', 'qdzName': 'zname'}"
  110 + dcname="qdzCode"
  111 + icname="zcode"
  112 + dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.schedulePlanInfoForSave.xl, 'xldir': ctrl.schedulePlanInfoForSave.xlDir}, atype:'zd_tcc' } | json }}"
  113 + iterobjname="item"
  114 + iterobjexp="item.aname"
  115 + searchph="请输拼音..."
  116 + searchexp="this.aname"
  117 + required >
  118 + </sa-Select5>
  119 + </div>
  120 + <!-- 隐藏块，显示验证信息 -->
  121 + <div class="alert alert-danger well-sm" ng-show="myForm.qdz.$error.required">
  122 + 起点站必须选择
  123 + </div>
  124 + </div>
  125 + <div class="form-group has-success has-feedback">
  126 + <label class="col-md-2 control-label">终点站*：</label>
  127 + <div class="col-md-4">
  128 + <sa-Select5 name="zdz"
  129 + model="ctrl.schedulePlanInfoForSave"
  130 + cmaps="{'zdzCode' : 'zcode', 'zdzName': 'zname'}"
  131 + dcname="zdzCode"
  132 + icname="zcode"
  133 + dsparams="{{ {type: 'ajax', param:{'lineid': ctrl.schedulePlanInfoForSave.xl, 'xldir': ctrl.schedulePlanInfoForSave.xlDir}, atype:'zd_tcc' } | json }}"
  134 + iterobjname="item"
  135 + iterobjexp="item.aname"
  136 + searchph="请输拼音..."
  137 + searchexp="this.aname"
  138 + required >
  139 + </sa-Select5>
  140 + </div>
  141 + <!-- 隐藏块，显示验证信息 -->
  142 + <div class="alert alert-danger well-sm" ng-show="myForm.zdz.$error.required">
  143 + 终点站必须选择
  144 + </div>
  145 + </div>
  146 +
  147 + <div class="form-group has-success has-feedback">
  148 + <label class="col-md-2 control-label">车辆*：</label>
  149 + <div class="col-md-4">
  150 + <sa-Select5 name="cl"
  151 + model="ctrl.schedulePlanInfoForSave"
  152 + cmaps="{'cl': 'id', 'clZbh': 'insideCode'}"
  153 + dcname="cl"
  154 + icname="id"
  155 + dsparams="{{ {type: 'local', param: 'cl' } | json }}"
  156 + iterobjname="item"
  157 + iterobjexp="item.insideCode"
  158 + searchph="请输拼音..."
  159 + searchexp="this.insideCode"
  160 + required
  161 + >
  162 + </sa-Select5>
  163 + </div>
  164 + <!-- 隐藏块，显示验证信息 -->
  165 + <div class="alert alert-danger well-sm" ng-show="myForm.cl.$error.required">
  166 + 车辆必须选择
  167 + </div>
  168 + </div>
  169 +
  170 + <div class="form-group has-success has-feedback">
  171 + <label class="col-md-2 control-label">驾驶员*：</label>
  172 + <div class="col-md-4">
  173 + <sa-Select5 name="j"
  174 + model="ctrl.schedulePlanInfoForSave"
  175 + cmaps="{'j' : 'id', 'jGh': 'workId', 'jName': 'name'}"
  176 + dcname="j"
  177 + icname="id"
  178 + dsparams="{{ {type: 'local', param: 'ry' } | json }}"
  179 + iterobjname="item"
  180 + iterobjexp="item.name + '（' + item.workId + '）'"
  181 + searchph="请输拼音..."
  182 + searchexp="this.name"
  183 + required
  184 + >
  185 + </sa-Select5>
  186 + </div>
  187 + <!-- 隐藏块，显示验证信息 -->
  188 + <div class="alert alert-danger well-sm" ng-show="myForm.j.$error.required">
  189 + 驾驶员必须选择
  190 + </div>
  191 + </div>
  192 +
  193 + <div class="form-group">
  194 + <label class="col-md-2 control-label">售票员：</label>
  195 + <div class="col-md-4">
  196 + <sa-Select5 name="s1"
  197 + model="ctrl.schedulePlanInfoForSave"
  198 + cmaps="{'s' : 'id', 'sGh': 'workId', 'sName': 'name'}"
  199 + dcname="s"
  200 + icname="id"
  201 + dsparams="{{ {type: 'local', param: 'ry' } | json }}"
  202 + iterobjname="item"
  203 + iterobjexp="item.name + '（' + item.workId + '）'"
  204 + searchph="请输拼音..."
  205 + searchexp="this.name"
  206 + >
  207 + </sa-Select5>
  208 + </div>
  209 + </div>
  210 +
  211 +
  212 +
  213 + </div>
  214 +
  215 + <div class="form-actions">
  216 + <div class="row">
  217 + <div class="col-md-offset-3 col-md-4">
  218 + <button type="submit" class="btn green"
  219 + ng-disabled="!myForm.$valid"><i class="fa fa-check"></i> 提交</button>
  220 + <a type="button" class="btn default"
  221 + href="javascript:" ng-click="ctrl.cancel()" ><i class="fa fa-times"></i> 取消</a>
  222 + </div>
  223 + </div>
  224 + </div>
  225 + </form>
  226 +
  227 + </div>
  228 +
  229 + </div>
  230 +
  231 +
  232 +
  233 +
  234 +</div>