修正报表重做，月报表加过滤条件

廖磊
1 parent ce60fe55
Showing 6 changed files with 157 additions and 110 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.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
@@ -7,6 +7,7 @@ import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.data.BasicData;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
@@ -317,9 +318,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	}
 	@RequestMapping(value = "/correctForm")
-	public List<ScheduleRealInfo> correctForm(@RequestParam String line, @RequestParam String startDate,
-											  @RequestParam String endDate, @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
-		return scheduleRealInfoService.correctForm(line, startDate, endDate, lpName, code, type);
+	public List<SchEditInfoDto> correctForm(@RequestParam String line, @RequestParam String date,
+											 @RequestParam String lpName, @RequestParam String code, @RequestParam String type) {
+		return scheduleRealInfoService.correctForm(line, date,  lpName, code, type);
 	}
 	/**
 	 * @Title queryListWaybill
@@ -205,12 +205,15 @@ public class FormsServiceImpl implements FormsService {
 		if(map.containsKey("fgsdmManth")){
 			fgsdmManth=map.get("fgsdmManth").toString();
 		}
-		String sql = "select"
-				+ " r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name "
-//				+ "r.gs_bm,r.gs_name,"
-//				+ " r.fgs_bm,r.fgs_name,r.bc_type,r.lp_name " 
-		        + " from bsth_c_s_sp_info_real r "
-		    	+ " where 1=1  ";
+		String sql ="select ";
+		if(empnames.equals("驾驶员")){
+			sql	+= "  r.j_name,r.j_gh ";
+		}else if(empnames.equals("售票员")){
+			sql += " r.s_gh,r.s_name";
+		}else{
+			sql	+= "  r.cl_zbh";
+		}
+		sql  += " from bsth_c_s_sp_info_real r where 1=1  ";
 		if(map.get("startDate")!=null&&!map.get("startDate").equals("")){
 			sql+=" and  to_days(r.schedule_date_str) BETWEEN to_days('" + map.get("startDate").toString() + "') ";
 		}
@@ -227,12 +230,16 @@ public class FormsServiceImpl implements FormsService {
 //		}
 		if(map.get("fgsdmManth")!=null&&!map.get("fgsdmManth").equals("")){
 			sql+=" and r.fgs_bm like'%"+fgsdmManth+"%' ";
-		}	
-		if(empnames.equals("售票员")){
-			sql+="and r.s_name is not null AND r.s_name !=''";
 		}
+		if(empnames.equals("驾驶员")){
 			sql	+= " GROUP BY "
-					+ "r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name ";
+					+ "r.j_name,r.j_gh";
+		}else if(empnames.equals("售票员")){
+			sql+="and r.s_name is not null AND r.s_name !='' GROUP BY r.s_gh,r.s_name";
+		}else{
+			sql	+= " GROUP BY r.cl_zbh";
+		}
+			
 //					+ ",r.gs_bm,r.gs_name,"
 //					+ "r.fgs_bm,r.fgs_name,r.bc_type ";
@@ -244,15 +251,16 @@ public class FormsServiceImpl implements FormsService {
 			public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
 				Shiftuehiclemanth shif = new Shiftuehiclemanth();
 				if(empnames.equals("驾驶员")){
-					shif.setjName(arg0.getString("j_name"));
+					shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh"));
+					shif.setJgh(arg0.getString("j_gh"));
 				}else if(empnames.equals("售票员")){
-					shif.setjName(arg0.getString("s_name")==null ? "":arg0.getString("s_name"));
+					shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh"));
 			        shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				}else if(empnames.equals("车辆自编号")){
 					shif.setjName(arg0.getString("cl_zbh"));
 				}
-				shif.setJgh(arg0.getString("j_gh"));
-		        shif.setZbh(arg0.getString("cl_zbh"));
+//				shif.setJgh(arg0.getString("j_gh"));
+//		        shif.setZbh(arg0.getString("cl_zbh"));
 //		        shif.setjName(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				return shif;
 			}
@@ -274,11 +282,11 @@ public class FormsServiceImpl implements FormsService {
 					}
 				}else if(empnames.equals("售票员")){
 					String sgh=s.getsGh()==null?"":s.getsGh();
-					if(d.getSgh().equals(sgh) && d.getZbh().equals(s.getClZbh())){
+					if(d.getSgh().equals(sgh)){
 						sList.add(s);
 					}
 				}else if(empnames.equals("车辆自编号")){
-					if(d.getZbh().equals(s.getClZbh())){
+					if(d.getjName().equals(s.getClZbh())){
 						sList.add(s);
 					}
 				}
@@ -2,6 +2,7 @@ package com.bsth.service.realcontrol;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
+import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.BaseService;
@@ -104,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<ScheduleRealInfo> correctForm(String line,String startDate,String endDate,String lpName,String code, String type);
+	List<SchEditInfoDto> correctForm(String line,String date,String lpName,String code, String type);
 	List<ScheduleRealInfo> queryListWaybill(String jName,String clZbh,String lpName,String date,String line);
@@ -16,6 +16,7 @@ import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.data.schedule.edit_logs.FormLogger;
 import com.bsth.data.schedule.edit_logs.ScheduleModifyLogger;
 import com.bsth.data.schedule.edit_logs.loggers.FcxxwtLogger;
+import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
@@ -58,9 +59,11 @@ import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+import org.mvel2.optimizers.impl.refl.nodes.ArrayLength;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
@@ -1904,7 +1907,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return listMap;
     }
-    @Override
+   /* @Override
     public List<ScheduleRealInfo> correctForm(String line, String startDate,
                                               String endDate, String lpName, String code, String type) {
         List<ScheduleRealInfo> list = scheduleRealInfoRepository.correctForm(line, startDate, endDate, lpName, code);
@@ -1959,8 +1962,93 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         return list;
+    }*/
+    
+    @Override
+    public List<SchEditInfoDto> correctForm(String line,String date,
+    		String lpName,String code, String type) {
+       
+//        var types = {'DFTZ': '待发调整', 'FCXXWT':'发车信息微调', 'JHLB': '计划烂班', 'CXLB': '撤销烂班', 
+//    	'CXZX': '撤销执行', 'CXSF': '撤销实发', 'SFTZ': '实发调整', 'TZRC': '调整人车'};
+    	Map<String, Object> map=new HashMap<String,Object>();
+    	map.put("DFTZ", "待发调整");
+    	map.put("FCXXWT", "发车信息微调");
+    	map.put("JHLB", "计划烂班");
+    	map.put("CXLB", "撤销烂班");
+    	map.put("CXZX","撤销执行");
+    	map.put("CXSF", "撤销实发");
+    	map.put("SFTZ", "实发调整");
+    	map.put("TZRC", "调整人车");
+    	
+    	String cont = "";
+         cont = " and xl_bm ='"+line +"'";
+         if(!lpName.equals("")){
+        	 cont +=" and lp_name = '"+lpName+"'";
+         }
+         if(!code.equals("")){
+        	 cont +=" and cl_zbh ='"+code+"'";
+         }
+         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=? )"
+         		+ " 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);
+         List<SchEditInfoDto> lists=new ArrayList<SchEditInfoDto>();
+         for (int i = 0; i < list.size(); i++) {
+        	 SchEditInfoDto t=list.get(i);
+        	 if(map.get(t.getType())!=null){
+        		 t.setType2(t.getTimeStr()+":"+map.get(t.getType()).toString());
+        	 }else{
+        		 t.setType2("");
+        	 }
+        	 boolean fage=true;
+        	 for (int j = 0; j < lists.size(); j++) {
+				SchEditInfoDto s=lists.get(j);
+				if(s.getSchId()==t.getSchId()){
+					s.setType2(s.getType2()+" "+t.getType2());
+					fage=false;
+				}
+			}
+        	 if(fage){
+        		 lists.add(t);
+        	 }
+		 }
+         
+         if (type != null && type.length() != 0 && type.equals("export")) {
+             SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+                     sdfSimple = new SimpleDateFormat("yyyyMMdd");
+             List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+             Map<String, Object> m = new HashMap<String, Object>();
+             m.put("dates",date);
+             ReportUtils ee = new ReportUtils();
+             List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+             for (SchEditInfoDto d : lists) {
+            	 Map<String, Object> tempMap = new HashMap<String, Object>();
+            	 tempMap.put("lpName", d.getLpName());
+            	 tempMap.put("clZbh", d.getClZbh());
+            	 tempMap.put("jName", d.getjName()+"/"+d.getjGh());
+            	 tempMap.put("fcsj", d.getFcsj());
+            	 tempMap.put("type", d.getType2());
+                 tempList.add(tempMap);
+             }
+             try {
+                 listI.add(tempList.iterator());
+                 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                 ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls",
+                         path + "export/修正报表" + date+ ".xls");
+             } catch (Exception e) {
+                 // TODO: handle exception
+                 e.printStackTrace();
+             }
+//             Map<String, Object> maps = tempList.get(tempList.size() - 1);
+         }
+        return lists;
     }
