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

潘钊
2 parents 08a85e23 4b3a81e1
Showing 11 changed files with 124 additions and 20 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/resources/static/pages/forms/statement/timeAndSpeed.html
src/main/resources/static/pages/mforms/turnoutrates/turnoutrate.html
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saPlanInfoEdit.js
src/main/resources/static/pages/scheduleApp/module/common/dts2/scheduleplan/saPlaninfoeditTemplate.html
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/report/ext/list.html
src/test/resources/testdata/test6.txt
@@ -783,6 +783,7 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Map<String, Object>> turnoutrate(Map<String, Object> map) {
+		List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
 		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
@@ -804,11 +805,14 @@ public class FormsServiceImpl implements FormsService {
 		String line = map.get("line").toString();
 		String startDate = map.get("startDate").toString();
 		String endDate = map.get("endDate").toString();
+		if(line.trim().length() == 0){
+			line = "";
+		}
 		rq = rq2 + "-" + rq3;
 		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, startDate, endDate, company, subCompany);
-		List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line);
+		List<Line> lineList = lineRepository.findLineBygsBm(company, subCompany, line.length()==0?"%"+line+"%":line);
 		String sql = "select * from bsth_c_s_sp_info where gs_bm = '"+company+"' and fgs_bm = '"+subCompany+"' "
 				+ "and DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+startDate+"' and '"+endDate+"' ";
@@ -842,10 +846,10 @@ public class FormsServiceImpl implements FormsService {
 				m.put("xlBm", line1.getLineCode());
 				m.put("qz", line1.getWarrantCar()!=null?line1.getWarrantCar():0);
 				m.put("sm", "");
-				resList.add(m);
+				tempList.add(m);
 			}
 		}
-		for(Map<String, Object> m : resList){
+		for(Map<String, Object> m : tempList){
 			String xlBm = m.get("xlBm").toString();
 			List<ScheduleRealInfo> reals = new ArrayList<ScheduleRealInfo>();
 			List<SchedulePlanInfo> plans = new ArrayList<SchedulePlanInfo>();
@@ -895,6 +899,9 @@ public class FormsServiceImpl implements FormsService {
 			}else{
 				m.put("zxl", "--");
 			}
+			if(jhbc != 0 && sjbc != 0){
+				resList.add(m);
+			}
 		}
 		Map<String, Object> tempMap = new HashMap<String, Object>();
 		int jhcc = 0;
@@ -902,7 +909,7 @@ public class FormsServiceImpl implements FormsService {
 		int jhbc = 0;
 		int sjbc = 0;
 		int qz = 0;
-		for(Map<String, Object> m : resList){
+		for(Map<String, Object> m : tempList){
 			jhcc += Integer.valueOf(m.get("jhcc").toString());
 			sjcc += Integer.valueOf(m.get("sjcc").toString());
 			jhbc += Integer.valueOf(m.get("jhbc").toString());
@@ -910,7 +917,7 @@ public class FormsServiceImpl implements FormsService {
 			qz += Integer.valueOf(m.get("qz").toString());
 		}
 		tempMap.put("rq", "分类汇总");
-		tempMap.put("line", "共" + resList.size() + "条线路");
+		tempMap.put("line", "共" + tempList.size() + "条线路");
 		tempMap.put("jhcc", jhcc);
 		tempMap.put("sjcc", sjcc);
 		tempMap.put("jhbc", jhbc);
@@ -113,6 +113,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setSpId(rs.getLong("sp_id"));
 					schedule.setSflj(rs.getBoolean("sflj"));
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
 					String[] split1 = schedule.getFcsj().split(":");
 					String[] split3 = schedule.getZdsj().split(":");
 					long fcsj = Long.valueOf(split1[0]) * 60 + Long.valueOf(split1[1]);
@@ -669,6 +675,13 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setjName(rs.getString("j_name"));
 					schedule.setStatus(rs.getInt("status"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
 					if(schedule.getDfsj() != null){
 						String[] split0 = schedule.getDfsj().split(":");
 						long dfsj = Long.valueOf(split0[0]) * 60 + Long.valueOf(split0[1]);
@@ -1840,6 +1853,13 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setjName(rs.getString("j_name"));
 					schedule.setUpdateDate(rs.getDate("update_date"));
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
+					
 					return schedule;
 				}
 			});
@@ -81,6 +81,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setsName(rs.getString("s_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
 					if(schedule.getFcsj() != null && schedule.getZdsj() != null){
 						String[] split1 = schedule.getFcsj().split(":");
 						String[] split2 = schedule.getZdsj().split(":");
@@ -548,6 +554,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
 					if(schedule.getFcsj() != null && schedule.getZdsj() != null){
 						String[] split1 = schedule.getFcsj().split(":");
 						String[] split2 = schedule.getZdsj().split(":");
@@ -831,6 +843,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
 					if(schedule.getFcsj() != null && schedule.getZdsj() != null){
 						String[] split1 = schedule.getFcsj().split(":");
 						String[] split2 = schedule.getZdsj().split(":");
@@ -210,6 +210,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                             Map<String, Object> p2 = new HashMap<>();
                             p2.put("xl.id_eq", lineid);
                             p2.put("lpName_eq", bcell_con.trim());
+                            p2.put("isCancel_eq", false);
                             List<GuideboardInfo> guideboardInfoList = (List<GuideboardInfo>) guideboardInfoService.list(p2);
                             if (CollectionUtils.isEmpty(guideboardInfoList)) {
                                 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
             }
         } catch (Exception exp) {
+            exp.printStackTrace();
             throw new ScheduleException(exp.getMessage());
         }
@@ -354,6 +354,7 @@
 		 					_w_table_rowspan("#works", 4);
 		 				}
 		 			});
+					$("html,body").animate({scrollTop:$("#works").offset().top},700);
 				});
 			});		
 		}
