青浦更新

廖磊
1 parent 43664fe8
Showing 5 changed files with 52 additions and 11 deletions
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/resources/application-dev.properties
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/forms/statement/waybillQp.html
@@ -28,7 +28,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.id,s.jGh,s.clZbh,s.lpName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo(String line,String date);
-	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
+	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName,s.sGh,s.sName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName,s.sGh,s.sName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo2(String line,String date);
 	@Query(value="select min(s.id), s.clZbh from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.clZbh ")
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= false
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201/:3306/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://localhost:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= 123456
+spring.datasource.password= root
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -44,7 +44,7 @@
 			</div>
 			<div class="portlet-body">
 				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px;height: 400px">
-					<label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
+					<label>日期：<span id="rqxs"></span>&nbsp;&nbsp;&nbsp;&nbsp;早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
@@ -281,11 +281,37 @@
 		var xlName = $("#select2-line-container").html();
 		var date = $("#date").val();
+		function getTime(list){
+            $.each(list, function(i, obj) {
+                if(obj.zdsj != null && obj.zdsjActual != null ){
+                    var zdsjActual = (obj.zdsjActual).split(":");
+                    var zdsj = (obj.zdsj).split(":");
+                    if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
+                        obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
+                    }
+                    else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
+                        obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
+                    }
+                }
+                	
+                if(obj.fcsj != null && obj.fcsjActual != null ){
+                    var fcsjActual = (obj.fcsjActual).split(":");
+                    var fcsj = (obj.fcsj).split(":");
+                    if(fcsjActual[0]*60+Number(fcsjActual[1]) > fcsj[0]*60+Number(fcsj[1])){
+                        obj["slow0"] = (fcsjActual[0]*60+Number(fcsjActual[1])) - (fcsj[0]*60+Number(fcsj[1]));
+                    }
+                    else if(fcsjActual[0]*60+Number(fcsjActual[1]) < fcsj[0]*60+Number(fcsj[1])){
+                        obj["fast0"] = (fcsj[0]*60+Number(fcsj[1])) - (fcsjActual[0]*60+Number(fcsjActual[1]));
+                    }
+                }
+            }); 
+		}
 		//查询
 		$("#query").on('click',function(){
 			line = $("#line").val();
 			xlName = $("#select2-line-container").html();
 			date = $("#date").val();
+			$("#rqxs").html(date);
 			if(date == null || date.length == 0){
 				layer.msg("请选择时间");
 				return;
@@ -297,10 +323,12 @@
 				$('#forms .scheduleDaily_1').html(scheduleDaily_1);
 			});
 			$.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2,type:"query"},function(result){
+				console.log(result);
 				var scheduleDaily_2 = template('scheduleDaily_2',{list:result});
 				$('#forms .scheduleDaily_2').html(scheduleDaily_2);
 			});
 			$.get('/realSchedule/realScheduleList',{line:line,date:date,type:"query"},function(result){
+				getTime(result);
 				var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
 				$('#forms .scheduleDaily_3').html(scheduleDaily_3);
 			});
@@ -405,7 +433,12 @@
 				<td colspan="2">{{obj[3]}}</td>
 				<td colspan="2">{{obj[2]}}</td>
 				<td>{{obj[1]}}/{{obj[4]}}</td>
-				<td>&nbsp;</td>
+				<td>{{if obj[5] !=null}}
+				{{obj[5]}}/
+				{{obj[6]}}
+
+					{{/if}}
+				</td>
 				<td>&nbsp;</td>
 				<td>&nbsp;</td>
 		{{if (i+1)%5 == 0}}
@@ -427,12 +460,12 @@
 				<td colspan="2">{{obj.qdzName}}</td>
 				<td>{{obj.zdsj}}</td>
 				<td>{{obj.zdsjActual}}</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
+				<td>{{obj.fast}}</td>
+				<td>{{obj.slow}}</td>
 				<td>{{obj.fcsj}}</td>
 				<td>{{obj.fcsjActual}}</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
+				<td>{{obj.fast0}}</td>
+				<td>{{obj.slow0}}</td>
 				<td colspan="2">{{obj.remarks}}</td>
 		{{if (i+1)%3 == 0}}
 				<td>&nbsp;</td>
@@ -313,7 +313,10 @@
 		<tr>
 			<td>{{obj.adjustExps}}</td>
 			<td>{{obj.jGh}}{{obj.jName}}</td>
-			<td>{{obj.sGh}}{{obj.sName}}</td>
+			<td>{{if obj.sGh !=null}}
+				{{obj.sGh}}{{obj.sName}}
+				{{/if}}
+			</td>
 			<td>&nbsp;</td>
 			<td>{{obj.qdzName}}</td>
 			<td>{{obj.zdzName}}</td>
@@ -308,7 +308,12 @@
 			<td>{{i+1}}</td>
 			<td>{{obj.lpName}}</td>
 			<td>{{obj.jGh}}{{obj.jName}}</td>
-			<td>{{obj.sGh}}{{obj.sName}}</td>
+			<td>
+				{{if obj.sGh !=null}}
+					{{obj.sGh}}
+					{{obj.sName}}
+				{{/if}}
+			</td>
 			<td>&nbsp;</td>
 			<td>{{obj.qdzName}}</td>
 			<td>{{obj.zdzName}}</td>