0112

廖磊
1 parent 51aae339
Showing 5 changed files with 78 additions and 15 deletions
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.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/waybillQp.html
@@ -87,6 +87,10 @@ public class ScheduleRealInfo {
 	private Integer bcs;
 	/** 计划里程 */
 	private Double jhlc;
+	
+	/** 实际里程 */
+	@Transient
+	private String sjlc;
 	/** 班次历时 */
 	private Integer bcsj;
@@ -447,6 +451,14 @@ public class ScheduleRealInfo {
 	public void setJhlc(Double jhlc) {
 		this.jhlc = jhlc;
 	}
+	
+	public String getSjlc() {
+		return sjlc;
+	}
+
+	public void setSjlc(String sjlc) {
+		this.sjlc = sjlc;
+	}
 	public Integer getBcsj() {
 		return bcsj;
@@ -82,13 +82,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 			+ " and clZbh like %?5% order by s.fcsj")
 	List<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code);
-	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,fcsjActual")
+	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2 and s.lpName = ?3 and s.scheduleDate = str_to_date(?4,'%Y-%m-%d') and s.xlBm=?5 order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
-	@Query(value="select s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsjActual")
+	@Query(value="select s from ScheduleRealInfo s where  s.clZbh = ?1  and s.scheduleDate = str_to_date(?2,'%Y-%m-%d') and xlBm =?3 order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill2(String clZbh,String date,String line);
-	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by realExecDate,fcsjActual")
+	@Query(value="select s from ScheduleRealInfo s where s.jGh = ?1 and s.clZbh = ?2 and s.scheduleDate = str_to_date(?3,'%Y-%m-%d') order by realExecDate,fcsj")
 	List<ScheduleRealInfo> queryListWaybill3(String jName,String clZbh,String date);
 	@Query(value="select s from ScheduleRealInfo s where s.jName = ?1 and s.clZbh = ?2  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between str_to_date(?3,'%Y-%m-%d') and str_to_date(?4,'%Y-%m-%d')  order by bcs")
@@ -110,7 +110,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	void deleteByLineCodeAndDate(String xlBm, String schDate);
 	//去掉了 xlBm is not null 
-	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by s.xlBm")
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 order by (s.lpName+1), s.realExecDate,s.fcsj")
 	List<ScheduleRealInfo> scheduleByDateAndLine(String line,String date);
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
@@ -1866,7 +1866,45 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				}
 			}
 		}*/
-        return scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+    	List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
+    	String lpName="lpName";
+    	String zdsj="";
+    	String zdsjActual="";
+    	String zdsj1="";
+    	String zdsjActual1="";
+    	List<ScheduleRealInfo> listInfo=scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
+    	for (int i = 0; i < listInfo.size(); i++) {
+    		ScheduleRealInfo t=listInfo.get(i);
+    		if(!lpName.equals(t.getLpName())){
+    			zdsjActual=t.getZdsjActual();
+    			zdsj=t.getZdsj();
+    			t.setZdsjActual("");
+    			t.setZdsj("");
+    		}else{
+    			zdsj1=t.getZdsj();
+    			zdsjActual1=t.getZdsjActual();
+    			t.setZdsjActual(zdsjActual);
+    			t.setZdsj(zdsj);
+    			zdsj=zdsj1;
+    			zdsjActual=zdsjActual1;
+    		}
+    		/*if(i<listInfo.size()-1){
+    			if(s.getLpName().equals(listInfo.get(i+1).getLpName())){
+    				zdsj=s.getZdsj();
+    	    		zdsjActual=s.getZdsjActual();
+    			}else{
+    				zdsj="";
+    		    	zdsjActual="";
+    			}
+    		}else{
+    			zdsj=s.getZdsj();
+	    		zdsjActual=s.getZdsjActual();
+    		}*/
+    		
+    		lpName=t.getLpName();
+    		list.add(t);
+		}
+        return list;
     }
@@ -2576,6 +2614,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	@Override
 	public List<ScheduleRealInfo> queryListWaybillQp(String clZbh, String date, String line) {
 		// TODO Auto-generated method stub
+		DecimalFormat format = new DecimalFormat("0.00");
 		List <ScheduleRealInfo> list=null;
 		list= scheduleRealInfoRepository.queryListWaybill2(clZbh,date,line);
 	List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
@@ -2583,6 +2622,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		ScheduleRealInfo s=list.get(i);
 		if(!(s.getBcType().equals("in")||s.getBcType().equals("out"))){
 			String remarks="";
+			Double sjlc=0.0;
 			if(s.getRemarks()!=null){
 				remarks +=s.getRemarks();
 			}
@@ -2595,8 +2635,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 						remarks += c.getRemarks();
 					}
+						if(!c.isDestroy()){
+							sjlc += c.getMileage()==null?0:c.getMileage();
+						}
+					
+				}
+			}else{
+				if(s.getStatus() != -1){
+					sjlc =s.getJhlc();
 				}
 			}