@@ -37,15 +37,15 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="" method="post">
-				 <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_turn">
+				 <div style="display: inline-block; margin-left: 20px;" id="gsdmDiv_turn">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdmTurn" style="width: 140px;"></select>
 					</div> 
-					<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_turn">
+					<div style="display: inline-block; margin-left: 20px;" id="fgsdmDiv_turn">
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdmTurn" style="width: 140px;"></select>
 					</div>  
-				<div style="display: inline-block;">
+				<div style="display: inline-block; margin-left: 15px;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 120px;"></select>
                     </div>
@@ -124,6 +124,17 @@
 			locale : 'zh-cn'
 		});
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = d.getMonth() + 1;
+		var day = d.getDate();
+		if(month < 10)
+			month = "0" + month;
+		if(day < 10)
+			day = "0" + day;
+		$("#startDate").val(year + "-" + month + "-" + day);
+		$("#endDate").val(year + "-" + month + "-" + day);
+		
 		var fage=false;
 		var xlList;
 		var obj = [];
@@ -167,6 +178,7 @@
 		$("#fgsdmTurn").on("change",initXl);
 		function initXl(){
 			var data=[];
+			data.push({id:" ", text:"全部线路"});
 			if(fage){
 				$("#line").select2("destroy").html('');
 			}
@@ -133,11 +133,17 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     var new_j1_id = new_j1.split("_")[0];
                                     var new_j1_name = new_j1.split("_")[1];
                                     var new_j1_gh = new_j1.split("_")[2];
+                                    if (new_j1_gh && new_j1_gh.indexOf("-") > 0) {
+                                        new_j1_gh = new_j1_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
+                                    }
                                     if (new_j2) {
                                         var new_j2_id = new_j2.split("_")[0];
                                         var new_j2_name = new_j2.split("_")[1];
                                         var new_j2_gh = new_j2.split("_")[2];
+                                        if (new_j2_gh && new_j2_gh.indexOf("-") > 0) {
+                                            new_j2_gh = new_j2_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
+                                        }
                                         if (old_isfb) { // 使用分班判定
                                             angular.forEach(scope[ctrlAs].ds, function(obj, index) {
@@ -205,16 +211,23 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     var new_s1_id = new_s1.split("_")[0];
                                     var new_s1_name = new_s1.split("_")[1];
                                     var new_s1_gh = new_s1.split("_")[2];
+                                    if (new_s1_gh && new_s1_gh.indexOf("-") > 0) { // 修正工号，吧 55- 这种前缀去掉
+                                        new_s1_gh = new_s1_gh.substr(3);
+                                    }
                                     if (new_s2) {
                                         var new_s2_id = new_s2.split("_")[0];
                                         var new_s2_name = new_s2.split("_")[1];
                                         var new_s2_gh = new_s2.split("_")[2];
+                                        if (new_s2_gh && new_s2_gh.indexOf("-") > 0) { // 修正工号，吧 55- 这种前缀去掉
+                                            new_s2_gh = new_s2_gh.substr(3);
+                                        }
                                         if (old_isfb) { // 使用分班判定
                                             angular.forEach(scope[ctrlAs].ds, function(obj, index) {
                                                 if (index < old_isfb_index) {
                                                     obj.s = new_s1_id;
+
                                                     obj.sGh = new_s1_gh;
                                                     obj.sName = new_s1_name;
                                                 } else {
@@ -7,10 +7,10 @@
         <thead>
         <tr role="row" class="heading">
             <th style="width: 50px;">序号</th>
-            <th style="width: 80px;">发车时间</th>
+            <th style="width: 60px;">发车时间</th>
             <th style="width: 70px;">车辆</th>
-            <th style="width: 60px;">驾驶员</th>
-            <th style="width: 60px;">售票员</th>
+            <th style="width: 70px;">驾驶员</th>
+            <th style="width: 70px;">售票员</th>
             <th style="width: 100px;">停车场</th>
         </tr>
         </thead>
@@ -30,14 +30,26 @@
                 </a>
             </td>
             <td>
-                <a href="#">
-                    <span ng-bind="info.jName"></span>
-                </a>
+                <div ng-if="info.jName">
+                    <a href="#">
+                        <i class="fa fa-bus" aria-hidden="true"></i>
+                        <span ng-bind="info.jName"></span>
+                    </a>
+                </div>
+                <div ng-if="info.jGh">
+                    ({{info.jGh}})
+                </div>
             </td>
             <td>
-                <a href="#">
-                    <span ng-bind="info.sName"></span>
-                </a>
+                <div ng-if="info.sName">
+                    <a href="#">
+                        <i class="fa fa-ticket" aria-hidden="true"></i>
+                        <span ng-bind="info.sName"></span>
+                    </a>
+                </div>
+                <div ng-if="info.sGh">
+                    ({{info.sGh}})
+                </div>
             </td>
             <td>
                 <a href="#" ng-if="info.bcType == 'in'">
@@ -4457,11 +4457,17 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     var new_j1_id = new_j1.split("_")[0];
                                     var new_j1_name = new_j1.split("_")[1];
                                     var new_j1_gh = new_j1.split("_")[2];
+                                    if (new_j1_gh && new_j1_gh.indexOf("-") > 0) {
+                                        new_j1_gh = new_j1_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
+                                    }
                                     if (new_j2) {
                                         var new_j2_id = new_j2.split("_")[0];
                                         var new_j2_name = new_j2.split("_")[1];
                                         var new_j2_gh = new_j2.split("_")[2];
+                                        if (new_j2_gh && new_j2_gh.indexOf("-") > 0) {
+                                            new_j2_gh = new_j2_gh.substr(3); // 修正工号，把 55- 这种前缀去掉
+                                        }
                                         if (old_isfb) { // 使用分班判定
                                             angular.forEach(scope[ctrlAs].ds, function(obj, index) {
@@ -4529,16 +4535,23 @@ angular.module(&#39;ScheduleApp&#39;).directive(
                                     var new_s1_id = new_s1.split("_")[0];
                                     var new_s1_name = new_s1.split("_")[1];
                                     var new_s1_gh = new_s1.split("_")[2];
+                                    if (new_s1_gh && new_s1_gh.indexOf("-") > 0) { // 修正工号，吧 55- 这种前缀去掉
+                                        new_s1_gh = new_s1_gh.substr(3);
+                                    }
                                     if (new_s2) {
                                         var new_s2_id = new_s2.split("_")[0];
                                         var new_s2_name = new_s2.split("_")[1];
                                         var new_s2_gh = new_s2.split("_")[2];
+                                        if (new_s2_gh && new_s2_gh.indexOf("-") > 0) { // 修正工号，吧 55- 这种前缀去掉
+                                            new_s2_gh = new_s2_gh.substr(3);
+                                        }
                                         if (old_isfb) { // 使用分班判定
                                             angular.forEach(scope[ctrlAs].ds, function(obj, index) {
                                                 if (index < old_isfb_index) {
                                                     obj.s = new_s1_id;
+
                                                     obj.sGh = new_s1_gh;
                                                     obj.sName = new_s1_name;
                                                 } else {
@@ -24,8 +24,8 @@
                 <th style="width: 100px;">车辆</th>
                 <th style="width: 80px;">出场时间</th>
                 <th style="width: 80px;">进场时间</th>
-                <th style="width: 130px;">驾驶员</th>
-                <th style="width: 130px;">售票员</th>
+                <th style="width: 150px;">驾驶员</th>
+                <th style="width: 150px;">售票员</th>
                 <th>时刻表</th>
                 <th style="width: 150px;">修改时间</th>
                 <th style="width: 100px;">修改人</th>
@@ -115,6 +115,7 @@
                         <div style="padding-right: 0px;" class="col-md-6">
                             <div ng-repeat="jsyname in info.jsyNames">
                                 <a href="#">
+                                    <i class="fa fa-bus" aria-hidden="true"></i>
                                     {{jsyname}}
                                 </a>
                             </div>
@@ -133,6 +134,7 @@
                         <div style="padding-right: 0px;" class="col-md-6">
                             <div ng-repeat="spyname in info.spyNames">
                                 <a href="#">
+                                    <i class="fa fa-ticket" aria-hidden="true"></i>
                                     {{spyname}}
                                 </a>
                             </div>
@@ -24,4 +24,8 @@ where a.origingidindex is null;
 上南二分通勤
--Xms128M -Xmx1024M -XX:PermSize=64M -XX:MaxPermSize=128M
 \ No newline at end of file
+-Xms128M -Xmx1024M -XX:PermSize=64M -XX:MaxPermSize=128M
+
+1118
+572康桥
+83