修正报表添加时间区间查询

廖磊
1 parent 69d4f740
Showing 6 changed files with 27 additions and 16 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.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/mould/correctForm.xls
src/main/resources/static/pages/forms/statement/correctForm.html
src/main/resources/static/pages/oil/add.html
@@ -319,8 +319,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@RequestMapping(value = "/correctForm")
 	public List<SchEditInfoDto> correctForm(@RequestParam String line, @RequestParam String date,
+											@RequestParam String endDate,
 											 @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
-		return scheduleRealInfoService.correctForm(line, date,  lpName, code, type);
+		return scheduleRealInfoService.correctForm(line, date, endDate, lpName, code, type);
 	}
 	/**
 	 * @Title queryListWaybill
@@ -105,7 +105,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,Object>> accountPx(String line,String date,String code,String xlName, String px);
-	List<SchEditInfoDto> correctForm(String line,String date,String lpName,String code, String type);
+	List<SchEditInfoDto> correctForm(String line,String date,String endDate,String lpName,String code, String type);
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
@@ -1965,7 +1965,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }*/
     @Override
-    public List<SchEditInfoDto> correctForm(String line,String date,
+    public List<SchEditInfoDto> correctForm(String line,String date,String endDate,
     		String lpName,String code, String type) {
 //        var types = {'DFTZ': '待发调整', 'FCXXWT':'发车信息微调', 'JHLB': '计划烂班', 'CXLB': '撤销烂班', 
@@ -1991,12 +1991,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
          String sql = "select t1.*, "
          		+ "t2.fcsj,t2.lp_name,t2.cl_zbh,t2.j_gh,t2.j_name,"
          		+ "t2.xl_dir,t2.real_exec_date from (select * from "
-         		+ "logger_sch_modify where rq=? and line_code=? )"
+         		+ "logger_sch_modify where rq BETWEEN ? and  ? and line_code=? )"
          		+ " t1 INNER JOIN bsth_c_s_sp_info_real t2 on "
          		+ "t1.sch_id=t2.id where 1=1 " + cont;
          List<SchEditInfoDto> list = jdbcTemplate.query(sql, 
-        		 new BeanPropertyRowMapper(SchEditInfoDto.class),date, line);
+        		 new BeanPropertyRowMapper(SchEditInfoDto.class),date,endDate, line);
          List<SchEditInfoDto> lists=new ArrayList<SchEditInfoDto>();
          for (int i = 0; i < list.size(); i++) {
         	 SchEditInfoDto t=list.get(i);
@@ -2030,6 +2030,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
              for (SchEditInfoDto d : lists) {
             	 Map<String, Object> tempMap = new HashMap<String, Object>();
             	 tempMap.put("lpName", d.getLpName());
+            	 tempMap.put("rq", d.getRq());
             	 tempMap.put("clZbh", d.getClZbh());
             	 tempMap.put("jName", d.getjName()+"/"+d.getjGh());
             	 tempMap.put("fcsj", d.getFcsj());
@@ -32,13 +32,13 @@
                         <select class="form-control" name="line" id="line" style="width: 136px;"></select>
                     </div>
                     <div style="display: inline-block;margin-left: 15px;">
-                        <span class="item-label" style="width: 80px;">时间: </span>
+                        <span class="item-label" style="width: 80px;">开始时间: </span>
                         <input class="form-control" type="text" id="date" style="width: 120px;"/>
                     </div>
-<!--                     <div style="display: inline-block;margin-left: 15px;"> -->
-<!--                         <span class="item-label" style="width: 80px;">结束时间: </span> -->
-<!--                         <input class="form-control" type="text" id="endDate" style="width: 120px;"/> -->
-<!--                     </div> -->
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 120px;"/>
+                    </div>
                     <div style="display: inline-block;margin-left: 15px">
                         <span class="item-label" style="width: 140px;">路牌： </span>
                         <select class="form-control" name="lpName" id="lpName" style="width: 136px;"></select>
@@ -59,10 +59,11 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="6">营运车辆修正统计表</th>
+								<th colspan="7">营运车辆修正统计表</th>
 							</tr>
 							<tr>
 								<td>编号</td>
+								<td>日期</td>
 								<td>路牌</td>
 								<td>车号</td>
 								<td>司机</td>
@@ -96,6 +97,10 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
+		});
 		var d = new Date();
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
@@ -105,6 +110,7 @@
 		if(day < 10)
 			day = "0" + day;
 		$("#date").val(year + "-" + month + "-" + day);
+		$("#endDate").val(year + "-" + month + "-" + day);
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -197,16 +203,18 @@
         });
 	    var line = $("#line").val();
-	    var date = $("#startDate").val();
+	    var date = $("#date").val();endDate
 	    var lpName = $("#lpName").val();
+	    var endDate = $("#endDate").val();
 	    var code = $("#code").val();
 		$("#query").on("click",function(){
 		    line = $("#line").val();
 		    date = $("#date").val();
 		    lpName = $("#lpName").val();
 		    code = $("#code").val();
+		    endDate = $("#endDate").val();
 		    var type = "query";
-		    $get("/realSchedule/correctForm",{line:line,date:date,lpName:lpName,code:code,type:type},function(result){
+		    $get("/realSchedule/correctForm",{line:line,date:date,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
 		        var list_correctForm = template('list_correctForm',{list:result});
                 // 把渲染好的模版html文本追加到表格中
                 $('#forms .list_correctForm').html(list_correctForm);
@@ -224,7 +232,7 @@
 		$("#export").on("click",function(){
 			var type = "export";
-			$get('/realSchedule/correctForm',{line:line,date:date,lpName:lpName,code:code,type:type},function(result){
+			$get('/realSchedule/correctForm',{line:line,date:date,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
 				window.open("/downloadFile/download?fileName=修正报表"+date);
 			});
 		});
@@ -234,7 +242,8 @@
 <script type="text/html" id="list_correctForm">
 	{{each list as obj i}}
 		<tr>
-			<td>{{i+1}}</td>
+			<td>{{i+1}}</td>
+			<td>{{obj.rq}}</td>
 			<td>{{obj.lpName}}</td>
 			<td>{{obj.clZbh}}</td>
 			<td>{{obj.jName}}/{{obj.jGh}}</td>
@@ -173,7 +173,7 @@
 				<div class="row">
 					<div class="col-md-offset-3 col-md-4">
 						<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>
-						<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
+						<a type="button" class="btn default" href="list_ph.html" data-pjax><i class="fa fa-times"></i> 取消</a>
 					</div>
 				</div>
 			</div>