Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents 9927000b 0623d4ae
Showing 4 changed files with 54 additions and 17 deletions
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/report/countMileage/countBus/countBusMileage.html
src/main/resources/static/pages/report/countMileage/countLine/countLineMileage.html
@@ -114,10 +114,8 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                     + sch.getQdzName() + "发往" + sch.getZdzName();
             //下发0x01指令  调度指令(闹钟有效)
-            long t = System.currentTimeMillis(), alarmTime;
-            alarmTime = sch.getDfsjT();
-            if (sch.getDfsjT() < t)
-                alarmTime = t + 1000 * 30;
+            long t = System.currentTimeMillis() + 1000 * 30,
+                    alarmTime = sch.getDfsjT() < t?t:sch.getDfsjT();
             d60 = new DirectiveCreator().createD60_01(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
                     , 0, new Date(alarmTime));
@@ -15,6 +15,7 @@ import com.bsth.service.report.CulateMileageService;
 import com.bsth.service.report.ReportService;
 import com.bsth.util.Arith;
 import com.bsth.util.ComparableJob;
+import com.bsth.util.ReportUtils;
 import com.bsth.util.db.DBUtils_MS;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -1446,7 +1447,6 @@ public class ReportServiceImpl implements ReportService{
 			}
 			//所有班次信息
 			 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
-	        
 	        line =line.trim();
 	        if(line.equals("")){
 	            //查询所有线路
@@ -1456,7 +1456,6 @@ public class ReportServiceImpl implements ReportService{
 	            list = scheduleRealInfoRepository.scheduleByDateAndLineTj2(line, date,date2);
 	        }
-	        
 	        String sql="select r.xl_bm"
 					+ " from bsth_c_s_sp_info_real r where"
 					+ " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
@@ -1477,7 +1476,6 @@ public class ReportServiceImpl implements ReportService{
 						return ve;
 					}
 				});
-		       
 		       for (int i = 0; i < listLine.size(); i++) {
 		    	   List<ScheduleRealInfo> lists = new ArrayList<ScheduleRealInfo>();
 		    	   String lineStr=listLine.get(i);
@@ -1498,6 +1496,22 @@ public class ReportServiceImpl implements ReportService{
 		    	   Map<String, Object> newMap=staticTj(list,"f");
 		    	   lMap.add(newMap);
 		       }
+		       if(type.equals("export")){
+		    	    List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		            Map<String, Object> m = new HashMap<String, Object>();
+		            m.put("date", date);
+		            m.put("date1", date2);
+		            ReportUtils ee = new ReportUtils();
+		            try {
+		                listI.add(lMap.iterator());
+		                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+		                ee.excelReplace(listI, new Object[]{m}, path + "mould/countByLine.xls",
+		                        path + "export/线路公里统计表.xls");
+		            } catch (Exception e) {
+		                // TODO: handle exception
+		                e.printStackTrace();
+		            }
+		       }
 			return lMap;
 		}
