潘钊 / bsth_control · Commits

Commit 007e569f21b8271e3c70113d08fc07499ac58ed2

Authored by 潘钊
2 parents 08a85e23 4b3a81e1
build: skipped

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

Inline Side-by-side
Showing 11 changed files with 124 additions and 20 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @007e569
... ... @@ -783,6 +783,7 @@ public class FormsServiceImpl implements FormsService {
783 783 @Override
784 784 public List<Map<String, Object>> turnoutrate(Map<String, Object> map) {
785 785  
  786 + List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
786 787 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
787 788 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
788 789 SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
... ... @@ -804,11 +805,14 @@ public class FormsServiceImpl implements FormsService {
804 805 String line = map.get("line").toString();
805 806 String startDate = map.get("startDate").toString();
806 807 String endDate = map.get("endDate").toString();
  808 + if(line.trim().length() == 0){
  809 + line = "";
  810 + }
807 811  
808 812 rq = rq2 + "-" + rq3;
809 813  
810 814 List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, startDate, endDate, company, subCompany);
811   - List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line);
  815 + List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line.length()==0?"%"+line+"%":line);
812 816  
813 817 String sql = "select * from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
814 818 + "and DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+startDate+"' and '"+endDate+"' ";
... ... @@ -842,10 +846,10 @@ public class FormsServiceImpl implements FormsService {
842 846 m.put("xlBm", line1.getLineCode());
843 847 m.put("qz", line1.getWarrantCar()!=null?line1.getWarrantCar():0);
844 848 m.put("sm", "");
845   - resList.add(m);
  849 + tempList.add(m);
846 850 }
847 851 }
848   - for(Map<String, Object> m : resList){
  852 + for(Map<String, Object> m : tempList){
849 853 String xlBm = m.get("xlBm").toString();
850 854 List<ScheduleRealInfo> reals = new ArrayList<ScheduleRealInfo>();
851 855 List<SchedulePlanInfo> plans = new ArrayList<SchedulePlanInfo>();
... ... @@ -895,6 +899,9 @@ public class FormsServiceImpl implements FormsService {
895 899 }else{
896 900 m.put("zxl", "--");
897 901 }
  902 + if(jhbc != 0 && sjbc != 0){
  903 + resList.add(m);
  904 + }
898 905 }
899 906 Map<String, Object> tempMap = new HashMap<String, Object>();
900 907 int jhcc = 0;
... ... @@ -902,7 +909,7 @@ public class FormsServiceImpl implements FormsService {
902 909 int jhbc = 0;
903 910 int sjbc = 0;
904 911 int qz = 0;
905   - for(Map<String, Object> m : resList){
  912 + for(Map<String, Object> m : tempList){
906 913 jhcc += Integer.valueOf(m.get("jhcc").toString());
907 914 sjcc += Integer.valueOf(m.get("sjcc").toString());
908 915 jhbc += Integer.valueOf(m.get("jhbc").toString());
... ... @@ -910,7 +917,7 @@ public class FormsServiceImpl implements FormsService {
910 917 qz += Integer.valueOf(m.get("qz").toString());
911 918 }
912 919 tempMap.put("rq", "分类汇总");
913   - tempMap.put("line", "共" + resList.size() + "条线路");
  920 + tempMap.put("line", "共" + tempList.size() + "条线路");
914 921 tempMap.put("jhcc", jhcc);
915 922 tempMap.put("sjcc", sjcc);
916 923 tempMap.put("jhbc", jhbc);
... ...
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @007e569
... ... @@ -113,6 +113,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
113 113 schedule.setSpId(rs.getLong("sp_id"));
114 114 schedule.setSflj(rs.getBoolean("sflj"));
115 115  
  116 + if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
  117 + schedule.setFcsjActual(null);
  118 + }
  119 + if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
  120 + schedule.setZdsjActual(null);
  121 + }
116 122 String[] split1 = schedule.getFcsj().split(":");
117 123 String[] split3 = schedule.getZdsj().split(":");
118 124 long fcsj = Long.valueOf(split1[0]) * 60 + Long.valueOf(split1[1]);
... ... @@ -669,6 +675,13 @@ public class BusIntervalServiceImpl implements BusIntervalService {
669 675 schedule.setjName(rs.getString("j_name"));
670 676 schedule.setStatus(rs.getInt("status"));
671 677 schedule.setSpId(rs.getLong("sp_id"));
  678 +
  679 + if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
  680 + schedule.setFcsjActual(null);
  681 + }
  682 + if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
  683 + schedule.setZdsjActual(null);
  684 + }
672 685 if(schedule.getDfsj() != null){
673 686 String[] split0 = schedule.getDfsj().split(":");
674 687 long dfsj = Long.valueOf(split0[0]) * 60 + Long.valueOf(split0[1]);
... ... @@ -1840,6 +1853,13 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1840 1853 schedule.setjName(rs.getString("j_name"));
1841 1854 schedule.setUpdateDate(rs.getDate("update_date"));
1842 1855  
  1856 + if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
  1857 + schedule.setFcsjActual(null);
  1858 + }
  1859 + if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
  1860 + schedule.setZdsjActual(null);
  1861 + }
  1862 +
