工作汇总，时间筛选改为时间段筛选。

yiming
1 parent 7955776c
Showing 2 changed files with 35 additions and 17 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/forms/statement/jobSummary.html
@@ -1716,10 +1716,11 @@ public class ReportServiceImpl implements ReportService{
 			lblxSet.add(s);
 		}
 		String line=map.get("line").toString();
-		String date=map.get("date").toString();
+		String dateS=map.get("date").toString();
+		String dateE=map.get("date2").toString();
 		map.put("bcType", "normal");
 		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
-		List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
+		List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateStartEndAndLineTjrb(line, dateS,dateE);
 		for (int i = 0; i < sList.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo = sList.get(i);
 			if (!(scheduleRealInfo.getBcType().equals("in")
@@ -1859,10 +1860,11 @@ public class ReportServiceImpl implements ReportService{
 	public List<Map<String, Object>> jobLjqk(Map<String, Object> map) {
 		// TODO Auto-generated method stub
 		String line=map.get("line").toString();
-		String date=map.get("date").toString();
+		String dateS=map.get("date").toString();
+		String dateE=map.get("date2").toString();
 		map.put("bcType", "normal");
 		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
-		List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
+		List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateStartEndAndLineTjrb(line, dateS, dateE);
 		for (int i = 0; i < sList.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo=sList.get(i);
 			if (!(scheduleRealInfo.getBcType().equals("in")
@@ -1935,12 +1937,10 @@ public class ReportServiceImpl implements ReportService{
 		if(map.get("line")!=null){
 			line=map.get("line").toString();
 		}
-		String date="";
-		if(map.get("date")!=null){
-			date=map.get("date").toString();
-		}
+		String dateS=map.get("date").toString();
+		String dateE=map.get("date2").toString();
-		List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(line, date);
+		List<ScheduleRealInfo> sList=scheduleRealInfoRepository.scheduleByDateStartEndAndLineTjrb(line, dateS, dateE);
 		  List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
 	        for (int i = 0; i < sList.size(); i++) {
 	            ScheduleRealInfo s=sList.get(i);
@@ -40,10 +40,18 @@
                         <span class="item-label" style="width: 80px; margin-left: 33px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
                     </div>
-                    <div style="display: inline-block;margin-left: 24px;">
+                    <!--<div style="display: inline-block;margin-left: 24px;">
                         <span class="item-label" style="width: 80px;">&nbsp;时间: </span>
                         <input class="form-control" type="text" id="date" style="width: 180px;"/>
-                    </div>
+                    </div>-->
+					<div style="display: inline-block;margin-left: 15px;">
+						<span class="item-label" style="width: 80px;">开始时间: </span>
+						<input class="form-control" type="text" id="date" style="width: 180px;"/>
+					</div>
+					<div style="display: inline-block;margin-left: 15px;">
+						<span class="item-label" style="width: 80px;">结束时间: </span>
+						<input class="form-control" type="text" id="date2" 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="导出"/>
@@ -112,7 +120,7 @@
 						  </tbody>
 						<tr><td colspan="10">&nbsp;</td></tr>
 						<tr>
-							<td colspan="10">当日汇总</td>
+							<td colspan="10">汇总</td>
 						</tr>
 						<tr>
 							<td colspan="2">内容</td>
@@ -142,6 +150,11 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+
+		$("#date2").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
 		var xlList;
 		var obj = [];
@@ -246,16 +259,21 @@
 			var line=$("#line").val();
 			var lineName=$(".select2-selection__rendered").html();
 			var date =$("#date").val();
+			var date2 =$("#date2").val();
 			$("#export").removeAttr("disabled");
 			if(line=="" || line==null){
 				  layer.msg('请选择线路.');
-			}else if(date==""||date==null){
+			}else if(date==""||date==null||date2==""||date2==null){
 				  layer.msg('请选择日期.');
 			}else{
 				$("#xlid").html(lineName);
-				$("#dateid").html(date);
+				if(date==date2){
+					$("#dateid").html(date);
+				}else {
+					$("#dateid").html(date+"~"+date2);
+				}
 				var i = layer.load(2);
-				$get('/report/jobFwqk',{line:line,date:date},function(result){
+				$get('/report/jobFwqk',{line:line,date:date,date2:date2},function(result){
 					console.log(result);
 					 var list_lbqk = template('list_lbqk',{list:result});
 						// 把渲染好的模版html文本追加到表格中
@@ -268,14 +286,14 @@
 				})
-				$get('/report/jobLjqk',{line:line,date:date},function(result){
+				$get('/report/jobLjqk',{line:line,date:date,date2:date2},function(result){
 					 var list_ljqk = template('list_ljqk',{list:result});
 						// 把渲染好的模版html文本追加到表格中
 						$('#forms .list_ljqk').html(list_ljqk);
 						layer.close(i);
 				})
-				$get('/report/jobHzxx',{line:line,date:date},function(result){
+				$get('/report/jobHzxx',{line:line,date:date,date2:date2},function(result){
 					//临加
 					$("#ljbcs").html(result.ljbc);
 					$("#ljgls").html(result.ljgl)