@@ -1520,6 +1534,8 @@ public class ReportServiceImpl implements ReportService{
 		    	if(list.size()>0){
 		    		if(status.equals("f")){
 		    			map.put("xlName","合计");
+		    			map.put("gs", "");
+				        map.put("fgs", "");
 		    		}else{
 		    			map.put("xlName", list.get(0).getXlName());
 				        map.put("gs", list.get(0).getGsName());
@@ -1578,6 +1594,8 @@ public class ReportServiceImpl implements ReportService{
 			        double zrwjcclc=culateService.culateZrwJccLc(list, "");
 			        map.put("zrwjcclc", zrwjcclc);
+			        map.put("zrwjcclc1", 0);
+			        map.put("zrwjcclc2", 0);
 			        double kfks=culateService.culateKfksLc(lists);
 			        map.put("kfks", kfks);
@@ -1646,7 +1664,6 @@ public class ReportServiceImpl implements ReportService{
 					ylbSql += " and xlbm = '"+line+"'";
 				}
 		       List<Ylb> ylbList=ylbList(ylbSql);
-		       
 		       String dlbSql=" select * from bsth_c_dlb where rq BETWEEN '"+date+"' and '"+date2+"'";
 		       if(line.equals("")){
 		    	   dlbSql +="and ssgsdm='"+gsdm+"' "
@@ -1655,7 +1672,6 @@ public class ReportServiceImpl implements ReportService{
 					dlbSql += " and xlbm = '"+line+"'";
 				}
 		       List<Dlb> dlbList=dlbList(dlbSql);
-	        
 	        String sql="select r.xl_bm,r.schedule_date_str,r.cl_zbh,r.j_gh,r.s_gh"
 	        		+ " from bsth_c_s_sp_info_real r where"
 			        + " r.schedule_date_str BETWEEN  '"+date+"' and '"+date2+"'";
@@ -1679,7 +1695,6 @@ public class ReportServiceImpl implements ReportService{
 					return map;
 				}
 			});
-		    
 			 for (int i = 0; i < listGroupBy.size(); i++) {
 				Map<String, Object> m=listGroupBy.get(i);
 				String xl_bm=m.get("line")==null?"":m.get("line").toString();
@@ -1782,7 +1797,6 @@ public class ReportServiceImpl implements ReportService{
 				}
 			}
-			 
 			 if(!zt.equals("zbh")){
 				 String sqls="select r.xl_bm,r.cl_zbh,r.j_gh,r.s_gh"
 			        		+ " from bsth_c_s_sp_info_real r where"
@@ -1809,6 +1823,28 @@ public class ReportServiceImpl implements ReportService{
 					 lMap=lists(listGroupBys, lMaps, gsdm, fgsdm, date, date2);
 			 }
+			 if(type.equals("export")){
+		    	    List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		            Map<String, Object> m = new HashMap<String, Object>();
+		            m.put("date", date);
+		            m.put("date1", date2);
+		            String xls="";
+		            if(zt.equals("zbh")){
+		            	xls="countByBus1.xls";
+		            }else{
+		            	xls="countByBus2.xls";
+		            }
+		            ReportUtils ee = new ReportUtils();
+		            try {
+		                listI.add(lMap.iterator());
+		                String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+		                ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
+		                        path + "export/路单数据统计表.xls");
+		            } catch (Exception e) {
+		                // TODO: handle exception
+		                e.printStackTrace();
+		            }
+		       }
 			return lMap;
 		}
@@ -1818,6 +1854,7 @@ public class ReportServiceImpl implements ReportService{
 					@Override
 					public Ylb mapRow(ResultSet arg0, int arg1) throws SQLException {
 						Ylb y = new Ylb();
+						y.setRq(arg0.getDate("rq"));
 						y.setXlbm(arg0.getString("xlbm"));
 						y.setNbbm(arg0.getString("nbbm"));
 						y.setJzl(arg0.getDouble("jzl"));
@@ -1834,6 +1871,7 @@ public class ReportServiceImpl implements ReportService{
 					@Override
 					public Dlb mapRow(ResultSet arg0, int arg1) throws SQLException {
 						Dlb y = new Dlb();
+						y.setRq(arg0.getDate("rq"));
 						y.setXlbm(arg0.getString("xlbm"));
 						y.setNbbm(arg0.getString("nbbm"));
 						y.setCdl(arg0.getDouble("cdl"));
@@ -37,7 +37,7 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
-				<div style="display: inline-block; " id="gsdmDiv">
+				<div style="display: inline-block;margin-left: 28px; " id="gsdmDiv">
 						<span class="item-label" style="width: 80px;">公司: </span>
 						<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
 					</div> 
@@ -45,7 +45,7 @@
 						<span class="item-label" style="width: 80px;">分公司: </span>
 						<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
 					</div>
-					<div style="display: inline-block;margin-left: 29px;">
+					<div style="display: inline-block;margin-left: 43px;">
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
                     </div>
@@ -66,7 +66,7 @@
                         	<option value="js">驾/售</option>
                         </select>
                     </div>
-                    <div class="form-group">
+                    <div class="form-group" style="margin-left: 55px;">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
                         <input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
@@ -241,9 +241,10 @@
 			 params['date'] = date;
 			 params['date2'] = date2;
 			 params['xlName'] = xlName;
+			 params['zt']=zt;
 			 params['type'] = "export";
-			$get('/realSchedule/statisticsDailyTj',params,function(result){
-				window.open("/downloadFile/download?fileName=统计日报"+moment(date).format("YYYYMMDD"));
+			$get('/report/countBusMileage',params,function(result){
+				window.open("/downloadFile/download?fileName=路单数据统计表");
 			});
 		});
@@ -272,7 +272,7 @@
 			 params['date2'] = date2;
 			 params['xlName'] = xlName;
 			 params['type'] = "export";
-			$get('/realSchedule/countLineMileage',params,function(result){
+			$get('/report/countLineMileage',params,function(result){
 				window.open("/downloadFile/download?fileName=线路公里统计表");
 			});
 		});