1843 1863 return schedule;
1844 1864 }
1845 1865 });
... ...
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
  View file @007e569
... ... @@ -81,6 +81,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
81 81 schedule.setsName(rs.getString("s_name"));
82 82 schedule.setSpId(rs.getLong("sp_id"));
83 83  
  84 + if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
  85 + schedule.setFcsjActual(null);
  86 + }
  87 + if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
  88 + schedule.setZdsjActual(null);
  89 + }
84 90 if(schedule.getFcsj() != null && schedule.getZdsj() != null){
85 91 String[] split1 = schedule.getFcsj().split(":");
86 92 String[] split2 = schedule.getZdsj().split(":");
... ... @@ -548,6 +554,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
548 554 schedule.setQdzName(rs.getString("qdz_name"));
549 555 schedule.setSpId(rs.getLong("sp_id"));
550 556  
  557 + if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
  558 + schedule.setFcsjActual(null);
  559 + }
  560 + if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
  561 + schedule.setZdsjActual(null);
  562 + }
551 563 if(schedule.getFcsj() != null && schedule.getZdsj() != null){
552 564 String[] split1 = schedule.getFcsj().split(":");
553 565 String[] split2 = schedule.getZdsj().split(":");
... ... @@ -831,6 +843,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
831 843 schedule.setQdzName(rs.getString("qdz_name"));
832 844 schedule.setSpId(rs.getLong("sp_id"));
833 845  
  846 + if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
  847 + schedule.setFcsjActual(null);
  848 + }
  849 + if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
  850 + schedule.setZdsjActual(null);
  851 + }
834 852 if(schedule.getFcsj() != null && schedule.getZdsj() != null){
835 853 String[] split1 = schedule.getFcsj().split(":");
836 854 String[] split2 = schedule.getZdsj().split(":");
... ...
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
  View file @007e569
... ... @@ -210,6 +210,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
210 210 Map<String, Object> p2 = new HashMap<>();
211 211 p2.put("xl.id_eq", lineid);
212 212 p2.put("lpName_eq", bcell_con.trim());
  213 + p2.put("isCancel_eq", false);
213 214 List<GuideboardInfo> guideboardInfoList = (List<GuideboardInfo>) guideboardInfoService.list(p2);
214 215 if (CollectionUtils.isEmpty(guideboardInfoList)) {
215 216 throw new Exception(String.format("第%d行，第1列的路牌在%s中不存在", i + 1, linename));
... ... @@ -247,6 +248,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
247 248  
248 249 }
249 250 } catch (Exception exp) {
  251 + exp.printStackTrace();
250 252 throw new ScheduleException(exp.getMessage());
251 253 }
252 254  
... ...
src/main/resources/static/pages/forms/statement/timeAndSpeed.html
  View file @007e569
... ... @@ -354,6 +354,7 @@
354 354 _w_table_rowspan("#works", 4);
355 355 }
356 356 });
  357 + $("html,body").animate({scrollTop:$("#works").offset().top},700);
357 358 });
358 359 });
359 360 }
... ...
src/main/resources/static/pages/mforms/turnoutrates/turnoutrate.html
  View file @007e569
... ... @@ -37,15 +37,15 @@
37 37 <div class="portlet light porttlet-fit bordered">
38 38 <div class="portlet-title">
39 39 <form class="form-inline" action="" method="post">
40   - <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_turn">
  40 + <div style="display: inline-block; margin-left: 20px;" id="gsdmDiv_turn">
41 41 <span class="item-label" style="width: 80px;">公司: </span>
42 42 <select class="form-control" name="company" id="gsdmTurn" style="width: 140px;"></select>
43 43 </div>
44   - <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_turn">
  44 + <div style="display: inline-block; margin-left: 20px;" id="fgsdmDiv_turn">
45 45 <span class="item-label" style="width: 80px;">分公司: </span>
46 46 <select class="form-control" name="subCompany" id="fgsdmTurn" style="width: 140px;"></select>
47 47 </div>
48   - <div style="display: inline-block;">
  48 + <div style="display: inline-block; margin-left: 15px;">
49 49 <span class="item-label" style="width: 80px;">线路: </span>
50 50 <select class="form-control" name="line" id="line" style="width: 120px;"></select>
51 51 </div>
... ... @@ -124,6 +124,17 @@
124 124 locale : 'zh-cn'
125 125 });
126 126  
  127 + var d = new Date();
  128 + var year = d.getFullYear();
  129 + var month = d.getMonth() + 1;
  130 + var day = d.getDate();
  131 + if(month < 10)
  132 + month = "0" + month;
  133 + if(day < 10)
  134 + day = "0" + day;
  135 + $("#startDate").val(year + "-" + month + "-" + day);
  136 + $("#endDate").val(year + "-" + month + "-" + day);
  137 +
