到离站跨天查询处理

廖磊
1 parent 8dfecfae
Showing 4 changed files with 9 additions and 6 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/electricity/list/list.html
src/main/resources/static/pages/oil/list_ph.html
src/main/resources/static/pages/report/inoutstation.html
@@ -93,8 +93,10 @@ public class ReportServiceImpl implements ReportService{
 			String sbbb=BasicData.deviceId2NbbmMap.inverse().get(clzbh);
 			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
-			Long date1=simpleDateFormat.parse(date+" "+sjfc+":00").getTime();
-			Long date2=simpleDateFormat.parse(date+" "+sjdd+":00").getTime();
+//			Long date1=simpleDateFormat.parse(date+" "+sjfc+":00").getTime();
+//			Long date2=simpleDateFormat.parse(date+" "+sjdd+":00").getTime();
+			Long date1=simpleDateFormat.parse(sjfc+":00").getTime();
+			Long date2=simpleDateFormat.parse(sjdd+":00").getTime();
 			Date dates=simpleDateFormat.parse(date+" 00:00:00");
 			List<ArrivalInfo> lists=load(line,sbbb,date1,date2,dates,date);
@@ -588,12 +588,13 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         function jsyUpdate(){
         	var params=getParamsList();
+			var id = $(this).data('id');
         	$get('/ylb/checkDate',params,function(status){
         		if(status=='2'){
            		 layer.msg('只能操作三天内数据.');
            		}else{
-					var id = $(this).data('id');
 		    		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#dl_oil_list').val();
+		    		console.log(id+"修改驾驶员:"+jsy);
 		    		$get('/dlb/updateJsy',{id:id,jsy:jsy}, function(result){
 						layer.msg('修改成功.');
 		                page = 0;
@@ -764,10 +764,10 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         function jsyUpdate(){
         	var params=getParamsList();
         	$get('/ylb/checkDate',params,function(status){
+				var id = $(this).data('id');
 	            if(status=='2'){
 	               	layer.msg('只能操作三天内数据.');
 	            }else{
-					var id = $(this).data('id');
 		    		var jsy=$('.in_carpark_jsy[data-id='+id+']', '#ll_oil_list').val();
 		    		$get('/ylb/updateJsy',{id:id,jsy:jsy}, function(result){
 						layer.msg('修改成功.');
@@ -557,8 +557,8 @@
 							整点
 						{{/if}}
 						)
-						<span class="in_carpark_fcsj" data-id="{{i+1}}" style="display:none">{{obj.fcsjActual}}</span>
-						<span class="in_carpark_zdsj" data-id="{{i+1}}" style="display:none">{{obj.zdsjActual}}</span>
+						<span class="in_carpark_fcsj" data-id="{{i+1}}" style="display:none">{{obj.realExecDate}} {{obj.fcsjActual}}</span>
+						<span class="in_carpark_zdsj" data-id="{{i+1}}" style="display:none">{{obj.realExecDate}} {{obj.zdsjActual}}</span>
 					</a>
 				{{/if}}
 			</td>