纯电量报表添加按人、按车查询项

yiming
1 parent c72c8e25
Showing 3 changed files with 35 additions and 16 deletions
src/main/java/com/bsth/repository/RefuelRepository.java
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
src/main/resources/static/pages/forms/statement/refuelDc.html
@@ -34,12 +34,12 @@ public interface RefuelRepository extends BaseRepository&lt;Refuel, Long&gt; {
 	List<ScheduleRealInfo> scheduleByDate(String date, String clZbh, String jGh);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr = ?1 and s.clZbh like ?2 and s.xlBm = ?3 order by s.clZbh asc")
-	List<ScheduleRealInfo> scheduleByDateAndLine(String date, String clZbh, String xlBm);
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr = ?1 and s.clZbh like ?2 and s.xlBm = ?3 and s.jGh like ?4  order by s.clZbh asc")
+	List<ScheduleRealInfo> scheduleByDateAndLine(String date, String clZbh, String xlBm, String jGh);
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr = ?1 and s.clZbh like ?2 order by s.xlBm asc, s.clZbh asc")
-	List<ScheduleRealInfo> scheduleByDateAndCar(String date, String clZbh);
+	@Query(value="select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr = ?1 and s.clZbh like ?2 and s.jGh like ?3 order by s.xlBm asc, s.clZbh asc")
+	List<ScheduleRealInfo> scheduleByDateAndCar(String date, String clZbh, String jGh);
 	@Transactional
     @Modifying
@@ -394,7 +394,10 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		// TODO Auto-generated method stub
 		DecimalFormat df = new DecimalFormat("0.##");
-		String date = "", car = "%%", xlbm = "";
+		String date = "", car = "%%", xlbm = "", driver = "%%";
+		if(map.get("driver") != null){
+			driver = "%" + map.get("driver").toString() + "%";
+		}
 		if(map.get("date") != null){
 			date = map.get("date").toString();
 		}
@@ -420,10 +423,10 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		if(xlbm.length() > 0){
 			String[] split = xlbm.split(",");
 			for(String s : split){
-				scheList.addAll(repository.scheduleByDateAndLine(date, car, s));
+				scheList.addAll(repository.scheduleByDateAndLine(date, car, s,driver));
 			}
 		} else {
-			scheList = repository.scheduleByDateAndCar(date, car);
+			scheList = repository.scheduleByDateAndCar(date, car,null);
 		}
 		List<Cars> findCarsBySfdc = repository.findCarsBySfdc(false);
@@ -777,7 +780,10 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		// TODO Auto-generated method stub
 		DecimalFormat df = new DecimalFormat("0.##");
-		String date = "", car = "%%", xlbm = "";
+		String date = "", car = "%%", xlbm = "", driver = "%%";
+		if(map.get("driver") != null){
+			driver = "%" + map.get("driver").toString() + "%";
+		}
 		if(map.get("date") != null){
 			date = map.get("date").toString();
 		}
@@ -799,10 +805,10 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		if(xlbm.length() > 0){
 			String[] split = xlbm.split(",");
 			for(String s : split){
-				scheList.addAll(repository.scheduleByDateAndLine(date, car, s));
+				scheList.addAll(repository.scheduleByDateAndLine(date, car, s,driver));
 			}
 		} else {
-			scheList = repository.scheduleByDateAndCar(date, car);
+			scheList = repository.scheduleByDateAndCar(date, car,driver);
 		}
 		List<Cars> findCarsBySfdc = repository.findCarsBySfdc(true);
@@ -1059,7 +1065,10 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		// TODO Auto-generated method stub
 		DecimalFormat df = new DecimalFormat("0.##");
-		String date = "", car = "%%", xlbm = "";
+		String date = "", car = "%%", xlbm = "", driver = "%%";
+		if(map.get("driver") != null){
+			driver = "%" + map.get("driver").toString() + "%";
+		}
 		if(map.get("date") != null){
 			date = map.get("date").toString();
 		}
@@ -1081,10 +1090,10 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements 
 		if(xlbm.length() > 0){
 			String[] split = xlbm.split(",");
 			for(String s : split){
-				scheList.addAll(repository.scheduleByDateAndLine(date, car, s));
+				scheList.addAll(repository.scheduleByDateAndLine(date, car, s, driver));
 			}
 		} else {
-			scheList = repository.scheduleByDateAndCar(date, car);
+			scheList = repository.scheduleByDateAndCar(date, car,null);
 		}
 		List<Cars> findCarsByHydrogen = repository.findCarsByHydrogen(true);
@@ -38,6 +38,14 @@
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;" multiple="multiple"></select>
                     </div>
+					<div style="display: inline-block;margin-left: 6px;">
+						<span class="item-label" style="width: 80px;">&nbsp;车号: </span>
+						<input class="form-control" type="text" id="car" style="width: 180px;"/>
+					</div>
+					<div style="display: inline-block;margin-left: 6px;">
+						<span class="item-label" style="width: 80px;">&nbsp;驾驶员: </span>
+						<input class="form-control" type="text" id="driver" style="width: 180px;"/>
+					</div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="筛选"/>
 						<input class="btn btn-default" type="button" id="export" value="导出"/>
@@ -170,7 +178,7 @@
 		}
-	var line = "", date = "", car = "";
+	var line = "", date = "", car = "", driver = "";
 	$("#query").on("click",function(){
 		if($("#date").val() == null || $("#date").val().trim().length == 0){
 			layer.msg("请选择日期");
@@ -187,9 +195,10 @@
 			return;
 		}
 		date = $("#date").val();
-		car = $("#code").val();
+		car = $("#car").val();
+		driver = $("#driver").val();
 		var i = layer.load(2);
-		$get('/refuel/queryDc',{line:line,date:date,car:car,type:'query'},function(result){
+		$get('/refuel/queryDc',{line:line,date:date,car:car,driver:driver,type:'query'},function(result){
 			// 把数据填充到模版中
 			var tbodyHtml = template('refuel_dc',{list:result});
 			// 把渲染好的模版html文本追加到表格中
@@ -205,6 +214,7 @@
 			params['line'] = line;
 			params['date'] = date;
 			params['car'] = car;
+			params['driver'] = driver;
 			$get('/refuel/exportQueryDc', params, function(result){
 				layer.close(i);
 				window.open("/downloadFile/download?fileName="