127 138 var fage=false;
128 139 var xlList;
129 140 var obj = [];
... ... @@ -167,6 +178,7 @@
167 178 $("#fgsdmTurn").on("change",initXl);
168 179 function initXl(){
169 180 var data=[];
  181 + data.push({id:" ", text:"全部线路"});
170 182 if(fage){
171 183 $("#line").select2("destroy").html('');
172 184 }
... ...
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saPlanInfoEdit.js
  View file @007e569
... ... @@ -133,11 +133,17 @@ angular.module(&#39;ScheduleApp&#39;).directive(
133 133 var new_j1_id = new_j1.split("_")[0];
134 134 var new_j1_name = new_j1.split("_")[1];
135 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 140 if (new_j2) {
138 141 var new_j2_id = new_j2.split("_")[0];
139 142 var new_j2_name = new_j2.split("_")[1];
140 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 148 if (old_isfb) { // 使用分班判定
143 149 angular.forEach(scope[ctrlAs].ds, function(obj, index) {
... ... @@ -205,16 +211,23 @@ angular.module(&#39;ScheduleApp&#39;).directive(
205 211 var new_s1_id = new_s1.split("_")[0];
206 212 var new_s1_name = new_s1.split("_")[1];
207 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 218 if (new_s2) {
210 219 var new_s2_id = new_s2.split("_")[0];
211 220 var new_s2_name = new_s2.split("_")[1];
212 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 226 if (old_isfb) { // 使用分班判定
215 227 angular.forEach(scope[ctrlAs].ds, function(obj, index) {
216 228 if (index < old_isfb_index) {
217 229 obj.s = new_s1_id;
  230 +
218 231 obj.sGh = new_s1_gh;
219 232 obj.sName = new_s1_name;
220 233 } else {
... ...
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saPlaninfoeditTemplate.html
  View file @007e569
... ... @@ -7,10 +7,10 @@
7 7 <thead>
8 8 <tr role="row" class="heading">
9 9 <th style="width: 50px;">序号</th>
10   - <th style="width: 80px;">发车时间</th>
  10 + <th style="width: 60px;">发车时间</th>
11 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 14 <th style="width: 100px;">停车场</th>
15 15 </tr>
16 16 </thead>
... ... @@ -30,14 +30,26 @@
30 30 </a>
31 31 </td>
32 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 42 </td>
37 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 53 </td>
42 54 <td>
43 55 <a href="#" ng-if="info.bcType == 'in'">
... ...
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
  View file @007e569
... ... @@ -4457,11 +4457,17 @@ angular.module(&#39;ScheduleApp&#39;).directive(
4457 4457 var new_j1_id = new_j1.split("_")[0];
4458 4458 var new_j1_name = new_j1.split("_")[1];
4459 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 4464 if (new_j2) {
4462 4465 var new_j2_id = new_j2.split("_")[0];
4463 4466 var new_j2_name = new_j2.split("_")[1];
4464 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 4472 if (old_isfb) { // 使用分班判定
4467 4473 angular.forEach(scope[ctrlAs].ds, function(obj, index) {
... ... @@ -4529,16 +4535,23 @@ angular.module(&#39;ScheduleApp&#39;).directive(
4529 4535 var new_s1_id = new_s1.split("_")[0];
4530 4536 var new_s1_name = new_s1.split("_")[1];
4531 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 4542 if (new_s2) {
4534 4543 var new_s2_id = new_s2.split("_")[0];
4535 4544 var new_s2_name = new_s2.split("_")[1];
4536 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 4550 if (old_isfb) { // 使用分班判定
4539 4551 angular.forEach(scope[ctrlAs].ds, function(obj, index) {
4540 4552 if (index < old_isfb_index) {
4541 4553 obj.s = new_s1_id;
  4554 +
4542 4555 obj.sGh = new_s1_gh;
4543 4556 obj.sName = new_s1_name;
4544 4557 } else {
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/list.html
  View file @007e569
... ... @@ -24,8 +24,8 @@
24 24 <th style="width: 100px;">车辆</th>
25 25 <th style="width: 80px;">出场时间</th>
26 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 29 <th>时刻表</th>
30 30 <th style="width: 150px;">修改时间</th>
31 31 <th style="width: 100px;">修改人</th>
... ... @@ -115,6 +115,7 @@
115 115 <div style="padding-right: 0px;" class="col-md-6">
116 116 <div ng-repeat="jsyname in info.jsyNames">
117 117 <a href="#">
  118 + <i class="fa fa-bus" aria-hidden="true"></i>
118 119 {{jsyname}}
119 120 </a>
120 121 </div>
... ... @@ -133,6 +134,7 @@
133 134 <div style="padding-right: 0px;" class="col-md-6">
134 135 <div ng-repeat="spyname in info.spyNames">
135 136 <a href="#">
  137 + <i class="fa fa-ticket" aria-hidden="true"></i>
136 138 {{spyname}}
137 139 </a>
138 140 </div>
... ...
src/test/resources/testdata/test6.txt
  View file @007e569
... ... @@ -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 27 \ No newline at end of file
  28 +-Xms128M -Xmx1024M -XX:PermSize=64M -XX:MaxPermSize=128M
  29 +
  30 +1118
  31 +572康桥
  32 +83
... ...