报表更改

廖磊
1 parent 0510497d
Showing 7 changed files with 167 additions and 34 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.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/waybill.html
src/main/resources/static/pages/forms/statement/waybillQp.html
@@ -262,6 +262,12 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 			@RequestParam String date,@RequestParam String state) {
 		return scheduleRealInfoService.queryUserInfo(line, date,state);
 	}
+	
+	@RequestMapping(value = "/queryUserInfoPx")
+	public List<ScheduleRealInfo> queryUserInfoPx(@RequestParam String line,
+			@RequestParam String date,@RequestParam String state,@RequestParam String type) {
+		return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
+	}
 	@RequestMapping(value = "/exportWaybill")
 	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
@@ -30,6 +30,12 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@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.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 ?3 desc")
+	List<ScheduleRealInfo> queryUserInfoPxDesc(String line,String date,String state);
+	
+	@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 ?3 asc")
+	List<ScheduleRealInfo> queryUserInfoPxAsc(String line,String date,String state);
 	@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 ")
 	List<ScheduleRealInfo> queryUserInfo3(String line,String date);
@@ -62,6 +62,8 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<ScheduleRealInfo> queryUserInfo(String line,String date,String state);
+	List<ScheduleRealInfo> queryUserInfoPx(String line,String date,String state,String type);
+	
 	List<ScheduleRealInfo> exportWaybill(String jName,String clZbh,String lpName,String date,String line);
 	List<ScheduleRealInfo> exportWaybillQp(String clZbh,String date,String line);
@@ -56,9 +56,13 @@ import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import java.io.*;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -69,7 +73,8 @@ import java.util.zip.ZipOutputStream;
 @Service
 public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInfo, Long>
         implements ScheduleRealInfoService {
-
+	@Autowired
+	JdbcTemplate jdbcTemplate;
     @Autowired
     ScheduleRealInfoRepository scheduleRealInfoRepository;
@@ -448,6 +453,33 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
     }