-
     @Override
     public List<ScheduleRealInfo> queryListWaybill(String jName, String clZbh,
                                                    String lpName, String date, String line) {
@@ -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>
-                        <input class="form-control" type="text" id="startDate" 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;"/>
+                        <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: 140px;">路牌： </span>
                         <select class="form-control" name="lpName" id="lpName" style="width: 136px;"></select>
@@ -46,6 +46,7 @@
                     <div style="display: inline-block;margin-left: 15px">
                         <span class="item-label" style="width: 140px;">内部编码： </span>
                         <select class="form-control" name="code" id="code" style="width: 145px;"></select>
+                    	<input class="btn btn-default" type="button" id="czcl" value="X"/>
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="筛选"/>
@@ -58,28 +59,15 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="12">营运车辆修正统计表</th>
-							</tr>
-							<tr>
-								<td colspan="12">车队     站     <span id="sDate"></span>至<span id="eDate"></span></td>
+								<th colspan="6">营运车辆修正统计表</th>
 							</tr>
 							<tr>
-								<td rowspan="2">线路名</td>
-								<td rowspan="2">路牌</td>
-								<td rowspan="2">车号</td>
-								<td rowspan="2">司机</td>
-								<td rowspan="2">售票员</td>
-								<td colspan="2">发车时间</td>
-								<td colspan="2">结束时间</td>
-								<td rowspan="2">修改人</td>
-								<td rowspan="2">修改时间</td>
-								<td rowspan="2">备注</td>
-							</tr>
-							<tr>
-								<td>计划</td>
-								<td>实际</td>
-								<td>计划</td>
-								<td>实际</td>
+								<td>编号</td>
+								<td>路牌</td>
+								<td>车号</td>
+								<td>司机</td>
+								<td>计发</td>
+								<td>修改详细</td>
 							</tr>
 						</thead>
 						<tbody class="list_correctForm">
@@ -104,11 +92,19 @@
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		$("#startDate,#endDate").datetimepicker({
+		$("#date").datetimepicker({
 			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=[];
@@ -116,11 +112,12 @@
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}
-			console.log(data);
 			initPinYinSelect2('#line',data,'');
 		})
-		
+		 $('#czcl').on('click', function () {
+            $('#code').val('').change();
+        });
         $('#lpName').select2({
             ajax: {
@@ -200,44 +197,16 @@
         });
 	    var line = $("#line").val();
-	    var startDate = $("#startDate").val();
-	    var endDate = $("#endDate").val();
+	    var date = $("#startDate").val();
 	    var lpName = $("#lpName").val();
 	    var code = $("#code").val();
 		$("#query").on("click",function(){
-			if($("#startDate").val() == null || $("#startDate").val().trim().length == 0){
-				layer.msg("请选择范围！");
-				return;
-			}
-			if($("#endDate").val() == null || $("#endDate").val().trim().length == 0){
-				layer.msg("请选择范围！");
-				return;
-			}
 		    line = $("#line").val();
-		    startDate = $("#startDate").val();
-		    endDate = $("#endDate").val();
+		    date = $("#date").val();
 		    lpName = $("#lpName").val();
 		    code = $("#code").val();
 		    var type = "query";
-		    $post("/realSchedule/correctForm",{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
-		        $("#sDate").text(startDate);
-		        $("#eDate").text(endDate);
-		        var temp = {};
-		        var today_account = 0;
-		        temp["line"] = $("#line").text() ;
-		        temp["totalAdjustment"] = result.length;  
-		        
-		        $.each(result, function(i, obj) {
-		            if(moment(obj.scheduleDate).format("YYYY-MM-DD") == moment(obj.updateDate).format("YYYY-MM-DD")){
-		                today_account++;
-		            } 
-                    obj.updateDate = moment(obj.updateDate).format("YYYY-MM-DD HH:mm:ss");
-                });
-                
-                temp["todayAdjustment"] = today_account;
-                temp["beforeAdjustment"] = result.length-today_account;
-                temp["historyAdjustment"] = 0;
-		        
+		    $get("/realSchedule/correctForm",{line:line,date:date,lpName:lpName,code:code,type:type},function(result){
 		        var list_correctForm = template('list_correctForm',{list:result});
                 // 把渲染好的模版html文本追加到表格中
                 $('#forms .list_correctForm').html(list_correctForm);
@@ -255,8 +224,8 @@
 		$("#export").on("click",function(){
 			var type = "export";
-			$get('/realSchedule/correctForm',{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code,type:type},function(result){
-				window.open("/downloadFile/download?fileName=修正报表"+moment(startDate).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
+			$get('/realSchedule/correctForm',{line:line,date:date,lpName:lpName,code:code,type:type},function(result){
+				window.open("/downloadFile/download?fileName=修正报表"+date);
 			});
 		});
@@ -264,38 +233,18 @@
 </script>
 <script type="text/html" id="list_correctForm">
 	{{each list as obj i}}
-		<tr>
-			<td>{{obj.xlName}}</td>
+		<tr>
+			<td>{{i+1}}</td>
 			<td>{{obj.lpName}}</td>
 			<td>{{obj.clZbh}}</td>
-			<td>{{obj.jName}}</td>
-			<td>{{obj.sName}}</td>
+			<td>{{obj.jName}}/{{obj.jGh}}</td>
 			<td>{{obj.fcsj}}</td>
-			<td>{{obj.fcsjActual}}</td>
-			<td>{{obj.zdsj}}</td>
-			<td>{{obj.zdsjActual}}</td>
-			<td>{{obj.updateBy}}</td>
-			<td>{{obj.updateDate}}</td>
-			<td>{{obj.remarks}}</td>
+			<td>{{obj.type2}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="12"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="6"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
-<script type="text/html" id="list_correctForm_statistics">
-    <tr>
-        <td colspan="2">线路:</td>
-        <td>{{line}}</td>
-        <td>调整总数</td>
-        <td>{{totalAdjustment}}</td>
-        <td>事先调整</td>
-        <td>{{beforeAdjustment}}</td>
-        <td>当日调整</td>
-        <td>{{todayAdjustment}}</td>
-        <td>历史调整</td>
-        <td colspan="2">{{historyAdjustment}}</td>
-    </tr>
-</script>
 \ No newline at end of file