报表post--get

统计时间段修改

报表post--get
统计时间段修改
廖磊
1 parent c1567544
Showing 8 changed files with 594 additions and 34 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.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/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/statisticsDaily.html
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/forms/statement/waybillQp.html
@@ -279,13 +279,13 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.queryUserInfoPx(line, date,state,type);
 	}
-	@RequestMapping(value = "/exportWaybill")
+	@RequestMapping(value = "/exportWaybill",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh,
 			@RequestParam String lpName,@RequestParam String date,@RequestParam String line) {
 		return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line);
 	}
-	@RequestMapping(value = "/exportWaybillQp")
+	@RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh
 			,@RequestParam String date,@RequestParam String line) {
 		return scheduleRealInfoService.exportWaybillQp( clZbh, date,line);
@@ -308,13 +308,13 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.findLine(line);
 	}
-	@RequestMapping(value="/findKMBC")
+	@RequestMapping(value="/findKMBC",method = RequestMethod.GET)
 	public Map<String,Object> findKMBC(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
 			,@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.findKMBC(jName, clZbh,lpName,date,line);
 	}
-	@RequestMapping(value="/findKMBCQp")
+	@RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
 	public Map<String,Object> findKMBCQp(@RequestParam String clZbh
 			,@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.findKMBCQp(clZbh,date,line);
@@ -344,13 +344,13 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @param lpName 路牌
 	 * @return
 	 */
-	@RequestMapping(value="/queryListWaybill")
+	@RequestMapping(value="/queryListWaybill",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
 			,@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
 	}
-	@RequestMapping(value="/queryListWaybillQp")
+	@RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
 	public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
 			@RequestParam String date,@RequestParam String line){
 		return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line);
@@ -362,6 +362,12 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
 	}
+	@RequestMapping(value="/statisticsDailyTj")
+	public List<Map<String,Object>> statisticsDailyTj(@RequestParam String line, @RequestParam String date,
+			@RequestParam String date2,@RequestParam String xlName, @RequestParam String type){
+		return scheduleRealInfoService.statisticsDailyTj(line, date,date2, xlName, type);
+	}
+	
 	@RequestMapping(value="/MapById",method = RequestMethod.GET)
 	public Map<String, Object> MapById(@RequestParam("id") Long id){
 		return scheduleRealInfoService.MapById(id);
@@ -457,7 +463,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		return scheduleRealInfoService.scheduleDailyExport(map);
 	}
-	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.POST)
+	@RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET)
 	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
 		return scheduleRealInfoService.exportWaybillMore(map);
 	}
@@ -127,6 +127,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m') = ?2 and s.bcType not in ('in','out') order by s.xlBm")
 	List<ScheduleRealInfo> scheduleByDateAndLine3(String line,String date);
+	//按照时间段统计
+	@Query(value="select s from ScheduleRealInfo s where s.xlBm like %?1%  and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') between ?2  and ?3 and s.bcType not in ('in','out') order by s.xlBm")
+	List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2);
+	
 	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4%  GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY xlBm,clZbh")
 	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm);
@@ -112,6 +112,8 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,Object>> statisticsDaily(String line, String date, String xlName, String type);
+	List<Map<String,Object>> statisticsDailyTj(String line, String date,String date2, String xlName, String type);
+	
 	//List<Object> scheduleDaily(String line,String date);
 	int countByLineCodeAndDate(String xlBm, String schDate);
@@ -1313,14 +1313,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 } else {
                     if (!(scheduleRealInfo.getBcType().equals("in")
                             || scheduleRealInfo.getBcType().equals("out"))) {
-                        jhbc++;
-                        jhlc += tempJhlc;
+                    	 jhbc++;
+                         jhlc += tempJhlc;
+                         if (scheduleRealInfo.getStatus() == -1) {
+                             remMileage += tempJhlc;
+                             cjbc++;
+                         }
                     }
-                    if (scheduleRealInfo.getStatus() == -1) {
-                        remMileage += tempJhlc;
-                        cjbc++;
-                    }
                 }
                 Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
                 //计算营运里程，空驶里程