+    
+    @Override
+    public List<ScheduleRealInfo> queryUserInfoPx(String line, String date, String state,String type) {
+//    	List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
+    	String sqlPlan="select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh,"
+    			+ " s.lp_Name as lpName,s.j_Name as jName,s.s_Gh as sGh,s.s_Name as sName"
+    			+ " from bsth_c_s_sp_info_real s "
+    			+ " where s.xl_Bm = '"+line+"' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='"+date+"' "
+    			+ " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name,s.s_Gh,"
+    			+ " s.s_Name order by "+state+" "+type;
+    	List<ScheduleRealInfo> list= jdbcTemplate.query(sqlPlan, 
+				new RowMapper<ScheduleRealInfo>(){
+			 @Override
+			 public ScheduleRealInfo  mapRow(ResultSet rs, int rowNum) throws SQLException {
+				 ScheduleRealInfo t=new ScheduleRealInfo();
+				 t.setId(rs.getLong("id"));
+				 t.setjGh(rs.getString("jGh"));
+				 t.setClZbh(rs.getString("clZbh"));
+				 t.setLpName(rs.getString("lpName"));
+				 t.setjName(rs.getString("jName"));
+				 t.setsGh(rs.getString("sGh"));
+				 t.setsName(rs.getString("sName"));
+				 return t;
+			 }
+		});
+    		return list;
+    }
     /**
      *
@@ -1360,39 +1392,50 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (s.getRemarks() != null) {
                 remarks += s.getRemarks();
             }
-            
+           
             Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
-            if (childTaskPlans.isEmpty()) {
-            	if(s.getStatus()==-1){
-            		if(remarks.indexOf("烂班")>-1){
-            			remarks +="(烂班)";
-            		}
-            		 s.setRemarks(remarks);
-            	}
-            	
-            }else{
+            if (!childTaskPlans.isEmpty()) {
             	s.setFcsjActual("");
             	s.setZdsjActual("");
             }
+            
+            if(s.isDestroy()){
+            	s.setFcsjActual("");
+            	s.setZdsjActual("");
+            	s.setJhlc(0.0);
+        		remarks +="(烂班)";
+        		 s.setRemarks(remarks);
+            }
             listSchedule.add(s);
-            if(!childTaskPlans.isEmpty()){
-            	 Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
-                 while (it.hasNext()) {
-                     ChildTaskPlan c = it.next();
-                     if(!c.isDestroy()){
-                    	 ScheduleRealInfo t=new ScheduleRealInfo();
-                    	 t.setFcsjActual(c.getStartDate());
-                    	 t.setZdsjActual(c.getEndDate());
-                    	 t.setQdzName(c.getStartStationName());
-                    	 t.setZdzName(c.getEndStationName());
-                    	 t.setJhlc( Double.parseDouble(String.valueOf(c.getMileage())));
-                    	 t.setRemarks(c.getRemarks());
-                    	 t.setAdjustExps("子");
-                    	 listSchedule.add(t);
-                     }
-                 }
+            //计算营运里程，空驶里程
+            if (!childTaskPlans.isEmpty()) {
+	        	 String sqlPc="select * from bsth_c_s_child_task where schedule="+s.getId() +"  order by start_date ";
+	        	 List<ScheduleRealInfo> lists= jdbcTemplate.query(sqlPc,
+	    				 new RowMapper<ScheduleRealInfo>(){
+	    			 @Override
+	    			 public ScheduleRealInfo  mapRow(ResultSet rs, int rowNum) throws SQLException {
+	    				 ScheduleRealInfo t=new ScheduleRealInfo();
+	    				 if(rs.getInt("destroy")==0){
+	    					 t.setFcsjActual(rs.getString("start_date"));
+	                    	 t.setZdsjActual(rs.getString("end_date"));
+	                    	 t.setJhlc(rs.getDouble("mileage"));
+	    				 }else{
+	    					 t.setFcsjActual("");
+	                    	 t.setZdsjActual("");
+	                    	 t.setJhlc(0.0);
+	    				 }
+	                	 t.setQdzName(rs.getString("start_station_name"));
+	                	 t.setZdzName(rs.getString("end_station_name"));
+	                	 t.setRemarks(rs.getString("remarks"));
+	                	 t.setAdjustExps("子");
+	                	 return t;
+	    			 }
+	     			});
+		        	 for (int j = 0; j < lists.size(); j++) {
+		        		 ScheduleRealInfo t=lists.get(j);
+		        		 listSchedule.add(t);
+					}
             }
-           
         }
         return listSchedule;
@@ -43,7 +43,7 @@
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px;height: 400px">
+				<div class="table-container" id="ddrbBody" style="margin-top: 10px;overflow:auto;min-width: 906px">
 					<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>
@@ -254,6 +254,7 @@
 <script>
 	$(function(){
+		
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
@@ -264,7 +265,7 @@
 		});
-
+		$("#ddrbBody").height($(window).height()-300);
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -50,9 +50,9 @@
 							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
 								<thead>
 									<tr class="hidden">
-										<th>人员</th>
-										<th>自编号</th>
-										<th>路牌</th>
+										<th class="rypx" style="cursor:pointer ">人员</th>
+										<th class="zbhpx" style="cursor:pointer ">自编号</th>
+										<th class="lppx" style="cursor:pointer ">路牌</th>
 									</tr>
 								</thead>
 								<tbody>
@@ -95,7 +95,16 @@
 			format : 'YYYY-MM-DD',
 			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;
+		$("#date").val(year + "-" + month + "-" + day);
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -159,6 +168,57 @@
 				$('#info tbody').html(tbodyHtml);
 			});
 		});
+		var type="desc";
+		$(".rypx").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"j_Gh",type:type},function(result){
+				if(type=="desc"){
+					type ="asc";
+				}else{
+					type ="desc";
+				}
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info_px',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		})
+		
+		$(".zbhpx").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"clZbh",type:type},function(result){
+				if(type=="desc"){
+					type ="asc";
+				}else{
+					type ="desc";
+				}
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info_px',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		})
+		
+		$(".lppx").on("click",function(){
+			line = $("#line").val();
+			date = $("#date").val();
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"(lpName+1)",type:type},function(result){
+				if(type=="desc"){
+					type ="asc";
+				}else{
+					type ="desc";
+				}
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info_px',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
+		})
 		var params = new Array();
 		var jName = '';
@@ -248,6 +308,20 @@
 		</tr>
 	{{/if}}
 </script>
+<script type="text/html" id="list_info_px">
+	{{each list as obj i}}
+		<tr>
+			<td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
+			<td width="32%">{{obj.clZbh}}</td>
+			<td width="23%">{{obj.lpName}}<input type="hidden" id="{{obj.clZbh}}" value="{{obj.id}}"></td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
 <script type="text/html" id="ludan_1">
 	  <tr>
           <td colspan="14">行车路单</td>
@@ -188,6 +188,7 @@
 				$('#forms .ludan_2').html(ludan_2);
 			});
 			$post('/realSchedule/findKMBCQp',{clZbh:params[0],date:date,line:line},function(result){
+				console.log(result);
 			    var ludan_3 = template('ludan_3',{map:result});
 			    $('#forms .ludan_3').html(ludan_3);
 			});