+			s.setSjlc(format.format(sjlc));
 			s.setRemarks(remarks);
 			newList.add(s);
 		}
@@ -109,7 +109,7 @@
 						<tr>
 							<td colspan="40">&nbsp;</td>
 						</tr>
-						<tr>
+						<!-- <tr>
 							<td colspan="40">合计</td>
 						</tr>
 						<tr>
@@ -156,7 +156,7 @@
 						</tr>
 						<tr>
 							<td colspan="40">&nbsp;</td>
-						</tr>
+						</tr> -->
 						<tr>
 							<td colspan="2">班序</td>
 							<td colspan="2">车号</td>
@@ -245,17 +245,17 @@
 </script>
 <script type="text/html" id="ludan_1">
 	  <tr>
-          <td colspan="15">行车路单</td>
+          <td colspan="16">行车路单</td>
       </tr>
       <tr>
-          <td colspan="15">路别:{{map.xlName}}    车号:{{map.clZbh}}   出场时间:{{map.fcsjActual}}   到达站名:{{map.zdzName}}     日期:{{map.scheduleDate}}</td>
+          <td colspan="16">路别:{{map.xlName}}    车号:{{map.clZbh}}   出场时间:{{map.fcsjActual}}   到达站名:{{map.zdzName}}     日期:{{map.scheduleDate}}</td>
       </tr>
       <tr>
           <td colspan="2">出场存油 &nbsp;升</td>
           <td colspan="3">加注油量 &nbsp;升</td>
           <td colspan="2">进场存油 &nbsp;升</td>
           <td colspan="4">加注机油 &nbsp;升</td>
-          <td colspan="4">本日耗油 &nbsp;升</td>
+          <td colspan="5">本日耗油 &nbsp;升</td>
       </tr>
       <tr>
           <td colspan="2">调度员</td>
@@ -266,7 +266,7 @@
           <td colspan="2">夜班(职号)</td>
           <td colspan="2" title={{map.wdp}}>{{map.wdpT}}</td>
           <td colspan="2">其他</td>
-          <td colspan="2">&nbsp;</td>
+          <td colspan="3">&nbsp;</td>
       </tr>
       <tr>
           <td rowspan="2">车次</td>
@@ -277,6 +277,7 @@
           <td colspan="4">时间</td>
           <td colspan="2">误点</td>
           <td rowspan="2" width="66px">里程(公里)计划</td>
+ 		  <td rowspan="2" width="66px">里程(公里)实际</td>
           <td rowspan="2">备注</td>
       </tr>
       <tr>
@@ -309,7 +310,8 @@
 			<td>{{obj.fast}}</td>
 			<td>{{obj.slow}}</td>
 			<td>{{obj.jhlc}}</td>
-			<td title={{obj.remarks}}>
+			<td>{{obj.sjlc}}</td>
+			<td title="{{obj.remarks}}">
              	{{if  obj.remarks !=""}}
 					<div class="caption">
                     <i class="fa fa-search"></i> 
@@ -336,7 +338,7 @@
 		<td colspan="2">空驶公里</td>
 		<td colspan="1">{{map.ksgl}}</td>
 		<td colspan="3">营运公里(实际)</td>
-		<td colspan="1">{{map.yyglsj}}</td>
+		<td colspan="2">{{map.yyglsj}}</td>
 	</tr>
 	<tr>
@@ -349,7 +351,7 @@
 		<td colspan="2">损失班次</td>
 		<td colspan="1">{{map.ssbc}}</td>
 		<td colspan="3">运送公里</td>
-		<td colspan="1">{{map.ysgl}}</td>
+		<td colspan="2">{{map.ysgl}}</td>
 	</tr>
 	<tr>
@@ -361,6 +363,6 @@
 		<td>{{map.ljbc}}</td>
 		<td colspan="3"></td>
-		<td colspan="4"></td>
+		<td colspan="5"></td>
 	</tr>
 </script>