@@ -2094,6 +2094,527 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         return lMap;
     }
+    
+    @Override
+    public List<Map<String, Object>> statisticsDailyTj(String line, String date,String date2,
+                                                     String xlName, String type) {
+        List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
+            list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2);
+
+        List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
+        DecimalFormat format = new DecimalFormat("0.00");
+        double jhlc = 0, tempJhlc = 0, childMileage = 0;
+        float sjgl = 0f, ssgl = 0f, ssgl_lz = 0f, ssgl_dm = 0f, ssgl_gz = 0f, ssgl_jf = 0f, ssgl_zs = 0f, ssgl_qr = 0f, ssgl_qc = 0f, ssgl_kx = 0f, ssgl_qh = 0f, ssgl_yw = 0f, ssgl_other = 0f, ljgl = 0f;
+        //班次
+        int ssbc = 0, ssbc_lz = 0, ssbc_dm = 0, ssbc_gz = 0, ssbc_jf = 0, ssbc_zs = 0, ssbc_qr = 0, ssbc_qc = 0, ssbc_kx = 0, ssbc_qh = 0, ssbc_yw = 0, ssbc_other = 0;
+        int sj_0 = 6 * 60 + 31, sj_1 = 8 * 60 + 30, sj_2 = 16 * 60 + 1, sj_3 = 18 * 60;
+        int jhbc = 0, jhbc_m = 0, jhbc_a = 0;
+        int sjbc = 0, sjbc_m = 0, sjbc_a = 0;
+        int ljbc = 0, ljbc_m = 0, ljbc_a = 0;
+        int fzbc = 0, fzbc_m = 0, fzbc_a = 0;
+        int dtbc = 0, dtbc_m = 0, dtbc_a = 0;
+        int djg = 0, djg_m = 0, djg_a = 0, djg_time = 0;
+
+        double jhlcZ = 0, tempJhlcZ = 0, childMileageZ = 0;
+        float sjglZ = 0f, ssglZ = 0f, ssgl_lzZ = 0f, ssgl_dmZ = 0f,
+                ssgl_gzZ = 0f, ssgl_jfZ = 0f, ssgl_zsZ = 0f, ssgl_qrZ = 0f, ssgl_qcZ = 0f,
+                ssgl_kxZ = 0f, ssgl_qhZ = 0f, ssgl_ywZ = 0f, ssgl_otherZ = 0f, ljglZ = 0f;
+        //班次
+        int ssbcZ = 0, ssbc_lzZ = 0, ssbc_dmZ = 0, ssbc_gzZ = 0, ssbc_jfZ = 0, ssbc_zsZ = 0, ssbc_qrZ = 0, ssbc_qcZ = 0, ssbc_kxZ = 0, ssbc_qhZ = 0, ssbc_ywZ = 0, ssbc_otherZ = 0;
+        int jhbcZ = 0, jhbc_mZ = 0, jhbc_aZ = 0;
+        int sjbcZ = 0, sjbc_mZ = 0, sjbc_aZ = 0;
+        int ljbcZ = 0, ljbc_mZ = 0, ljbc_aZ = 0;
+        int fzbcZ = 0, fzbc_mZ = 0, fzbc_aZ = 0;
+        int dtbcZ = 0, dtbc_mZ = 0, dtbc_aZ = 0;
+        int djgZ = 0, djg_mZ = 0, djg_aZ = 0, djg_timeZ = 0;
+        Map<String, Object> map = null;
+        for (int i = 0; i < list.size(); i++) {
+            ScheduleRealInfo scheduleRealInfo = list.get(i);
+            if (scheduleRealInfo != null) {
+                Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+                //计算实际里程，少驶里程，计划里程=实际里程+少驶里程
+                if (childTaskPlans.isEmpty()) {
+                    tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
+                    //临加公里
+                    if (scheduleRealInfo.isSflj()) {
+                        ljgl += tempJhlc;
+                        ljglZ += tempJhlc;
+                    } else {
+                        jhlc += tempJhlc;
+                        jhlcZ += tempJhlc;
+                    }
+                    if (scheduleRealInfo.getStatus() == -1) {
+                        ssgl += tempJhlc;
+                        ssglZ += tempJhlc;
+                        ssbc++;
+                        ssbcZ++;
+                        if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("路阻") != -1) {
+                            ssgl_lz += tempJhlc;
+                            ssgl_lzZ += tempJhlc;
+                            ssbc_lz++;
+                            ssbc_lzZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1) {
+                            ssgl_dm += tempJhlc;
+                            ssgl_dmZ += tempJhlc;
+                            ssbc_dm++;
+                            ssbc_dmZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("故障") != -1) {
+                            ssgl_gz += tempJhlc;
+                            ssgl_gzZ += tempJhlc;
+                            ssbc_gz++;
+                            ssbc_gzZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1) {
+                            ssgl_jf += tempJhlc;
+                            ssgl_jfZ += tempJhlc;
+                            ssbc_jf++;
+                            ssbc_jfZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("肇事") != -1) {
+                            ssgl_zs += tempJhlc;
+                            ssgl_zsZ += tempJhlc;
+                            ssbc_zs++;
+                            ssbc_zsZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺人") != -1) {
+                            ssgl_qr += tempJhlc;
+                            ssgl_qrZ += tempJhlc;
+                            ssbc_qr++;
+                            ssbc_qrZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺车") != -1) {
+                            ssgl_qc += tempJhlc;
+                            ssgl_qcZ += tempJhlc;
+                            ssbc_qc++;
+                            ssbc_qcZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("客稀") != -1) {
+                            ssgl_kx += tempJhlc;
+                            ssgl_kxZ += tempJhlc;
+                            ssbc_kx++;
+                            ssbc_kxZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("气候") != -1) {
+                            ssgl_qh += tempJhlc;
+                            ssgl_qhZ += tempJhlc;
+                            ssbc_qh++;
+                            ssbc_qhZ++;
+                        } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("援外") != -1) {
+                            ssgl_yw += tempJhlc;
+                            ssgl_ywZ += tempJhlc;
+                            ssbc_yw++;
+                            ssbc_ywZ++;
+                        } else {
+                            ssgl_other += tempJhlc;
+                            ssgl_otherZ += tempJhlc;
+                            ssbc_other++;
+                            ssbc_otherZ++;
+                        }
+                    } else {
+                        sjgl += tempJhlc;
+                        sjglZ += tempJhlc;
+                    }
+                } else {
+                    Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+                    while (it.hasNext()) {
+                        ChildTaskPlan childTaskPlan = it.next();
+                        childMileage = childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
+                        jhlc += childMileage;
+                        jhlcZ += childMileage;
+                        if (childTaskPlan.isDestroy()) {
+                            ssgl += childMileage;
+                            ssglZ += childMileage;
+                            ssbc++;
+                            ssbcZ++;
+                            if (childTaskPlan.getDestroyReason().equals("路阻")) {
+                                ssgl_lz += childTaskPlan.getMileage();
+                                ssgl_lzZ += childTaskPlan.getMileage();
+                                ssbc_lzZ++;
+                                ssbc_lzZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("吊慢")) {
+                                ssgl_dm += childTaskPlan.getMileage();
+                                ssgl_dmZ += childTaskPlan.getMileage();
+                                ssbc_dm++;
+                                ssbc_dmZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("故障")) {
+                                ssgl_gz += childTaskPlan.getMileage();
+                                ssgl_gzZ += childTaskPlan.getMileage();
+                                ssbc_gz++;
+                                ssbc_gzZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("纠纷")) {
+                                ssgl_jf += childTaskPlan.getMileage();
+                                ssgl_jfZ += childTaskPlan.getMileage();
+                                ssbc_jf++;
+                                ssbc_jfZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("肇事")) {
+                                ssgl_zs += childTaskPlan.getMileage();
+                                ssgl_zsZ += childTaskPlan.getMileage();
+                                ssbc_zs++;
+                                ssbc_zsZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("缺人")) {
+                                ssgl_qr += childTaskPlan.getMileage();
+                                ssgl_qrZ += childTaskPlan.getMileage();
+                                ssbc_qr++;
+                                ssbc_qrZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("缺车")) {
+                                ssgl_qc += childTaskPlan.getMileage();
+                                ssgl_qcZ += childTaskPlan.getMileage();
+                                ssbc_qc++;
+                                ssbc_qcZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("客稀")) {
+                                ssgl_kx += childTaskPlan.getMileage();
+                                ssgl_kxZ += childTaskPlan.getMileage();
+                                ssbc_kx++;
+                                ssbc_kxZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("气候")) {
+                                ssgl_qh += childTaskPlan.getMileage();
+                                ssgl_qhZ += childTaskPlan.getMileage();
+                                ssbc_qh++;
+                                ssbc_qhZ++;
+                            } else if (childTaskPlan.getDestroyReason().equals("援外")) {
+                                ssgl_yw += childTaskPlan.getMileage();
+                                ssgl_ywZ += childTaskPlan.getMileage();
+                                ssbc_yw++;
+                                ssbc_ywZ++;
+                            } else {
+                                ssgl_other += childTaskPlan.getMileage();
+                                ssgl_otherZ += childTaskPlan.getMileage();
+                                ssbc_other++;
+                                ssbc_otherZ++;
+                            }
+                        } else {
+                            sjgl += childMileage;
+                            sjglZ += childMileage;
+                        }
+                    }
+                }
+
+                //班次
+                jhbc++;
+                jhbcZ++;
+                String[] fcsj = scheduleRealInfo.getFcsj().split(":");
+                String[] fcsjActual = (scheduleRealInfo.getFcsjActual() == null ? "0:00" : scheduleRealInfo.getFcsjActual()).split(":");
+                if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_1) {
+                    jhbc_m++;
+                    jhbc_mZ++;
+                } else if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_3) {
+                    jhbc_a++;
+                    jhbc_aZ++;
+                }
+                if (scheduleRealInfo.getStatus() != -1) {
+                    sjbc++;
+                    sjbcZ++;
+                    if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
+                        sjbc_m++;
+                        sjbc_mZ++;
+                    } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
+                        sjbc_a++;
+                        sjbc_aZ++;
+                    }
+                }
+                if (scheduleRealInfo.isSflj()) {
+                    ljbc++;
+                    ljbcZ++;
+                    if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
+                        ljbc_m++;
+                        ljbc_mZ++;
+                    } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
+                        ljbc_a++;
+                        ljbc_aZ++;
+                    }
+                }
+                if (scheduleRealInfo.getBcType().equals("venting")) {
+                    fzbc++;
+                    fzbcZ++;
+                    if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
+                        fzbc_m++;
+                        fzbc_mZ++;
+                    } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
+                        fzbc_a++;
+                        fzbc_aZ++;
+                    }
+                }
+
+                if (i < list.size() - 1) {
+                    if (!scheduleRealInfo.getXlBm().equals(list.get(i + 1).getXlBm())) {
+                        map = new HashMap<String, Object>();
+                        map.put("xlName", scheduleRealInfo.getXlName());
+                        map.put("jhlc", format.format(jhlc));
+                        map.put("sjgl", format.format(sjgl));
+                        map.put("ssgl", format.format(ssgl));
+                        map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
+                        map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
+                        map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
+                        map.put("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));
+                        map.put("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));
+                        map.put("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));
+                        map.put("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));
+                        map.put("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));
+                        map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
+                        map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
+                        map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
+                        map.put("ssbc", ssbc);
+                        map.put("ssbc_lz", ssbc_lz);
+                        map.put("ssbc_dm", ssbc_dm);
+                        map.put("ssbc_gz", ssbc_gz);
+                        map.put("ssbc_jf", ssbc_jf);
+                        map.put("ssbc_zs", ssbc_zs);
+                        map.put("ssbc_qr", ssbc_qr);
+                        map.put("ssbc_qc", ssbc_qc);
+                        map.put("ssbc_kx", ssbc_kx);
+                        map.put("ssbc_qh", ssbc_qh);
+                        map.put("ssbc_yw", ssbc_yw);
+                        map.put("ssbc_other", ssbc_other);
+                        map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
+                        map.put("jhbc", jhbc);
+                        map.put("jhbc_m", jhbc_m);
+                        map.put("jhbc_a", jhbc_a);
+                        map.put("sjbc", sjbc);
+                        map.put("sjbc_m", sjbc_m);
+                        map.put("sjbc_a", sjbc_a);
+                        map.put("ljbc", ljbc);
+                        map.put("ljbc_m", ljbc_m);
+                        map.put("ljbc_a", ljbc_a);
+                        map.put("fzbc", fzbc);
+                        map.put("fzbc_m", fzbc_m);
+                        map.put("fzbc_a", fzbc_a);
+                        map.put("dtbc", dtbc);
+                        map.put("dtbc_m", dtbc_m);
+                        map.put("dtbc_a", dtbc_a);
+                        map.put("djg", djg);
+                        map.put("djg_m", djg_m);
+                        map.put("djg_a", djg_a);
+                        map.put("djg_time", djg_time);
+                        lMap.add(map);
+                        jhlc = 0;
+                        tempJhlc = 0;
+                        childMileage = 0;
+                        sjgl = 0f;
+                        ssgl = 0f;
+                        ssgl_lz = 0f;
+                        ssgl_dm = 0f;
+                        ssgl_gz = 0f;
+                        ssgl_jf = 0f;
+                        ssgl_zs = 0f;
+                        ssgl_qr = 0f;
+                        ssgl_qc = 0f;
+                        ssgl_kx = 0f;
+                        ssgl_qh = 0f;
+                        ssgl_yw = 0f;
+                        ssgl_other = 0f;
+                        ljgl = 0f;
+                        //班次
+                        jhbc = 0;
+                        jhbc_m = 0;
+                        jhbc_a = 0;
+                        sjbc = 0;
+                        sjbc_m = 0;
+                        sjbc_a = 0;
+                        ljbc = 0;
+                        ljbc_m = 0;
+                        ljbc_a = 0;
+                        fzbc = 0;
+                        fzbc_m = 0;
+                        fzbc_a = 0;
+                        dtbc = 0;
+                        dtbc_m = 0;
+                        dtbc_a = 0;
+                        djg = 0;
+                        djg_m = 0;
+                        djg_a = 0;
+                        djg_time = 0;
+                    }
+                } else {
+                    map = new HashMap<String, Object>();
+                    map.put("xlName", scheduleRealInfo.getXlName());
+                    map.put("jhlc", format.format(jhlc));
+                    map.put("sjgl", format.format(sjgl));
+                    map.put("ssgl", format.format(ssgl));
+                    map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
+                    map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
+                    map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
+                    map.put("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));
+                    map.put("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));
+                    map.put("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));
+                    map.put("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));
+                    map.put("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));
+                    map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
+                    map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
+                    map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
+                    map.put("ssbc", ssbc);
+                    map.put("ssbc_lz", ssbc_lz);
+                    map.put("ssbc_dm", ssbc_dm);
+                    map.put("ssbc_gz", ssbc_gz);
+                    map.put("ssbc_jf", ssbc_jf);
+                    map.put("ssbc_zs", ssbc_zs);
+                    map.put("ssbc_qr", ssbc_qr);
+                    map.put("ssbc_qc", ssbc_qc);
+                    map.put("ssbc_kx", ssbc_kx);
+                    map.put("ssbc_qh", ssbc_qh);
+                    map.put("ssbc_yw", ssbc_yw);
+                    map.put("ssbc_other", ssbc_other);
+                    map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
+                    map.put("jhbc", jhbc);
+                    map.put("jhbc_m", jhbc_m);
+                    map.put("jhbc_a", jhbc_a);
+                    map.put("sjbc", sjbc);
+                    map.put("sjbc_m", sjbc_m);
+                    map.put("sjbc_a", sjbc_a);
+                    map.put("ljbc", ljbc);
+                    map.put("ljbc_m", ljbc_m);
+                    map.put("ljbc_a", ljbc_a);
+                    map.put("fzbc", fzbc);
+                    map.put("fzbc_m", fzbc_m);
+                    map.put("fzbc_a", fzbc_a);
+                    map.put("dtbc", dtbc);
+                    map.put("dtbc_m", dtbc_m);
+                    map.put("dtbc_a", dtbc_a);
+                    map.put("djg", djg);
+                    map.put("djg_m", djg_m);
+                    map.put("djg_a", djg_a);
+                    map.put("djg_time", djg_time);
+                    lMap.add(map);
+                    jhlc = 0;
+                    tempJhlc = 0;
+                    childMileage = 0;
+                    sjgl = 0f;
+                    ssgl = 0f;
+                    ssgl_lz = 0f;
+                    ssgl_dm = 0f;
+                    ssgl_gz = 0f;
+                    ssgl_jf = 0f;
+                    ssgl_zs = 0f;
+                    ssgl_qr = 0f;
+                    ssgl_qc = 0f;
+                    ssgl_kx = 0f;
+                    ssgl_qh = 0f;
+                    ssgl_yw = 0f;
+                    ssgl_other = 0f;
+                    ljgl = 0f;
+                    //班次
+                    jhbc = 0;
+                    jhbc_m = 0;
+                    jhbc_a = 0;
+                    sjbc = 0;
+                    sjbc_m = 0;
+                    sjbc_a = 0;
+                    ljbc = 0;
+                    ljbc_m = 0;
+                    ljbc_a = 0;
+                    fzbc = 0;
+                    fzbc_m = 0;
+                    fzbc_a = 0;
+                    dtbc = 0;
+                    dtbc_m = 0;
+                    dtbc_a = 0;
+                    djg = 0;
+                    djg_m = 0;
+                    djg_a = 0;
+                    djg_time = 0;
+                }
+            }
+        }
+        map = new HashMap<String, Object>();
+        map.put("xlName", "合计");
+        map.put("jhlc", format.format(jhlcZ));
+        map.put("sjgl", format.format(sjglZ));
+        map.put("ssgl", format.format(ssglZ));
+        map.put("ssgl_lz", ssgl_lzZ == 0 ? 0 : format.format(ssgl_lzZ));
+        map.put("ssgl_dm", ssgl_dmZ == 0 ? 0 : format.format(ssgl_dmZ));
+        map.put("ssgl_gz", ssgl_gzZ == 0 ? 0 : format.format(ssgl_gzZ));
+        map.put("ssgl_jf", ssgl_jfZ == 0 ? 0 : format.format(ssgl_jfZ));
+        map.put("ssgl_zs", ssgl_zsZ == 0 ? 0 : format.format(ssgl_zsZ));
+        map.put("ssgl_qr", ssgl_qrZ == 0 ? 0 : format.format(ssgl_qrZ));
+        map.put("ssgl_qc", ssgl_qcZ == 0 ? 0 : format.format(ssgl_qcZ));
+        map.put("ssgl_kx", ssgl_kxZ == 0 ? 0 : format.format(ssgl_kxZ));
+        map.put("ssgl_qh", ssgl_qhZ == 0 ? 0 : format.format(ssgl_qhZ));
+        map.put("ssgl_yw", ssgl_ywZ == 0 ? 0 : format.format(ssgl_ywZ));
+        map.put("ssgl_other", ssgl_otherZ == 0 ? 0 : format.format(ssgl_otherZ));
+        map.put("ssbc", ssbcZ);
+        map.put("ssbc_lz", ssbc_lzZ);
+        map.put("ssbc_dm", ssbc_lzZ);
+        map.put("ssbc_gz", ssbc_gzZ);
+        map.put("ssbc_jf", ssbc_jfZ);
+        map.put("ssbc_zs", ssbc_zsZ);
+        map.put("ssbc_qr", ssbc_qrZ);
+        map.put("ssbc_qc", ssbc_qcZ);
+        map.put("ssbc_kx", ssbc_qcZ);
+        map.put("ssbc_qh", ssbc_qhZ);
+        map.put("ssbc_yw", ssbc_ywZ);
+        map.put("ssbc_other", ssbc_otherZ);
+        map.put("ljgl", ljglZ == 0 ? 0 : format.format(ljglZ));
+        map.put("jhbc", jhbcZ);
+        map.put("jhbc_m", jhbc_mZ);
+        map.put("jhbc_a", jhbc_aZ);
+        map.put("sjbc", sjbcZ);
+        map.put("sjbc_m", sjbc_mZ);
+        map.put("sjbc_a", sjbc_aZ);
+        map.put("ljbc", ljbcZ);
+        map.put("ljbc_m", ljbc_mZ);
+        map.put("ljbc_a", ljbc_aZ);
+        map.put("fzbc", fzbcZ);
+        map.put("fzbc_m", fzbc_mZ);
+        map.put("fzbc_a", fzbc_aZ);
+        map.put("dtbc", dtbcZ);
+        map.put("dtbc_m", dtbc_mZ);
+        map.put("dtbc_a", dtbc_aZ);
+        map.put("djg", djgZ);
+        map.put("djg_m", djg_mZ);
+        map.put("djg_a", djg_aZ);
+        map.put("djg_time", djg_timeZ);
+        lMap.add(map);
+       /* for (int i = 0; i < lMap.size(); i++) {
+        	Map<String, Object> m=lMap.get(i);
+//        	m.get(""))
+        	jhlc +=  Double.parseDouble(m.get("jhlc").toString());
+        	sjgl +=   Double.parseDouble(m.get("sjgl").toString());
+        	ssgl += Double.parseDouble( m.get("ssgl").toString());
+        	ssgl_lz += Double.parseDouble( m.get("ssgl_lz").toString());
+        	ssgl_dm += Double.parseDouble(m.get("ssgl_dm").toString());
+        	ssgl_gz += Double.parseDouble( m.get("ssgl_gz").toString());
+        	ssgl_jf += m.get("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));
+            m.get("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));
+            m.get("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));
+            m.get("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));
+            m.get("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));
+            m.get("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
+            m.get("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
+            m.get("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
+            m.get("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
+            m.get("jhbc", jhbc);
+            m.get("jhbc_m", jhbc_m);
+            m.get("jhbc_a", jhbc_a);
+            m.get("sjbc", sjbc);
+            m.get("sjbc_m", sjbc_m);
+            m.get("sjbc_a", sjbc_a);
+            m.get("ljbc", ljbc);
+            m.get("ljbc_m", ljbc_m);
+            m.get("ljbc_a", ljbc_a);
+            m.get("fzbc", fzbc);
+            m.get("fzbc_m", fzbc_m);
+            m.get("fzbc_a", fzbc_a);
+            m.get("dtbc", dtbc);
+            m.get("dtbc_m", dtbc_m);
+            m.get("dtbc_a", dtbc_a);
+            m.get("djg", djg);
+            m.get("djg_m", djg_m);
+            m.get("djg_a", djg_a);
+            m.get("djg_time", djg_time);
+		}*/
+
+        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>();
+            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/statisticsDaily_.xls",
+                        path + "export/统计日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
+            } catch (Exception e) {
+                // TODO: handle exception
+                e.printStackTrace();
+            }
+        }
+
+        return lMap;
+    }
     @Override
     public Map<String, Object> scheduleDaily(String line, String date) {
@@ -37,7 +37,7 @@
                     </div>
                     <div class="form-group">
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
-                        <input class="btn btn-default" type="button" id="month" value="按月查询"/>
+<!--                         <input class="btn btn-default" type="button" id="month" value="按月查询"/> -->
                         <input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
 				</form>
@@ -345,7 +345,7 @@
 		});
 		//按月查询
-		$("#month").on('click',function(){
+		/* $("#month").on('click',function(){
 			line = $("#line").val();
 			xlName = $("#select2-line-container").html();
 			date = $("#date").val();
@@ -363,7 +363,7 @@
 			$('#forms .scheduleDaily_2').html("");
 			$('#forms .scheduleDaily_3').html("");
-		});
+		}); */
 		$("#export").on("click",function(){
 			var params = {};
@@ -32,9 +32,13 @@
                         <select class="form-control" name="line" id="line" style="width: 180px;"></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: 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="导出"/>
@@ -124,6 +128,22 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		
+		$("#date2").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);
+		
+		$("#date2").val(year + "-" + month + "-" + day);
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -139,24 +159,31 @@
 		var line ="";
 		var xlName ="";
 		var date = "";
+		var date2 ="";
 		$("#query").on("click",function(){
 			line = $("#line").val();
 			xlName = $("#select2-line-container").html();
 			date = $("#date").val();
+			date2 =$("#date2").val();
 			if(line=="请选择"){
 				line="";
 			}
-			$get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName,type:"query"},function(result){
-				// 把数据填充到模版中
-				var tbodyHtml = template('statisticsDaily',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#forms .statisticsDaily').html(tbodyHtml);
-				
-				if(result.length == 0)
-					$("#export").attr('disabled',"true");
-				else
-					$("#export").removeAttr("disabled");
-			});
+			if(date==null || date =="" ||date2==null || date2 ==""){
+				 layer.msg('请选择时间段.');
+			}else{
+				$get('/realSchedule/statisticsDailyTj',{line:line,date:date,date2:date2,xlName:xlName,type:"query"},function(result){
+					// 把数据填充到模版中
+					var tbodyHtml = template('statisticsDaily',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#forms .statisticsDaily').html(tbodyHtml);
+					
+					if(result.length == 0)
+						$("#export").attr('disabled',"true");
+					else
+						$("#export").removeAttr("disabled");
+				});
+			}
+			
 		});
 		$("#export").on("click",function(){
@@ -238,13 +238,13 @@
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_1').html(ludan_1);
 			});
-			$post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+			$get('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 			    getTime(result);
 				var ludan_2 = template('ludan_2',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_2').html(ludan_2);
 			});
-			$post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+			$get('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 			    var ludan_3 = template('ludan_3',result);
 			    $('#forms .ludan_3').html(ludan_3);
 			});
@@ -254,7 +254,7 @@
 			if(params.length < 1){
 				return;
 			}
-			$post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+			$get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 				window.open("/downloadFile/download?fileName="+date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单");
 			});
 		});
@@ -181,13 +181,13 @@
 				$('#forms .ludan_1').html(ludan_1);
 				//$('#forms .ludan_4').html(ludan_4);
 			});
-			$post('/realSchedule/queryListWaybillQp',{clZbh:params[0],date:date,line:line},function(result){
+			$get('/realSchedule/queryListWaybillQp',{clZbh:params[0],date:date,line:line},function(result){
 			    getTime(result);
 				var ludan_2 = template('ludan_2',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_2').html(ludan_2);
 			});
-			$post('/realSchedule/findKMBCQp',{clZbh:params[0],date:date,line:line},function(result){
+			$get('/realSchedule/findKMBCQp',{clZbh:params[0],date:date,line:line},function(result){
 				console.log(result);
 			    var ludan_3 = template('ludan_3',{map:result});
 			    $('#forms .ludan_3').html(ludan_3);
@@ -199,7 +199,7 @@
 			if(params.length < 1){
 				return;
 			}
-			$post('/realSchedule/exportWaybillQp',{clZbh:params[0],date:date,line:line},function(result){
+			$get('/realSchedule/exportWaybillQp',{clZbh:params[0],date:date,line:line},function(result){
 				var fileName=date+"-"+params[0]+"-行车路单"
 				window.open("/downloadFile/download?fileName="+fileName);
 // 				window.open("/downloadFile/download?fileName="+encodeURIComponent(encodeURIComponent(fileName)));