统计日报跨零点快慢时间修正

路单数据根据线路编码转名称修正

统计日报跨零点快慢时间修正
路单数据根据线路编码转名称修正
廖磊
1 parent 78833caa
Showing 5 changed files with 108 additions and 23 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/scheduleDaily_df.html
src/main/resources/static/pages/mforms/singledatas/singledata.html
@@ -974,7 +974,7 @@ public class FormsServiceImpl implements FormsService {
 						s.setsName("");
 						s.setgS(BasicData.businessFgsCodeNameMap.get(sin_.getgS()+"_"+gsdm));
 						s.setxL(line);
-						s.setXlmc(BasicData.lineCode2NameMap.get(line));
+						s.setXlmc(BasicData.lineCodeAllNameMap.get(line));
 						s.setJzl(sin_.getJzl());
 						s.setHyl(sin_.getHyl());
 						s.setUnyyyl(sin_.getUnyyyl());
@@ -5113,9 +5113,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 Long zdsj_ = Long.parseLong(zdsj_s[0]) * 60 + Long.parseLong(zdsj_s[1]);
                 Long zdsjActual_ = Long.parseLong(zdsjActual_s[0]) * 60 + Long.parseLong(zdsjActual_s[1]);
                 if ((zdsj_ - zdsjActual_) > 0) {
-                    zdsjk = String.valueOf(zdsj_ - zdsjActual_);
+                	if(zdsj_ - zdsjActual_>1200){
+                		zdsjm=String.valueOf(1440-(zdsj_-zdsjActual_));
+                	}else{
+                        zdsjk = String.valueOf(zdsj_ - zdsjActual_);
+                	}
                 } else {
-                    zdsjm = String.valueOf(zdsjActual_ - zdsj_);
+                	if(zdsjActual_ - zdsj_>1200){
+                		zdsjk =String.valueOf(1440-(zdsjActual_ - zdsj_));
+                	}else{
+                		zdsjm = String.valueOf(zdsjActual_ - zdsj_);
+                	}
                 }
             }
             tempMap.put("zdsjk" + x, zdsjk);
@@ -5142,18 +5150,34 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 Long fcsj_ = Long.parseLong(fcsj_s[0]) * 60 + Long.parseLong(fcsj_s[1]);
                 Long fcsjActural_ = Long.parseLong(fcsjActural_s[0]) * 60 + Long.parseLong(fcsjActural_s[1]);
                 if ((fcsj_ - fcsjActural_) > 0) {
-                    fcsjk = String.valueOf(fcsj_ - fcsjActural_);
+                	if(fcsj_ - fcsjActural_>1200){
+                		fcsjm=String.valueOf(1440-(fcsj_ - fcsjActural_));
+                	}else{
+                		fcsjk = String.valueOf(fcsj_ - fcsjActural_);
+                	}
                 } else {
-                    fcsjm = String.valueOf(fcsjActural_ - fcsj_);
+                	if(fcsjActural_ - fcsj_>1200){
+                		fcsjk =String.valueOf(1440-(fcsjActural_ - fcsj_));
+                	}
+                	else{
+                		fcsjm = String.valueOf(fcsjActural_ - fcsj_);
+                	}
                 }
                 String[] dfsj_s =schedule.getDfsj().split(":");
                 Long dfsj_ = Long.parseLong(dfsj_s[0]) * 60 + Long.parseLong(dfsj_s[1]);
                 if ((dfsj_ - fcsjActural_) > 0) {
-                	dfsjk = String.valueOf(dfsj_ - fcsjActural_);
+                	if(dfsj_ - fcsjActural_>1200){
+                		dfsjm=String.valueOf(1440-(dfsj_ - fcsjActural_));
+                	}else{
+                		dfsjk = String.valueOf(dfsj_ - fcsjActural_);
+                	}
                 } else {
-                	dfsjm = String.valueOf(fcsjActural_ - dfsj_);
+                	if(fcsjActural_ - dfsj_>1200){
+                		dfsjk=  String.valueOf(1440-(fcsjActural_ - dfsj_));
+                	}else{
+                    	dfsjm = String.valueOf(fcsjActural_ - dfsj_);
+                	}
                 }
-
             }
             if(df.equals("df")){
             	 tempMap.put("dfsj"+x,schedule.getDfsj());
@@ -398,21 +398,42 @@
                     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]));
+                    	if((zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]))>1200){
+                            obj["fast"] = 1440-((zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1])));
+
+                    	}else{
+                            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((zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]))>1200){
+                        	obj["slow"] =1440-((zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])));
+                        }else{
+                        	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]));
+                    	if((fcsjActual[0]*60+Number(fcsjActual[1])) - (fcsj[0]*60+Number(fcsj[1]))>1200){
+                            obj["fast0"] = 1440-((fcsjActual[0]*60+Number(fcsjActual[1])) - (fcsj[0]*60+Number(fcsj[1])));
+                    	}else{
+                            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]));
+                    	if( (fcsj[0]*60+Number(fcsj[1])) - (fcsjActual[0]*60+Number(fcsjActual[1]))>1200){
+                            obj["slow0"] = 1440-((fcsj[0]*60+Number(fcsj[1])) - (fcsjActual[0]*60+Number(fcsjActual[1])));;
+                    	}else{
+                            obj["fast0"] = (fcsj[0]*60+Number(fcsj[1])) - (fcsjActual[0]*60+Number(fcsjActual[1]));
+
+                    	}
                     }
                 }
             }); 
