调度日报导出子任务修改，获取加油公里时过滤无加注量的路牌

廖磊
1 parent 0699e578
Showing 4 changed files with 21 additions and 23 deletions
src/main/java/com/bsth/entity/oil/Ylb.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/statement/scheduleDaily.html
@@ -366,9 +366,6 @@ public class Ylb {
 	}
  
 	public Double getJylc() {
-//		if(jylc==null){
-//			jylc=0.0;
-//		}
 		return jylc;
 	}
  
@@ -210,10 +210,9 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							if(type.equals("update")){
 								repository.save(t);
 							}else{
-								if(t.getJylc()==null){
+								if(t.getJylc()==null && t.getJzl()>0){
 									t.setJylc(ginfoMap.get(t.getXlbm()+"-"+t.getLp()));
 								}
-								t.setJylc(0.0);
 								addList.add(t);
 							}
  
@@ -855,12 +854,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 						 if(type.equals("add")){
 							 t.setCreatetime(date);
-							 if(t.getJylc()==null){
+							 if(t.getJylc()==null && t.getJzl()>0){
 								 t.setJylc(ginfoMap.get(t.getXlbm()+"-"+t.getLp()));
 							 }
 							 addList.add(t); 
 						 }else{
-							 if(t.getJylc()==null){
+							 if(t.getJylc()==null && t.getJzl()>0){
 								 t.setJylc(ginfoMap.get(t.getXlbm()+"-"+t.getLp()));
 							 }
 							 t.setUpdatetime(date);
@@ -5203,20 +5203,22 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 		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) {
-                	if(dfsj_ - fcsjActural_>1200){
-                		dfsjm=String.valueOf(1440-(dfsj_ - fcsjActural_));
-                	}else{
-                		dfsjk = String.valueOf(dfsj_ - fcsjActural_);
-                	}
-                } else {
-                	if(fcsjActural_ - dfsj_>1200){
-                		dfsjk=  String.valueOf(1440-(fcsjActural_ - dfsj_));
-                	}else{
-                    	dfsjm = String.valueOf(fcsjActural_ - dfsj_);
-                	}
+                if(df.equals("df")){
+	                String[] dfsj_s =schedule.getDfsj().split(":");
+	                Long dfsj_ = Long.parseLong(dfsj_s[0]) * 60 + Long.parseLong(dfsj_s[1]);
+	                if ((dfsj_ - fcsjActural_) > 0) {
+	                	if(dfsj_ - fcsjActural_>1200){
+	                		dfsjm=String.valueOf(1440-(dfsj_ - fcsjActural_));
+	                	}else{
+	                		dfsjk = String.valueOf(dfsj_ - fcsjActural_);
+	                	}
+	                } else {
+	                	if(fcsjActural_ - dfsj_>1200){
+	                		dfsjk=  String.valueOf(1440-(fcsjActural_ - dfsj_));
+	                	}else{
+	                    	dfsjm = String.valueOf(fcsjActural_ - dfsj_);
+	                	}
+	                }
                 }
             }
             if(df.equals("df")){
@@ -467,7 +467,7 @@
 				 divFrom2 = window.document.getElementById('forms_1');
 				divFrom2.style.width=divFrom1.offsetWidth+"px";
 			});
-			$.get('/realSchedule/realScheduleList_zrw',{line:line,date:date,type:"query"},function(result){
+			$.get('/realSchedule/realScheduleList',{line:line,date:date,type:"query"},function(result){
 				getTime(result);
 				var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
 				$('#forms_2 .scheduleDaily_3').html(scheduleDaily_3);
@@ -513,7 +513,7 @@
 			params['xlName'] = xlName;
 			params['type'] = "export";
 			params['state'] = '2';
-			params['genre'] = 'zrw';
+			params['genre'] = 'qc';
 			$get('/realSchedule/scheduleDailyExport', params, function(result){
 				if(date.length == 10)
 					window.open("/downloadFile/download?fileName="+moment(date).format("YYYYMMDD")+"-"+lineName+"-调度日报");