潘钊 / bsth_control · Commits

Commit 97da1203df0bc55b4a12ea0829d7462d8f24335a

Authored by 徐烜
1 parent 31a1bea8

Update

Inline Side-by-side
Showing 6 changed files with 57 additions and 12 deletions
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
  View file @97da120
@@ -210,6 +210,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im @@ -210,6 +210,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im
210 Map<String, Object> p2 = new HashMap<>(); 210 Map<String, Object> p2 = new HashMap<>();
211 p2.put("xl.id_eq", lineid); 211 p2.put("xl.id_eq", lineid);
212 p2.put("lpName_eq", bcell_con.trim()); 212 p2.put("lpName_eq", bcell_con.trim());
  213 + p2.put("isCancel_eq", 0);
213 List<GuideboardInfo> guideboardInfoList = (List<GuideboardInfo>) guideboardInfoService.list(p2); 214 List<GuideboardInfo> guideboardInfoList = (List<GuideboardInfo>) guideboardInfoService.list(p2);
214 if (CollectionUtils.isEmpty(guideboardInfoList)) { 215 if (CollectionUtils.isEmpty(guideboardInfoList)) {
215 throw new Exception(String.format("第%d行，第1列的路牌在%s中不存在", i + 1, linename)); 216 throw new Exception(String.format("第%d行，第1列的路牌在%s中不存在", i + 1, linename));
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saPlanInfoEdit.js
  View file @97da120
@@ -133,11 +133,17 @@ angular.module(&#39;ScheduleApp&#39;).directive( @@ -133,11 +133,17 @@ angular.module(&#39;ScheduleApp&#39;).directive(
133 var new_j1_id = new_j1.split("_")[0]; 133 var new_j1_id = new_j1.split("_")[0];
134 var new_j1_name = new_j1.split("_")[1]; 134 var new_j1_name = new_j1.split("_")[1];
135 var new_j1_gh = new_j1.split("_")[2]; 135 var new_j1_gh = new_j1.split("_")[2];
  136 + if (new_j1_gh && new_j1_gh.indexOf("-") > 0) {
  137 + new_j1_gh = new_j1_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
  138 + }
136 139
137 if (new_j2) { 140 if (new_j2) {
138 var new_j2_id = new_j2.split("_")[0]; 141 var new_j2_id = new_j2.split("_")[0];
139 var new_j2_name = new_j2.split("_")[1]; 142 var new_j2_name = new_j2.split("_")[1];
140 var new_j2_gh = new_j2.split("_")[2]; 143 var new_j2_gh = new_j2.split("_")[2];
  144 + if (new_j2_gh && new_j2_gh.indexOf("-") > 0) {
  145 + new_j2_gh = new_j2_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
  146 + }
141 147
142 if (old_isfb) { // 使用分班判定 148 if (old_isfb) { // 使用分班判定
143 angular.forEach(scope[ctrlAs].ds, function(obj, index) { 149 angular.forEach(scope[ctrlAs].ds, function(obj, index) {
@@ -205,16 +211,23 @@ angular.module(&#39;ScheduleApp&#39;).directive( @@ -205,16 +211,23 @@ angular.module(&#39;ScheduleApp&#39;).directive(
205 var new_s1_id = new_s1.split("_")[0]; 211 var new_s1_id = new_s1.split("_")[0];
206 var new_s1_name = new_s1.split("_")[1]; 212 var new_s1_name = new_s1.split("_")[1];
207 var new_s1_gh = new_s1.split("_")[2]; 213 var new_s1_gh = new_s1.split("_")[2];
  214 + if (new_s1_gh && new_s1_gh.indexOf("-") > 0) { // 修正工号，吧 55- 这种前缀去掉
  215 + new_s1_gh = new_s1_gh.substr(3);
  216 + }
208 217
209 if (new_s2) { 218 if (new_s2) {
210 var new_s2_id = new_s2.split("_")[0]; 219 var new_s2_id = new_s2.split("_")[0];
211 var new_s2_name = new_s2.split("_")[1]; 220 var new_s2_name = new_s2.split("_")[1];
212 var new_s2_gh = new_s2.split("_")[2]; 221 var new_s2_gh = new_s2.split("_")[2];
  222 + if (new_s2_gh && new_s2_gh.indexOf("-") > 0) { // 修正工号，吧 55- 这种前缀去掉
  223 + new_s2_gh = new_s2_gh.substr(3);
  224 + }
213 225
214 if (old_isfb) { // 使用分班判定 226 if (old_isfb) { // 使用分班判定
215 angular.forEach(scope[ctrlAs].ds, function(obj, index) { 227 angular.forEach(scope[ctrlAs].ds, function(obj, index) {
216 if (index < old_isfb_index) { 228 if (index < old_isfb_index) {
217 obj.s = new_s1_id; 229 obj.s = new_s1_id;
  230 +
218 obj.sGh = new_s1_gh; 231 obj.sGh = new_s1_gh;
219 obj.sName = new_s1_name; 232 obj.sName = new_s1_name;
220 } else { 233 } else {
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saPlaninfoeditTemplate.html
  View file @97da120
@@ -7,10 +7,10 @@ @@ -7,10 +7,10 @@
7 <thead> 7 <thead>
8 <tr role="row" class="heading"> 8 <tr role="row" class="heading">
9 <th style="width: 50px;">序号</th> 9 <th style="width: 50px;">序号</th>
10 - <th style="width: 80px;">发车时间</th> 10 + <th style="width: 60px;">发车时间</th>
11 <th style="width: 70px;">车辆</th> 11 <th style="width: 70px;">车辆</th>
12 - <th style="width: 60px;">驾驶员</th>  
13 - <th style="width: 60px;">售票员</th> 12 + <th style="width: 70px;">驾驶员</th>
  13 + <th style="width: 70px;">售票员</th>
14 <th style="width: 100px;">停车场</th> 14 <th style="width: 100px;">停车场</th>
15 </tr> 15 </tr>
16 </thead> 16 </thead>
@@ -30,14 +30,26 @@ @@ -30,14 +30,26 @@
30 </a> 30 </a>
31 </td> 31 </td>
32 <td> 32 <td>
33 - <a href="#">  
34 - <span ng-bind="info.jName"></span>  
35 - </a> 33 + <div ng-if="info.jName">
  34 + <a href="#">
  35 + <i class="fa fa-bus" aria-hidden="true"></i>
  36 + <span ng-bind="info.jName"></span>
  37 + </a>
  38 + </div>
  39 + <div ng-if="info.jGh">
  40 + ({{info.jGh}})
  41 + </div>
36 </td> 42 </td>
37 <td> 43 <td>
38 - <a href="#">  
39 - <span ng-bind="info.sName"></span>  
40 - </a> 44 + <div ng-if="info.sName">
  45 + <a href="#">
  46 + <i class="fa fa-ticket" aria-hidden="true"></i>
  47 + <span ng-bind="info.sName"></span>
  48 + </a>
  49 + </div>
  50 + <div ng-if="info.sGh">
  51 + ({{info.sGh}})
  52 + </div>
41 </td> 53 </td>
42 <td> 54 <td>
43 <a href="#" ng-if="info.bcType == 'in'"> 55 <a href="#" ng-if="info.bcType == 'in'">
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
  View file @97da120
@@ -4457,11 +4457,17 @@ angular.module(&#39;ScheduleApp&#39;).directive( @@ -4457,11 +4457,17 @@ angular.module(&#39;ScheduleApp&#39;).directive(
4457 var new_j1_id = new_j1.split("_")[0]; 4457 var new_j1_id = new_j1.split("_")[0];
4458 var new_j1_name = new_j1.split("_")[1]; 4458 var new_j1_name = new_j1.split("_")[1];
4459 var new_j1_gh = new_j1.split("_")[2]; 4459 var new_j1_gh = new_j1.split("_")[2];
  4460 + if (new_j1_gh && new_j1_gh.indexOf("-") > 0) {
  4461 + new_j1_gh = new_j1_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
  4462 + }
4460 4463
4461 if (new_j2) { 4464 if (new_j2) {
4462 var new_j2_id = new_j2.split("_")[0]; 4465 var new_j2_id = new_j2.split("_")[0];
4463 var new_j2_name = new_j2.split("_")[1]; 4466 var new_j2_name = new_j2.split("_")[1];
4464 var new_j2_gh = new_j2.split("_")[2]; 4467 var new_j2_gh = new_j2.split("_")[2];
  4468 + if (new_j2_gh && new_j2_gh.indexOf("-") > 0) {
  4469 + new_j2_gh = new_j2_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
  4470 + }
4465 4471
4466 if (old_isfb) { // 使用分班判定 4472 if (old_isfb) { // 使用分班判定
4467 angular.forEach(scope[ctrlAs].ds, function(obj, index) { 4473 angular.forEach(scope[ctrlAs].ds, function(obj, index) {
@@ -4529,16 +4535,23 @@ angular.module(&#39;ScheduleApp&#39;).directive( @@ -4529,16 +4535,23 @@ angular.module(&#39;ScheduleApp&#39;).directive(
4529 var new_s1_id = new_s1.split("_")[0]; 4535 var new_s1_id = new_s1.split("_")[0];
4530 var new_s1_name = new_s1.split("_")[1]; 4536 var new_s1_name = new_s1.split("_")[1];
4531 var new_s1_gh = new_s1.split("_")[2]; 4537 var new_s1_gh = new_s1.split("_")[2];
  4538 + if (new_s1_gh && new_s1_gh.indexOf("-") > 0) { // 修正工号，吧 55- 这种前缀去掉
  4539 + new_s1_gh = new_s1_gh.substr(3);
  4540 + }
4532 4541
4533 if (new_s2) { 4542 if (new_s2) {
4534 var new_s2_id = new_s2.split("_")[0]; 4543 var new_s2_id = new_s2.split("_")[0];
4535 var new_s2_name = new_s2.split("_")[1]; 4544 var new_s2_name = new_s2.split("_")[1];
4536 var new_s2_gh = new_s2.split("_")[2]; 4545 var new_s2_gh = new_s2.split("_")[2];
  4546 + if (new_s2_gh && new_s2_gh.indexOf("-") > 0) { // 修正工号，吧 55- 这种前缀去掉
  4547 + new_s2_gh = new_s2_gh.substr(3);
  4548 + }
4537 4549
4538 if (old_isfb) { // 使用分班判定 4550 if (old_isfb) { // 使用分班判定
4539 angular.forEach(scope[ctrlAs].ds, function(obj, index) { 4551 angular.forEach(scope[ctrlAs].ds, function(obj, index) {
4540 if (index < old_isfb_index) { 4552 if (index < old_isfb_index) {
4541 obj.s = new_s1_id; 4553 obj.s = new_s1_id;
  4554 +
4542 obj.sGh = new_s1_gh; 4555 obj.sGh = new_s1_gh;
4543 obj.sName = new_s1_name; 4556 obj.sName = new_s1_name;
4544 } else { 4557 } else {
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/list.html
  View file @97da120
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
24 <th style="width: 100px;">车辆</th> 24 <th style="width: 100px;">车辆</th>
25 <th style="width: 80px;">出场时间</th> 25 <th style="width: 80px;">出场时间</th>
26 <th style="width: 80px;">进场时间</th> 26 <th style="width: 80px;">进场时间</th>
27 - <th style="width: 130px;">驾驶员</th>  
28 - <th style="width: 130px;">售票员</th> 27 + <th style="width: 150px;">驾驶员</th>
  28 + <th style="width: 150px;">售票员</th>
29 <th>时刻表</th> 29 <th>时刻表</th>
30 <th style="width: 150px;">修改时间</th> 30 <th style="width: 150px;">修改时间</th>
31 <th style="width: 100px;">修改人</th> 31 <th style="width: 100px;">修改人</th>
@@ -115,6 +115,7 @@ @@ -115,6 +115,7 @@
115 <div style="padding-right: 0px;" class="col-md-6"> 115 <div style="padding-right: 0px;" class="col-md-6">
116 <div ng-repeat="jsyname in info.jsyNames"> 116 <div ng-repeat="jsyname in info.jsyNames">
117 <a href="#"> 117 <a href="#">
  118 + <i class="fa fa-bus" aria-hidden="true"></i>
118 {{jsyname}} 119 {{jsyname}}
119 </a> 120 </a>
120 </div> 121 </div>
@@ -133,6 +134,7 @@ @@ -133,6 +134,7 @@
133 <div style="padding-right: 0px;" class="col-md-6"> 134 <div style="padding-right: 0px;" class="col-md-6">
134 <div ng-repeat="spyname in info.spyNames"> 135 <div ng-repeat="spyname in info.spyNames">
135 <a href="#"> 136 <a href="#">
  137 + <i class="fa fa-ticket" aria-hidden="true"></i>
136 {{spyname}} 138 {{spyname}}
137 </a> 139 </a>
138 </div> 140 </div>
src/test/resources/testdata/test6.txt
  View file @97da120
@@ -24,4 +24,8 @@ where a.origingidindex is null; @@ -24,4 +24,8 @@ where a.origingidindex is null;
24 上南二分通勤 24 上南二分通勤
25 25
26 26
27 --Xms128M -Xmx1024M -XX:PermSize=64M -XX:MaxPermSize=128M  
28 \ No newline at end of file 27 \ No newline at end of file
  28 +-Xms128M -Xmx1024M -XX:PermSize=64M -XX:MaxPermSize=128M
  29 +
  30 +1118
  31 +572康桥
  32 +83