@@ -404,13 +404,24 @@
 		function getTime(list){
             $.each(list, function(i, obj) {
                 if(obj.zdsj != null && obj.zdsjActual != null ){
-                    var zdsjActual = (obj.zdsjActual).split(":");
+                	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]));
+                    	if((zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]))>1200){
+                            obj["fast"] = 1440-((zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1])));
+
+                    	}else{
+                            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((zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]))>1200){
+                        	obj["slow"] =1440-((zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])));
+                        }else{
+                        	obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
+
+                        }
                     }
                 }
@@ -418,18 +429,36 @@
                     var fcsjActual = (obj.fcsjActual).split(":");
                     var fcsj = (obj.fcsj).split(":");
                     var dfsj= (obj.dfsj).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]));
+                    	if((fcsjActual[0]*60+Number(fcsjActual[1])) - (fcsj[0]*60+Number(fcsj[1]))>1200){
+                            obj["fast0"] = 1440-((fcsjActual[0]*60+Number(fcsjActual[1])) - (fcsj[0]*60+Number(fcsj[1])));
+                    	}else{
+                            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]));
+                    	if( (fcsj[0]*60+Number(fcsj[1])) - (fcsjActual[0]*60+Number(fcsjActual[1]))>1200){
+                            obj["slow0"] = 1440-((fcsj[0]*60+Number(fcsj[1])) - (fcsjActual[0]*60+Number(fcsjActual[1])));;
+                    	}else{
+                            obj["fast0"] = (fcsj[0]*60+Number(fcsj[1])) - (fcsjActual[0]*60+Number(fcsjActual[1]));
+
+                    	}
                     }
                     if(fcsjActual[0]*60+Number(fcsjActual[1]) > dfsj[0]*60+Number(dfsj[1])){
-                        obj["slow1"] = (fcsjActual[0]*60+Number(fcsjActual[1])) - (dfsj[0]*60+Number(dfsj[1]));
+                    	if((fcsjActual[0]*60+Number(fcsjActual[1])) - (dfsj[0]*60+Number(dfsj[1]))>1200){
+                    		obj["fast1"]=1440-((fcsjActual[0]*60+Number(fcsjActual[1])) - (dfsj[0]*60+Number(dfsj[1])));
+                    	}else{
+                            obj["slow1"] = (fcsjActual[0]*60+Number(fcsjActual[1])) - (dfsj[0]*60+Number(dfsj[1]));
+                    	}
                     }
                     else if(fcsjActual[0]*60+Number(fcsjActual[1]) < dfsj[0]*60+Number(dfsj[1])){
-                        obj["fast1"] = (dfsj[0]*60+Number(dfsj[1])) - (fcsjActual[0]*60+Number(fcsjActual[1]));
+                        if((dfsj[0]*60+Number(dfsj[1])) - (fcsjActual[0]*60+Number(fcsjActual[1]))>1200){
+                        	 obj["slow1"]=1440-((dfsj[0]*60+Number(dfsj[1])) - (fcsjActual[0]*60+Number(fcsjActual[1])));
+                        }else{
+                        	obj["fast1"] = (dfsj[0]*60+Number(dfsj[1])) - (fcsjActual[0]*60+Number(fcsjActual[1]));
+                        }
                     }
                 }
             }); 
@@ -41,15 +41,15 @@
                         <select class="form-control" name="line" id="line" style="width: 140px;"></select>
                     </div>
 					<div style="margin-top: 10px"></div>
-					<div style="display: inline-block; margin-left: 5px">
+					<!-- <div style="display: inline-block; margin-left: 5px">
 						<span class="item-label" style="width: 80px;">是否营运: </span>
 						<select class="form-control" name="sfyy" id="sfyy" style="width: 140px;">
 							<option value="0">全部线路</option>
 							<option value="1" selected="selected">营运线路</option>
 							<option value="2">非营运线路</option>
 						</select>
-					</div>
-                    <div style="display: inline-block;margin-left: 24px;">
+					</div> -->
+                    <div style="display: inline-block;margin-left: 33px;">
                         <span class="item-label" style="width: 140px;">时间: </span>
                         <input class="form-control" type="text" id="startDate" style="width: 140px;"/>
                     </div>
@@ -111,6 +111,16 @@
 			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);
+		
 		var fage=false;
 		var xlList;
 		var obj = [];
@@ -138,7 +148,8 @@
 		$("#gsdmSing").on("change",updateCompany);
 		function updateCompany(){
 			var company = $('#gsdmSing').val();
-			var options = '<option value="">全部分公司</option>';
+// 			var options = '<option value="">全部分公司</option>';
+			var options ='';
 			for(var i = 0; i < obj.length; i++){
 				if(obj[i].companyCode == company){
 					var children = obj[i].children;