Commit 26bb522baf21559ff7b8bbbc9fbfc484131257a9
Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
Showing
9 changed files
with
675 additions
and
115 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
| @@ -279,13 +279,13 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -279,13 +279,13 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 279 | return scheduleRealInfoService.queryUserInfoPx(line, date,state,type); | 279 | return scheduleRealInfoService.queryUserInfoPx(line, date,state,type); |
| 280 | } | 280 | } |
| 281 | 281 | ||
| 282 | - @RequestMapping(value = "/exportWaybill") | 282 | + @RequestMapping(value = "/exportWaybill",method = RequestMethod.GET) |
| 283 | public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh, | 283 | public List<ScheduleRealInfo> exportWaybill(@RequestParam String jName, @RequestParam String clZbh, |
| 284 | @RequestParam String lpName,@RequestParam String date,@RequestParam String line) { | 284 | @RequestParam String lpName,@RequestParam String date,@RequestParam String line) { |
| 285 | return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line); | 285 | return scheduleRealInfoService.exportWaybill(jName, clZbh, lpName,date,line); |
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | - @RequestMapping(value = "/exportWaybillQp") | 288 | + @RequestMapping(value = "/exportWaybillQp",method = RequestMethod.GET) |
| 289 | public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh | 289 | public List<ScheduleRealInfo> exportWaybillQp(@RequestParam String clZbh |
| 290 | ,@RequestParam String date,@RequestParam String line) { | 290 | ,@RequestParam String date,@RequestParam String line) { |
| 291 | return scheduleRealInfoService.exportWaybillQp( clZbh, date,line); | 291 | return scheduleRealInfoService.exportWaybillQp( clZbh, date,line); |
| @@ -308,13 +308,13 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -308,13 +308,13 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 308 | return scheduleRealInfoService.findLine(line); | 308 | return scheduleRealInfoService.findLine(line); |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | - @RequestMapping(value="/findKMBC") | 311 | + @RequestMapping(value="/findKMBC",method = RequestMethod.GET) |
| 312 | public Map<String,Object> findKMBC(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName | 312 | public Map<String,Object> findKMBC(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName |
| 313 | ,@RequestParam String date,@RequestParam String line){ | 313 | ,@RequestParam String date,@RequestParam String line){ |
| 314 | return scheduleRealInfoService.findKMBC(jName, clZbh,lpName,date,line); | 314 | return scheduleRealInfoService.findKMBC(jName, clZbh,lpName,date,line); |
| 315 | } | 315 | } |
| 316 | 316 | ||
| 317 | - @RequestMapping(value="/findKMBCQp") | 317 | + @RequestMapping(value="/findKMBCQp",method = RequestMethod.GET) |
| 318 | public Map<String,Object> findKMBCQp(@RequestParam String clZbh | 318 | public Map<String,Object> findKMBCQp(@RequestParam String clZbh |
| 319 | ,@RequestParam String date,@RequestParam String line){ | 319 | ,@RequestParam String date,@RequestParam String line){ |
| 320 | return scheduleRealInfoService.findKMBCQp(clZbh,date,line); | 320 | return scheduleRealInfoService.findKMBCQp(clZbh,date,line); |
| @@ -344,13 +344,13 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -344,13 +344,13 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 344 | * @param lpName 路牌 | 344 | * @param lpName 路牌 |
| 345 | * @return | 345 | * @return |
| 346 | */ | 346 | */ |
| 347 | - @RequestMapping(value="/queryListWaybill") | 347 | + @RequestMapping(value="/queryListWaybill",method = RequestMethod.GET) |
| 348 | public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName | 348 | public List<ScheduleRealInfo> queryListWaybill(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName |
| 349 | ,@RequestParam String date,@RequestParam String line){ | 349 | ,@RequestParam String date,@RequestParam String line){ |
| 350 | return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line); | 350 | return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line); |
| 351 | } | 351 | } |
| 352 | 352 | ||
| 353 | - @RequestMapping(value="/queryListWaybillQp") | 353 | + @RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET) |
| 354 | public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh, | 354 | public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh, |
| 355 | @RequestParam String date,@RequestParam String line){ | 355 | @RequestParam String date,@RequestParam String line){ |
| 356 | return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line); | 356 | return scheduleRealInfoService.queryListWaybillQp(clZbh,date,line); |
| @@ -362,6 +362,12 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -362,6 +362,12 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 362 | return scheduleRealInfoService.statisticsDaily(line, date, xlName, type); | 362 | return scheduleRealInfoService.statisticsDaily(line, date, xlName, type); |
| 363 | } | 363 | } |
| 364 | 364 | ||
| 365 | + @RequestMapping(value="/statisticsDailyTj") | ||
| 366 | + public List<Map<String,Object>> statisticsDailyTj(@RequestParam String line, @RequestParam String date, | ||
| 367 | + @RequestParam String date2,@RequestParam String xlName, @RequestParam String type){ | ||
| 368 | + return scheduleRealInfoService.statisticsDailyTj(line, date,date2, xlName, type); | ||
| 369 | + } | ||
| 370 | + | ||
| 365 | @RequestMapping(value="/MapById",method = RequestMethod.GET) | 371 | @RequestMapping(value="/MapById",method = RequestMethod.GET) |
| 366 | public Map<String, Object> MapById(@RequestParam("id") Long id){ | 372 | public Map<String, Object> MapById(@RequestParam("id") Long id){ |
| 367 | return scheduleRealInfoService.MapById(id); | 373 | return scheduleRealInfoService.MapById(id); |
| @@ -457,7 +463,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -457,7 +463,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 457 | return scheduleRealInfoService.scheduleDailyExport(map); | 463 | return scheduleRealInfoService.scheduleDailyExport(map); |
| 458 | } | 464 | } |
| 459 | 465 | ||
| 460 | - @RequestMapping(value = "exportWaybillMore", method = RequestMethod.POST) | 466 | + @RequestMapping(value = "exportWaybillMore", method = RequestMethod.GET) |
| 461 | public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){ | 467 | public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){ |
| 462 | return scheduleRealInfoService.exportWaybillMore(map); | 468 | return scheduleRealInfoService.exportWaybillMore(map); |
| 463 | } | 469 | } |
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
| 1 | -package com.bsth.controller.realcontrol; | ||
| 2 | - | ||
| 3 | -import com.bsth.data.schedule.DayOfSchedule; | ||
| 4 | -import com.bsth.entity.realcontrol.ScheduleRealInfo; | ||
| 5 | -import org.apache.commons.lang3.StringUtils; | ||
| 6 | -import org.springframework.beans.factory.annotation.Autowired; | ||
| 7 | -import org.springframework.web.bind.annotation.RequestMapping; | ||
| 8 | -import org.springframework.web.bind.annotation.RequestParam; | ||
| 9 | -import org.springframework.web.bind.annotation.RestController; | ||
| 10 | - | ||
| 11 | -import java.util.ArrayList; | ||
| 12 | -import java.util.List; | ||
| 13 | - | ||
| 14 | -/** | ||
| 15 | - * 对外的营运数据接口,主要输出当日的数据 | ||
| 16 | - * Created by panzhao on 2017/3/15. | ||
| 17 | - */ | ||
| 18 | -@RestController | ||
| 19 | -@RequestMapping("/companyService") | ||
| 20 | -public class ServiceDataInterface { | ||
| 21 | - | ||
| 22 | - private final static String SECRE_KEY = "dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki"; | ||
| 23 | - | ||
| 24 | - @Autowired | ||
| 25 | - DayOfSchedule dayOfSchedule; | ||
| 26 | - | ||
| 27 | - @RequestMapping("/getCurrentDayPlan") | ||
| 28 | - public List<ScheduleRealInfo> getCurrentDayPlan( | ||
| 29 | - @RequestParam String companyId, | ||
| 30 | - @RequestParam String workId, | ||
| 31 | - @RequestParam String secretKey) { | ||
| 32 | - | ||
| 33 | - if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY)) | ||
| 34 | - return null; | ||
| 35 | - | ||
| 36 | - List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>(); | ||
| 37 | - for (ScheduleRealInfo sch : all) { | ||
| 38 | - if (sch.getGsBm() != null | ||
| 39 | - && sch.getGsBm().equals(companyId) | ||
| 40 | - && sch.getjGh().equals(workId)) { | ||
| 41 | - rs.add(sch); | ||
| 42 | - } | ||
| 43 | - } | ||
| 44 | - return rs; | ||
| 45 | - } | ||
| 46 | - | ||
| 47 | - @RequestMapping("/returnCCInfo") | ||
| 48 | - public List<ScheduleRealInfo> returnCCInfo(@RequestParam String companyId, @RequestParam String secretKey){ | ||
| 49 | - if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY)) | ||
| 50 | - return null; | ||
| 51 | - | ||
| 52 | - | ||
| 53 | - List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>(); | ||
| 54 | - for (ScheduleRealInfo sch : all) { | ||
| 55 | - | ||
| 56 | - if (sch.getBcType().equals("out") | ||
| 57 | - && sch.getGsBm() != null | ||
| 58 | - && sch.getGsBm().equals(companyId)) { | ||
| 59 | - rs.add(sch); | ||
| 60 | - } | ||
| 61 | - } | ||
| 62 | - return rs; | ||
| 63 | - } | ||
| 64 | - | ||
| 65 | - @RequestMapping("/returnJCInfo") | ||
| 66 | - public List<ScheduleRealInfo> returnJCInfo(@RequestParam String companyId, @RequestParam String secretKey){ | ||
| 67 | - if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY)) | ||
| 68 | - return null; | ||
| 69 | - | ||
| 70 | - | ||
| 71 | - List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>(); | ||
| 72 | - for (ScheduleRealInfo sch : all) { | ||
| 73 | - if (sch.getBcType().equals("in") | ||
| 74 | - && sch.getGsBm() != null | ||
| 75 | - && sch.getGsBm().equals(companyId)) { | ||
| 76 | - rs.add(sch); | ||
| 77 | - } | ||
| 78 | - } | ||
| 79 | - return rs; | ||
| 80 | - } | ||
| 81 | -} | 1 | +package com.bsth.controller.realcontrol; |
| 2 | + | ||
| 3 | +import com.bsth.data.schedule.DayOfSchedule; | ||
| 4 | +import com.bsth.entity.realcontrol.ScheduleRealInfo; | ||
| 5 | +import org.apache.commons.lang3.StringUtils; | ||
| 6 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 7 | +import org.springframework.web.bind.annotation.RequestMapping; | ||
| 8 | +import org.springframework.web.bind.annotation.RequestParam; | ||
| 9 | +import org.springframework.web.bind.annotation.RestController; | ||
| 10 | + | ||
| 11 | +import java.util.ArrayList; | ||
| 12 | +import java.util.List; | ||
| 13 | + | ||
| 14 | +/** | ||
| 15 | + * 对外的营运数据接口,主要输出当日的数据 | ||
| 16 | + * Created by panzhao on 2017/3/15. | ||
| 17 | + */ | ||
| 18 | +@RestController | ||
| 19 | +@RequestMapping("/companyService") | ||
| 20 | +public class ServiceDataInterface { | ||
| 21 | + | ||
| 22 | + private final static String SECRE_KEY = "dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki"; | ||
| 23 | + | ||
| 24 | + @Autowired | ||
| 25 | + DayOfSchedule dayOfSchedule; | ||
| 26 | + | ||
| 27 | + @RequestMapping("/getCurrentDayPlan") | ||
| 28 | + public List<ScheduleRealInfo> getCurrentDayPlan( | ||
| 29 | + @RequestParam String companyId, | ||
| 30 | + @RequestParam String workId, | ||
| 31 | + @RequestParam String secretKey) { | ||
| 32 | + | ||
| 33 | + if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY)) | ||
| 34 | + return null; | ||
| 35 | + | ||
| 36 | + List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>(); | ||
| 37 | + for (ScheduleRealInfo sch : all) { | ||
| 38 | + if (sch.getGsBm() != null | ||
| 39 | + && sch.getGsBm().equals(companyId) | ||
| 40 | + && sch.getjGh().equals(workId)) { | ||
| 41 | + rs.add(sch); | ||
| 42 | + } | ||
| 43 | + } | ||
| 44 | + return rs; | ||
| 45 | + } | ||
| 46 | + | ||
| 47 | + @RequestMapping("/returnCCInfo") | ||
| 48 | + public List<ScheduleRealInfo> returnCCInfo(@RequestParam String companyId, @RequestParam String secretKey){ | ||
| 49 | + if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY)) | ||
| 50 | + return null; | ||
| 51 | + | ||
| 52 | + | ||
| 53 | + List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>(); | ||
| 54 | + for (ScheduleRealInfo sch : all) { | ||
| 55 | + | ||
| 56 | + if (sch.getBcType().equals("out") | ||
| 57 | + && sch.getGsBm() != null | ||
| 58 | + && sch.getGsBm().equals(companyId)) { | ||
| 59 | + rs.add(sch); | ||
| 60 | + } | ||
| 61 | + } | ||
| 62 | + return rs; | ||
| 63 | + } | ||
| 64 | + | ||
| 65 | + @RequestMapping("/returnJCInfo") | ||
| 66 | + public List<ScheduleRealInfo> returnJCInfo(@RequestParam String companyId, @RequestParam String secretKey){ | ||
| 67 | + if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY)) | ||
| 68 | + return null; | ||
| 69 | + | ||
| 70 | + | ||
| 71 | + List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll()), rs = new ArrayList<>(); | ||
| 72 | + for (ScheduleRealInfo sch : all) { | ||
| 73 | + if (sch.getBcType().equals("in") | ||
| 74 | + && sch.getGsBm() != null | ||
| 75 | + && sch.getGsBm().equals(companyId)) { | ||
| 76 | + rs.add(sch); | ||
| 77 | + } | ||
| 78 | + } | ||
| 79 | + return rs; | ||
| 80 | + } | ||
| 81 | +} |
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
| @@ -127,6 +127,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI | @@ -127,6 +127,10 @@ public interface ScheduleRealInfoRepository extends BaseRepository<ScheduleRealI | ||
| 127 | @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") | 127 | @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") |
| 128 | List<ScheduleRealInfo> scheduleByDateAndLine3(String line,String date); | 128 | List<ScheduleRealInfo> scheduleByDateAndLine3(String line,String date); |
| 129 | 129 | ||
| 130 | + //按照时间段统计 | ||
| 131 | + @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") | ||
| 132 | + List<ScheduleRealInfo> scheduleByDateAndLineTj(String line,String date,String date2); | ||
| 133 | + | ||
| 130 | @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") | 134 | @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") |
| 131 | List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm); | 135 | List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm); |
| 132 | 136 |
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
| @@ -112,6 +112,8 @@ public interface ScheduleRealInfoService extends BaseService<ScheduleRealInfo, L | @@ -112,6 +112,8 @@ public interface ScheduleRealInfoService extends BaseService<ScheduleRealInfo, L | ||
| 112 | 112 | ||
| 113 | List<Map<String,Object>> statisticsDaily(String line, String date, String xlName, String type); | 113 | List<Map<String,Object>> statisticsDaily(String line, String date, String xlName, String type); |
| 114 | 114 | ||
| 115 | + List<Map<String,Object>> statisticsDailyTj(String line, String date,String date2, String xlName, String type); | ||
| 116 | + | ||
| 115 | //List<Object> scheduleDaily(String line,String date); | 117 | //List<Object> scheduleDaily(String line,String date); |
| 116 | 118 | ||
| 117 | int countByLineCodeAndDate(String xlBm, String schDate); | 119 | int countByLineCodeAndDate(String xlBm, String schDate); |
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -1316,14 +1316,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1316,14 +1316,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1316 | } else { | 1316 | } else { |
| 1317 | if (!(scheduleRealInfo.getBcType().equals("in") | 1317 | if (!(scheduleRealInfo.getBcType().equals("in") |
| 1318 | || scheduleRealInfo.getBcType().equals("out"))) { | 1318 | || scheduleRealInfo.getBcType().equals("out"))) { |
| 1319 | - jhbc++; | ||
| 1320 | - jhlc += tempJhlc; | 1319 | + jhbc++; |
| 1320 | + jhlc += tempJhlc; | ||
| 1321 | + if (scheduleRealInfo.getStatus() == -1) { | ||
| 1322 | + remMileage += tempJhlc; | ||
| 1323 | + cjbc++; | ||
| 1324 | + } | ||
| 1321 | } | 1325 | } |
| 1322 | 1326 | ||
| 1323 | - if (scheduleRealInfo.getStatus() == -1) { | ||
| 1324 | - remMileage += tempJhlc; | ||
| 1325 | - cjbc++; | ||
| 1326 | - } | ||
| 1327 | } | 1327 | } |
| 1328 | Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks(); | 1328 | Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks(); |
| 1329 | //计算营运里程,空驶里程 | 1329 | //计算营运里程,空驶里程 |
| @@ -2097,6 +2097,527 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -2097,6 +2097,527 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 2097 | 2097 | ||
| 2098 | return lMap; | 2098 | return lMap; |
| 2099 | } | 2099 | } |
| 2100 | + | ||
| 2101 | + @Override | ||
| 2102 | + public List<Map<String, Object>> statisticsDailyTj(String line, String date,String date2, | ||
| 2103 | + String xlName, String type) { | ||
| 2104 | + List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>(); | ||
| 2105 | + list = scheduleRealInfoRepository.scheduleByDateAndLineTj(line, date,date2); | ||
| 2106 | + | ||
| 2107 | + List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>(); | ||
| 2108 | + DecimalFormat format = new DecimalFormat("0.00"); | ||
| 2109 | + double jhlc = 0, tempJhlc = 0, childMileage = 0; | ||
| 2110 | + 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; | ||
| 2111 | + //班次 | ||
| 2112 | + 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; | ||
| 2113 | + int sj_0 = 6 * 60 + 31, sj_1 = 8 * 60 + 30, sj_2 = 16 * 60 + 1, sj_3 = 18 * 60; | ||
| 2114 | + int jhbc = 0, jhbc_m = 0, jhbc_a = 0; | ||
| 2115 | + int sjbc = 0, sjbc_m = 0, sjbc_a = 0; | ||
| 2116 | + int ljbc = 0, ljbc_m = 0, ljbc_a = 0; | ||
| 2117 | + int fzbc = 0, fzbc_m = 0, fzbc_a = 0; | ||
| 2118 | + int dtbc = 0, dtbc_m = 0, dtbc_a = 0; | ||
| 2119 | + int djg = 0, djg_m = 0, djg_a = 0, djg_time = 0; | ||
| 2120 | + | ||
| 2121 | + double jhlcZ = 0, tempJhlcZ = 0, childMileageZ = 0; | ||
| 2122 | + float sjglZ = 0f, ssglZ = 0f, ssgl_lzZ = 0f, ssgl_dmZ = 0f, | ||
| 2123 | + ssgl_gzZ = 0f, ssgl_jfZ = 0f, ssgl_zsZ = 0f, ssgl_qrZ = 0f, ssgl_qcZ = 0f, | ||
| 2124 | + ssgl_kxZ = 0f, ssgl_qhZ = 0f, ssgl_ywZ = 0f, ssgl_otherZ = 0f, ljglZ = 0f; | ||
| 2125 | + //班次 | ||
| 2126 | + 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; | ||
| 2127 | + int jhbcZ = 0, jhbc_mZ = 0, jhbc_aZ = 0; | ||
| 2128 | + int sjbcZ = 0, sjbc_mZ = 0, sjbc_aZ = 0; | ||
| 2129 | + int ljbcZ = 0, ljbc_mZ = 0, ljbc_aZ = 0; | ||
| 2130 | + int fzbcZ = 0, fzbc_mZ = 0, fzbc_aZ = 0; | ||
| 2131 | + int dtbcZ = 0, dtbc_mZ = 0, dtbc_aZ = 0; | ||
| 2132 | + int djgZ = 0, djg_mZ = 0, djg_aZ = 0, djg_timeZ = 0; | ||
| 2133 | + Map<String, Object> map = null; | ||
| 2134 | + for (int i = 0; i < list.size(); i++) { | ||
| 2135 | + ScheduleRealInfo scheduleRealInfo = list.get(i); | ||
| 2136 | + if (scheduleRealInfo != null) { | ||
| 2137 | + Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks(); | ||
| 2138 | + //计算实际里程,少驶里程,计划里程=实际里程+少驶里程 | ||
| 2139 | + if (childTaskPlans.isEmpty()) { | ||
| 2140 | + tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc(); | ||
| 2141 | + //临加公里 | ||
| 2142 | + if (scheduleRealInfo.isSflj()) { | ||
| 2143 | + ljgl += tempJhlc; | ||
| 2144 | + ljglZ += tempJhlc; | ||
| 2145 | + } else { | ||
| 2146 | + jhlc += tempJhlc; | ||
| 2147 | + jhlcZ += tempJhlc; | ||
| 2148 | + } | ||
| 2149 | + if (scheduleRealInfo.getStatus() == -1) { | ||
| 2150 | + ssgl += tempJhlc; | ||
| 2151 | + ssglZ += tempJhlc; | ||
| 2152 | + ssbc++; | ||
| 2153 | + ssbcZ++; | ||
| 2154 | + if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("路阻") != -1) { | ||
| 2155 | + ssgl_lz += tempJhlc; | ||
| 2156 | + ssgl_lzZ += tempJhlc; | ||
| 2157 | + ssbc_lz++; | ||
| 2158 | + ssbc_lzZ++; | ||
| 2159 | + } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1) { | ||
| 2160 | + ssgl_dm += tempJhlc; | ||
| 2161 | + ssgl_dmZ += tempJhlc; | ||
| 2162 | + ssbc_dm++; | ||
| 2163 | + ssbc_dmZ++; | ||
| 2164 | + } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("故障") != -1) { | ||
| 2165 | + ssgl_gz += tempJhlc; | ||
| 2166 | + ssgl_gzZ += tempJhlc; | ||
| 2167 | + ssbc_gz++; | ||
| 2168 | + ssbc_gzZ++; | ||
| 2169 | + } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1) { | ||
| 2170 | + ssgl_jf += tempJhlc; | ||
| 2171 | + ssgl_jfZ += tempJhlc; | ||
| 2172 | + ssbc_jf++; | ||
| 2173 | + ssbc_jfZ++; | ||
| 2174 | + } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("肇事") != -1) { | ||
| 2175 | + ssgl_zs += tempJhlc; | ||
| 2176 | + ssgl_zsZ += tempJhlc; | ||
| 2177 | + ssbc_zs++; | ||
| 2178 | + ssbc_zsZ++; | ||
| 2179 | + } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺人") != -1) { | ||
| 2180 | + ssgl_qr += tempJhlc; | ||
| 2181 | + ssgl_qrZ += tempJhlc; | ||
| 2182 | + ssbc_qr++; | ||
| 2183 | + ssbc_qrZ++; | ||
| 2184 | + } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺车") != -1) { | ||
| 2185 | + ssgl_qc += tempJhlc; | ||
| 2186 | + ssgl_qcZ += tempJhlc; | ||
| 2187 | + ssbc_qc++; | ||
| 2188 | + ssbc_qcZ++; | ||
| 2189 | + } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("客稀") != -1) { | ||
| 2190 | + ssgl_kx += tempJhlc; | ||
| 2191 | + ssgl_kxZ += tempJhlc; | ||
| 2192 | + ssbc_kx++; | ||
| 2193 | + ssbc_kxZ++; | ||
| 2194 | + } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("气候") != -1) { | ||
| 2195 | + ssgl_qh += tempJhlc; | ||
| 2196 | + ssgl_qhZ += tempJhlc; | ||
| 2197 | + ssbc_qh++; | ||
| 2198 | + ssbc_qhZ++; | ||
| 2199 | + } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("援外") != -1) { | ||
| 2200 | + ssgl_yw += tempJhlc; | ||
| 2201 | + ssgl_ywZ += tempJhlc; | ||
| 2202 | + ssbc_yw++; | ||
| 2203 | + ssbc_ywZ++; | ||
| 2204 | + } else { | ||
| 2205 | + ssgl_other += tempJhlc; | ||
| 2206 | + ssgl_otherZ += tempJhlc; | ||
| 2207 | + ssbc_other++; | ||
| 2208 | + ssbc_otherZ++; | ||
| 2209 | + } | ||
| 2210 | + } else { | ||
| 2211 | + sjgl += tempJhlc; | ||
| 2212 | + sjglZ += tempJhlc; | ||
| 2213 | + } | ||
| 2214 | + } else { | ||
| 2215 | + Iterator<ChildTaskPlan> it = childTaskPlans.iterator(); | ||
| 2216 | + while (it.hasNext()) { | ||
| 2217 | + ChildTaskPlan childTaskPlan = it.next(); | ||
| 2218 | + childMileage = childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage(); | ||
| 2219 | + jhlc += childMileage; | ||
| 2220 | + jhlcZ += childMileage; | ||
| 2221 | + if (childTaskPlan.isDestroy()) { | ||
| 2222 | + ssgl += childMileage; | ||
| 2223 | + ssglZ += childMileage; | ||
| 2224 | + ssbc++; | ||
| 2225 | + ssbcZ++; | ||
| 2226 | + if (childTaskPlan.getDestroyReason().equals("路阻")) { | ||
| 2227 | + ssgl_lz += childTaskPlan.getMileage(); | ||
| 2228 | + ssgl_lzZ += childTaskPlan.getMileage(); | ||
| 2229 | + ssbc_lzZ++; | ||
| 2230 | + ssbc_lzZ++; | ||
| 2231 | + } else if (childTaskPlan.getDestroyReason().equals("吊慢")) { | ||
| 2232 | + ssgl_dm += childTaskPlan.getMileage(); | ||
| 2233 | + ssgl_dmZ += childTaskPlan.getMileage(); | ||
| 2234 | + ssbc_dm++; | ||
| 2235 | + ssbc_dmZ++; | ||
| 2236 | + } else if (childTaskPlan.getDestroyReason().equals("故障")) { | ||
| 2237 | + ssgl_gz += childTaskPlan.getMileage(); | ||
| 2238 | + ssgl_gzZ += childTaskPlan.getMileage(); | ||
| 2239 | + ssbc_gz++; | ||
| 2240 | + ssbc_gzZ++; | ||
| 2241 | + } else if (childTaskPlan.getDestroyReason().equals("纠纷")) { | ||
| 2242 | + ssgl_jf += childTaskPlan.getMileage(); | ||
| 2243 | + ssgl_jfZ += childTaskPlan.getMileage(); | ||
| 2244 | + ssbc_jf++; | ||
| 2245 | + ssbc_jfZ++; | ||
| 2246 | + } else if (childTaskPlan.getDestroyReason().equals("肇事")) { | ||
| 2247 | + ssgl_zs += childTaskPlan.getMileage(); | ||
| 2248 | + ssgl_zsZ += childTaskPlan.getMileage(); | ||
| 2249 | + ssbc_zs++; | ||
| 2250 | + ssbc_zsZ++; | ||
| 2251 | + } else if (childTaskPlan.getDestroyReason().equals("缺人")) { | ||
| 2252 | + ssgl_qr += childTaskPlan.getMileage(); | ||
| 2253 | + ssgl_qrZ += childTaskPlan.getMileage(); | ||
| 2254 | + ssbc_qr++; | ||
| 2255 | + ssbc_qrZ++; | ||
| 2256 | + } else if (childTaskPlan.getDestroyReason().equals("缺车")) { | ||
| 2257 | + ssgl_qc += childTaskPlan.getMileage(); | ||
| 2258 | + ssgl_qcZ += childTaskPlan.getMileage(); | ||
| 2259 | + ssbc_qc++; | ||
| 2260 | + ssbc_qcZ++; | ||
| 2261 | + } else if (childTaskPlan.getDestroyReason().equals("客稀")) { | ||
| 2262 | + ssgl_kx += childTaskPlan.getMileage(); | ||
| 2263 | + ssgl_kxZ += childTaskPlan.getMileage(); | ||
| 2264 | + ssbc_kx++; | ||
| 2265 | + ssbc_kxZ++; | ||
| 2266 | + } else if (childTaskPlan.getDestroyReason().equals("气候")) { | ||
| 2267 | + ssgl_qh += childTaskPlan.getMileage(); | ||
| 2268 | + ssgl_qhZ += childTaskPlan.getMileage(); | ||
| 2269 | + ssbc_qh++; | ||
| 2270 | + ssbc_qhZ++; | ||
| 2271 | + } else if (childTaskPlan.getDestroyReason().equals("援外")) { | ||
| 2272 | + ssgl_yw += childTaskPlan.getMileage(); | ||
| 2273 | + ssgl_ywZ += childTaskPlan.getMileage(); | ||
| 2274 | + ssbc_yw++; | ||
| 2275 | + ssbc_ywZ++; | ||
| 2276 | + } else { | ||
| 2277 | + ssgl_other += childTaskPlan.getMileage(); | ||
| 2278 | + ssgl_otherZ += childTaskPlan.getMileage(); | ||
| 2279 | + ssbc_other++; | ||
| 2280 | + ssbc_otherZ++; | ||
| 2281 | + } | ||
| 2282 | + } else { | ||
| 2283 | + sjgl += childMileage; | ||
| 2284 | + sjglZ += childMileage; | ||
| 2285 | + } | ||
| 2286 | + } | ||
| 2287 | + } | ||
| 2288 | + | ||
| 2289 | + //班次 | ||
| 2290 | + jhbc++; | ||
| 2291 | + jhbcZ++; | ||
| 2292 | + String[] fcsj = scheduleRealInfo.getFcsj().split(":"); | ||
| 2293 | + String[] fcsjActual = (scheduleRealInfo.getFcsjActual() == null ? "0:00" : scheduleRealInfo.getFcsjActual()).split(":"); | ||
| 2294 | + if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_1) { | ||
| 2295 | + jhbc_m++; | ||
| 2296 | + jhbc_mZ++; | ||
| 2297 | + } else if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_3) { | ||
| 2298 | + jhbc_a++; | ||
| 2299 | + jhbc_aZ++; | ||
| 2300 | + } | ||
| 2301 | + if (scheduleRealInfo.getStatus() != -1) { | ||
| 2302 | + sjbc++; | ||
| 2303 | + sjbcZ++; | ||
| 2304 | + if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) { | ||
| 2305 | + sjbc_m++; | ||
| 2306 | + sjbc_mZ++; | ||
| 2307 | + } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) { | ||
| 2308 | + sjbc_a++; | ||
| 2309 | + sjbc_aZ++; | ||
| 2310 | + } | ||
| 2311 | + } | ||
| 2312 | + if (scheduleRealInfo.isSflj()) { | ||
| 2313 | + ljbc++; | ||
| 2314 | + ljbcZ++; | ||
| 2315 | + if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) { | ||
| 2316 | + ljbc_m++; | ||
| 2317 | + ljbc_mZ++; | ||
| 2318 | + } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) { | ||
| 2319 | + ljbc_a++; | ||
| 2320 | + ljbc_aZ++; | ||
| 2321 | + } | ||
| 2322 | + } | ||
| 2323 | + if (scheduleRealInfo.getBcType().equals("venting")) { | ||
| 2324 | + fzbc++; | ||
| 2325 | + fzbcZ++; | ||
| 2326 | + if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) { | ||
| 2327 | + fzbc_m++; | ||
| 2328 | + fzbc_mZ++; | ||
| 2329 | + } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) { | ||
| 2330 | + fzbc_a++; | ||
| 2331 | + fzbc_aZ++; | ||
| 2332 | + } | ||
| 2333 | + } | ||
| 2334 | + | ||
| 2335 | + if (i < list.size() - 1) { | ||
| 2336 | + if (!scheduleRealInfo.getXlBm().equals(list.get(i + 1).getXlBm())) { | ||
| 2337 | + map = new HashMap<String, Object>(); | ||
| 2338 | + map.put("xlName", scheduleRealInfo.getXlName()); | ||
| 2339 | + map.put("jhlc", format.format(jhlc)); | ||
| 2340 | + map.put("sjgl", format.format(sjgl)); | ||
| 2341 | + map.put("ssgl", format.format(ssgl)); | ||
| 2342 | + map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz)); | ||
| 2343 | + map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm)); | ||
| 2344 | + map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz)); | ||
| 2345 | + map.put("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf)); | ||
| 2346 | + map.put("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs)); | ||
| 2347 | + map.put("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr)); | ||
| 2348 | + map.put("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc)); | ||
| 2349 | + map.put("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx)); | ||
| 2350 | + map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh)); | ||
| 2351 | + map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw)); | ||
| 2352 | + map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other)); | ||
| 2353 | + map.put("ssbc", ssbc); | ||
| 2354 | + map.put("ssbc_lz", ssbc_lz); | ||
| 2355 | + map.put("ssbc_dm", ssbc_dm); | ||
| 2356 | + map.put("ssbc_gz", ssbc_gz); | ||
| 2357 | + map.put("ssbc_jf", ssbc_jf); | ||
| 2358 | + map.put("ssbc_zs", ssbc_zs); | ||
| 2359 | + map.put("ssbc_qr", ssbc_qr); | ||
| 2360 | + map.put("ssbc_qc", ssbc_qc); | ||
| 2361 | + map.put("ssbc_kx", ssbc_kx); | ||
| 2362 | + map.put("ssbc_qh", ssbc_qh); | ||
| 2363 | + map.put("ssbc_yw", ssbc_yw); | ||
| 2364 | + map.put("ssbc_other", ssbc_other); | ||
| 2365 | + map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl)); | ||
| 2366 | + map.put("jhbc", jhbc); | ||
| 2367 | + map.put("jhbc_m", jhbc_m); | ||
| 2368 | + map.put("jhbc_a", jhbc_a); | ||
| 2369 | + map.put("sjbc", sjbc); | ||
| 2370 | + map.put("sjbc_m", sjbc_m); | ||
| 2371 | + map.put("sjbc_a", sjbc_a); | ||
| 2372 | + map.put("ljbc", ljbc); | ||
| 2373 | + map.put("ljbc_m", ljbc_m); | ||
| 2374 | + map.put("ljbc_a", ljbc_a); | ||
| 2375 | + map.put("fzbc", fzbc); | ||
| 2376 | + map.put("fzbc_m", fzbc_m); | ||
| 2377 | + map.put("fzbc_a", fzbc_a); | ||
| 2378 | + map.put("dtbc", dtbc); | ||
| 2379 | + map.put("dtbc_m", dtbc_m); | ||
| 2380 | + map.put("dtbc_a", dtbc_a); | ||
| 2381 | + map.put("djg", djg); | ||
| 2382 | + map.put("djg_m", djg_m); | ||
| 2383 | + map.put("djg_a", djg_a); | ||
| 2384 | + map.put("djg_time", djg_time); | ||
| 2385 | + lMap.add(map); | ||
| 2386 | + jhlc = 0; | ||
| 2387 | + tempJhlc = 0; | ||
| 2388 | + childMileage = 0; | ||
| 2389 | + sjgl = 0f; | ||
| 2390 | + ssgl = 0f; | ||
| 2391 | + ssgl_lz = 0f; | ||
| 2392 | + ssgl_dm = 0f; | ||
| 2393 | + ssgl_gz = 0f; | ||
| 2394 | + ssgl_jf = 0f; | ||
| 2395 | + ssgl_zs = 0f; | ||
| 2396 | + ssgl_qr = 0f; | ||
| 2397 | + ssgl_qc = 0f; | ||
| 2398 | + ssgl_kx = 0f; | ||
| 2399 | + ssgl_qh = 0f; | ||
| 2400 | + ssgl_yw = 0f; | ||
| 2401 | + ssgl_other = 0f; | ||
| 2402 | + ljgl = 0f; | ||
| 2403 | + //班次 | ||
| 2404 | + jhbc = 0; | ||
| 2405 | + jhbc_m = 0; | ||
| 2406 | + jhbc_a = 0; | ||
| 2407 | + sjbc = 0; | ||
| 2408 | + sjbc_m = 0; | ||
| 2409 | + sjbc_a = 0; | ||
| 2410 | + ljbc = 0; | ||
| 2411 | + ljbc_m = 0; | ||
| 2412 | + ljbc_a = 0; | ||
| 2413 | + fzbc = 0; | ||
| 2414 | + fzbc_m = 0; | ||
| 2415 | + fzbc_a = 0; | ||
| 2416 | + dtbc = 0; | ||
| 2417 | + dtbc_m = 0; | ||
| 2418 | + dtbc_a = 0; | ||
| 2419 | + djg = 0; | ||
| 2420 | + djg_m = 0; | ||
| 2421 | + djg_a = 0; | ||
| 2422 | + djg_time = 0; | ||
| 2423 | + } | ||
| 2424 | + } else { | ||
| 2425 | + map = new HashMap<String, Object>(); | ||
| 2426 | + map.put("xlName", scheduleRealInfo.getXlName()); | ||
| 2427 | + map.put("jhlc", format.format(jhlc)); | ||
| 2428 | + map.put("sjgl", format.format(sjgl)); | ||
| 2429 | + map.put("ssgl", format.format(ssgl)); | ||
| 2430 | + map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz)); | ||
| 2431 | + map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm)); | ||
| 2432 | + map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz)); | ||
| 2433 | + map.put("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf)); | ||
| 2434 | + map.put("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs)); | ||
| 2435 | + map.put("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr)); | ||
| 2436 | + map.put("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc)); | ||
| 2437 | + map.put("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx)); | ||
| 2438 | + map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh)); | ||
| 2439 | + map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw)); | ||
| 2440 | + map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other)); | ||
| 2441 | + map.put("ssbc", ssbc); | ||
| 2442 | + map.put("ssbc_lz", ssbc_lz); | ||
| 2443 | + map.put("ssbc_dm", ssbc_dm); | ||
| 2444 | + map.put("ssbc_gz", ssbc_gz); | ||
| 2445 | + map.put("ssbc_jf", ssbc_jf); | ||
| 2446 | + map.put("ssbc_zs", ssbc_zs); | ||
| 2447 | + map.put("ssbc_qr", ssbc_qr); | ||
| 2448 | + map.put("ssbc_qc", ssbc_qc); | ||
| 2449 | + map.put("ssbc_kx", ssbc_kx); | ||
| 2450 | + map.put("ssbc_qh", ssbc_qh); | ||
| 2451 | + map.put("ssbc_yw", ssbc_yw); | ||
| 2452 | + map.put("ssbc_other", ssbc_other); | ||
| 2453 | + map.put("ljgl", ljgl == 0 ? 0 : format.format(ljgl)); | ||
| 2454 | + map.put("jhbc", jhbc); | ||
| 2455 | + map.put("jhbc_m", jhbc_m); | ||
| 2456 | + map.put("jhbc_a", jhbc_a); | ||
| 2457 | + map.put("sjbc", sjbc); | ||
| 2458 | + map.put("sjbc_m", sjbc_m); | ||
| 2459 | + map.put("sjbc_a", sjbc_a); | ||
| 2460 | + map.put("ljbc", ljbc); | ||
| 2461 | + map.put("ljbc_m", ljbc_m); | ||
| 2462 | + map.put("ljbc_a", ljbc_a); | ||
| 2463 | + map.put("fzbc", fzbc); | ||
| 2464 | + map.put("fzbc_m", fzbc_m); | ||
| 2465 | + map.put("fzbc_a", fzbc_a); | ||
| 2466 | + map.put("dtbc", dtbc); | ||
| 2467 | + map.put("dtbc_m", dtbc_m); | ||
| 2468 | + map.put("dtbc_a", dtbc_a); | ||
| 2469 | + map.put("djg", djg); | ||
| 2470 | + map.put("djg_m", djg_m); | ||
| 2471 | + map.put("djg_a", djg_a); | ||
| 2472 | + map.put("djg_time", djg_time); | ||
| 2473 | + lMap.add(map); | ||
| 2474 | + jhlc = 0; | ||
| 2475 | + tempJhlc = 0; | ||
| 2476 | + childMileage = 0; | ||
| 2477 | + sjgl = 0f; | ||
| 2478 | + ssgl = 0f; | ||
| 2479 | + ssgl_lz = 0f; | ||
| 2480 | + ssgl_dm = 0f; | ||
| 2481 | + ssgl_gz = 0f; | ||
| 2482 | + ssgl_jf = 0f; | ||
| 2483 | + ssgl_zs = 0f; | ||
| 2484 | + ssgl_qr = 0f; | ||
| 2485 | + ssgl_qc = 0f; | ||
| 2486 | + ssgl_kx = 0f; | ||
| 2487 | + ssgl_qh = 0f; | ||
| 2488 | + ssgl_yw = 0f; | ||
| 2489 | + ssgl_other = 0f; | ||
| 2490 | + ljgl = 0f; | ||
| 2491 | + //班次 | ||
| 2492 | + jhbc = 0; | ||
| 2493 | + jhbc_m = 0; | ||
| 2494 | + jhbc_a = 0; | ||
| 2495 | + sjbc = 0; | ||
| 2496 | + sjbc_m = 0; | ||
| 2497 | + sjbc_a = 0; | ||
| 2498 | + ljbc = 0; | ||
| 2499 | + ljbc_m = 0; | ||
| 2500 | + ljbc_a = 0; | ||
| 2501 | + fzbc = 0; | ||
| 2502 | + fzbc_m = 0; | ||
| 2503 | + fzbc_a = 0; | ||
| 2504 | + dtbc = 0; | ||
| 2505 | + dtbc_m = 0; | ||
| 2506 | + dtbc_a = 0; | ||
| 2507 | + djg = 0; | ||
| 2508 | + djg_m = 0; | ||
| 2509 | + djg_a = 0; | ||
| 2510 | + djg_time = 0; | ||
| 2511 | + } | ||
| 2512 | + } | ||
| 2513 | + } | ||
| 2514 | + map = new HashMap<String, Object>(); | ||
| 2515 | + map.put("xlName", "合计"); | ||
| 2516 | + map.put("jhlc", format.format(jhlcZ)); | ||
| 2517 | + map.put("sjgl", format.format(sjglZ)); | ||
| 2518 | + map.put("ssgl", format.format(ssglZ)); | ||
| 2519 | + map.put("ssgl_lz", ssgl_lzZ == 0 ? 0 : format.format(ssgl_lzZ)); | ||
| 2520 | + map.put("ssgl_dm", ssgl_dmZ == 0 ? 0 : format.format(ssgl_dmZ)); | ||
| 2521 | + map.put("ssgl_gz", ssgl_gzZ == 0 ? 0 : format.format(ssgl_gzZ)); | ||
| 2522 | + map.put("ssgl_jf", ssgl_jfZ == 0 ? 0 : format.format(ssgl_jfZ)); | ||
| 2523 | + map.put("ssgl_zs", ssgl_zsZ == 0 ? 0 : format.format(ssgl_zsZ)); | ||
| 2524 | + map.put("ssgl_qr", ssgl_qrZ == 0 ? 0 : format.format(ssgl_qrZ)); | ||
| 2525 | + map.put("ssgl_qc", ssgl_qcZ == 0 ? 0 : format.format(ssgl_qcZ)); | ||
| 2526 | + map.put("ssgl_kx", ssgl_kxZ == 0 ? 0 : format.format(ssgl_kxZ)); | ||
| 2527 | + map.put("ssgl_qh", ssgl_qhZ == 0 ? 0 : format.format(ssgl_qhZ)); | ||
| 2528 | + map.put("ssgl_yw", ssgl_ywZ == 0 ? 0 : format.format(ssgl_ywZ)); | ||
| 2529 | + map.put("ssgl_other", ssgl_otherZ == 0 ? 0 : format.format(ssgl_otherZ)); | ||
| 2530 | + map.put("ssbc", ssbcZ); | ||
| 2531 | + map.put("ssbc_lz", ssbc_lzZ); | ||
| 2532 | + map.put("ssbc_dm", ssbc_lzZ); | ||
| 2533 | + map.put("ssbc_gz", ssbc_gzZ); | ||
| 2534 | + map.put("ssbc_jf", ssbc_jfZ); | ||
| 2535 | + map.put("ssbc_zs", ssbc_zsZ); | ||
| 2536 | + map.put("ssbc_qr", ssbc_qrZ); | ||
| 2537 | + map.put("ssbc_qc", ssbc_qcZ); | ||
| 2538 | + map.put("ssbc_kx", ssbc_qcZ); | ||
| 2539 | + map.put("ssbc_qh", ssbc_qhZ); | ||
| 2540 | + map.put("ssbc_yw", ssbc_ywZ); | ||
| 2541 | + map.put("ssbc_other", ssbc_otherZ); | ||
| 2542 | + map.put("ljgl", ljglZ == 0 ? 0 : format.format(ljglZ)); | ||
| 2543 | + map.put("jhbc", jhbcZ); | ||
| 2544 | + map.put("jhbc_m", jhbc_mZ); | ||
| 2545 | + map.put("jhbc_a", jhbc_aZ); | ||
| 2546 | + map.put("sjbc", sjbcZ); | ||
| 2547 | + map.put("sjbc_m", sjbc_mZ); | ||
| 2548 | + map.put("sjbc_a", sjbc_aZ); | ||
| 2549 | + map.put("ljbc", ljbcZ); | ||
| 2550 | + map.put("ljbc_m", ljbc_mZ); | ||
| 2551 | + map.put("ljbc_a", ljbc_aZ); | ||
| 2552 | + map.put("fzbc", fzbcZ); | ||
| 2553 | + map.put("fzbc_m", fzbc_mZ); | ||
| 2554 | + map.put("fzbc_a", fzbc_aZ); | ||
| 2555 | + map.put("dtbc", dtbcZ); | ||
| 2556 | + map.put("dtbc_m", dtbc_mZ); | ||
| 2557 | + map.put("dtbc_a", dtbc_aZ); | ||
| 2558 | + map.put("djg", djgZ); | ||
| 2559 | + map.put("djg_m", djg_mZ); | ||
| 2560 | + map.put("djg_a", djg_aZ); | ||
| 2561 | + map.put("djg_time", djg_timeZ); | ||
| 2562 | + lMap.add(map); | ||
| 2563 | + /* for (int i = 0; i < lMap.size(); i++) { | ||
| 2564 | + Map<String, Object> m=lMap.get(i); | ||
| 2565 | +// m.get("")) | ||
| 2566 | + jhlc += Double.parseDouble(m.get("jhlc").toString()); | ||
| 2567 | + sjgl += Double.parseDouble(m.get("sjgl").toString()); | ||
| 2568 | + ssgl += Double.parseDouble( m.get("ssgl").toString()); | ||
| 2569 | + ssgl_lz += Double.parseDouble( m.get("ssgl_lz").toString()); | ||
| 2570 | + ssgl_dm += Double.parseDouble(m.get("ssgl_dm").toString()); | ||
| 2571 | + ssgl_gz += Double.parseDouble( m.get("ssgl_gz").toString()); | ||
| 2572 | + ssgl_jf += m.get("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf)); | ||
| 2573 | + m.get("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs)); | ||
| 2574 | + m.get("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr)); | ||
| 2575 | + m.get("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc)); | ||
| 2576 | + m.get("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx)); | ||
| 2577 | + m.get("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh)); | ||
| 2578 | + m.get("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw)); | ||
| 2579 | + m.get("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other)); | ||
| 2580 | + m.get("ljgl", ljgl == 0 ? 0 : format.format(ljgl)); | ||
| 2581 | + m.get("jhbc", jhbc); | ||
| 2582 | + m.get("jhbc_m", jhbc_m); | ||
| 2583 | + m.get("jhbc_a", jhbc_a); | ||
| 2584 | + m.get("sjbc", sjbc); | ||
| 2585 | + m.get("sjbc_m", sjbc_m); | ||
| 2586 | + m.get("sjbc_a", sjbc_a); | ||
| 2587 | + m.get("ljbc", ljbc); | ||
| 2588 | + m.get("ljbc_m", ljbc_m); | ||
| 2589 | + m.get("ljbc_a", ljbc_a); | ||
| 2590 | + m.get("fzbc", fzbc); | ||
| 2591 | + m.get("fzbc_m", fzbc_m); | ||
| 2592 | + m.get("fzbc_a", fzbc_a); | ||
| 2593 | + m.get("dtbc", dtbc); | ||
| 2594 | + m.get("dtbc_m", dtbc_m); | ||
| 2595 | + m.get("dtbc_a", dtbc_a); | ||
| 2596 | + m.get("djg", djg); | ||
| 2597 | + m.get("djg_m", djg_m); | ||
| 2598 | + m.get("djg_a", djg_a); | ||
| 2599 | + m.get("djg_time", djg_time); | ||
| 2600 | + }*/ | ||
| 2601 | + | ||
| 2602 | + if (type != null && type.length() != 0 && type.equals("export")) { | ||
| 2603 | + SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), | ||
| 2604 | + sdfSimple = new SimpleDateFormat("yyyyMMdd"); | ||
| 2605 | + List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); | ||
| 2606 | + Map<String, Object> m = new HashMap<String, Object>(); | ||
| 2607 | + ReportUtils ee = new ReportUtils(); | ||
| 2608 | + try { | ||
| 2609 | + listI.add(lMap.iterator()); | ||
| 2610 | + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | ||
| 2611 | + ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls", | ||
| 2612 | + path + "export/统计日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); | ||
| 2613 | + } catch (Exception e) { | ||
| 2614 | + // TODO: handle exception | ||
| 2615 | + e.printStackTrace(); | ||
| 2616 | + } | ||
| 2617 | + } | ||
| 2618 | + | ||
| 2619 | + return lMap; | ||
| 2620 | + } | ||
| 2100 | 2621 | ||
| 2101 | @Override | 2622 | @Override |
| 2102 | public Map<String, Object> scheduleDaily(String line, String date) { | 2623 | public Map<String, Object> scheduleDaily(String line, String date) { |
src/main/resources/static/pages/forms/statement/scheduleDaily.html
| @@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
| 37 | </div> | 37 | </div> |
| 38 | <div class="form-group"> | 38 | <div class="form-group"> |
| 39 | <input class="btn btn-default" type="button" id="query" value="查询"/> | 39 | <input class="btn btn-default" type="button" id="query" value="查询"/> |
| 40 | - <input class="btn btn-default" type="button" id="month" value="按月查询"/> | 40 | +<!-- <input class="btn btn-default" type="button" id="month" value="按月查询"/> --> |
| 41 | <input class="btn btn-default" type="button" id="export" value="导出"/> | 41 | <input class="btn btn-default" type="button" id="export" value="导出"/> |
| 42 | </div> | 42 | </div> |
| 43 | </form> | 43 | </form> |
| @@ -345,7 +345,7 @@ | @@ -345,7 +345,7 @@ | ||
| 345 | }); | 345 | }); |
| 346 | 346 | ||
| 347 | //按月查询 | 347 | //按月查询 |
| 348 | - $("#month").on('click',function(){ | 348 | + /* $("#month").on('click',function(){ |
| 349 | line = $("#line").val(); | 349 | line = $("#line").val(); |
| 350 | xlName = $("#select2-line-container").html(); | 350 | xlName = $("#select2-line-container").html(); |
| 351 | date = $("#date").val(); | 351 | date = $("#date").val(); |
| @@ -363,7 +363,7 @@ | @@ -363,7 +363,7 @@ | ||
| 363 | $('#forms .scheduleDaily_2').html(""); | 363 | $('#forms .scheduleDaily_2').html(""); |
| 364 | $('#forms .scheduleDaily_3').html(""); | 364 | $('#forms .scheduleDaily_3').html(""); |
| 365 | 365 | ||
| 366 | - }); | 366 | + }); */ |
| 367 | 367 | ||
| 368 | $("#export").on("click",function(){ | 368 | $("#export").on("click",function(){ |
| 369 | var params = {}; | 369 | var params = {}; |
src/main/resources/static/pages/forms/statement/statisticsDaily.html
| @@ -32,9 +32,13 @@ | @@ -32,9 +32,13 @@ | ||
| 32 | <select class="form-control" name="line" id="line" style="width: 180px;"></select> | 32 | <select class="form-control" name="line" id="line" style="width: 180px;"></select> |
| 33 | </div> | 33 | </div> |
| 34 | <div style="display: inline-block;margin-left: 15px;"> | 34 | <div style="display: inline-block;margin-left: 15px;"> |
| 35 | - <span class="item-label" style="width: 80px;">时间: </span> | 35 | + <span class="item-label" style="width: 80px;">开始时间: </span> |
| 36 | <input class="form-control" type="text" id="date" style="width: 180px;"/> | 36 | <input class="form-control" type="text" id="date" style="width: 180px;"/> |
| 37 | </div> | 37 | </div> |
| 38 | + <div style="display: inline-block;margin-left: 15px;"> | ||
| 39 | + <span class="item-label" style="width: 80px;">结束时间: </span> | ||
| 40 | + <input class="form-control" type="text" id="date2" style="width: 180px;"/> | ||
| 41 | + </div> | ||
| 38 | <div class="form-group"> | 42 | <div class="form-group"> |
| 39 | <input class="btn btn-default" type="button" id="query" value="查询"/> | 43 | <input class="btn btn-default" type="button" id="query" value="查询"/> |
| 40 | <input class="btn btn-default" type="button" id="export" value="导出"/> | 44 | <input class="btn btn-default" type="button" id="export" value="导出"/> |
| @@ -124,6 +128,22 @@ | @@ -124,6 +128,22 @@ | ||
| 124 | format : 'YYYY-MM-DD', | 128 | format : 'YYYY-MM-DD', |
| 125 | locale : 'zh-cn' | 129 | locale : 'zh-cn' |
| 126 | }); | 130 | }); |
| 131 | + | ||
| 132 | + $("#date2").datetimepicker({ | ||
| 133 | + format : 'YYYY-MM-DD', | ||
| 134 | + locale : 'zh-cn' | ||
| 135 | + }); | ||
| 136 | + var d = new Date(); | ||
| 137 | + var year = d.getFullYear(); | ||
| 138 | + var month = d.getMonth() + 1; | ||
| 139 | + var day = d.getDate(); | ||
| 140 | + if(month < 10) | ||
| 141 | + month = "0" + month; | ||
| 142 | + if(day < 10) | ||
| 143 | + day = "0" + day; | ||
| 144 | + $("#date").val(year + "-" + month + "-" + day); | ||
| 145 | + | ||
| 146 | + $("#date2").val(year + "-" + month + "-" + day); | ||
| 127 | $.get('/basic/lineCode2Name',function(result){ | 147 | $.get('/basic/lineCode2Name',function(result){ |
| 128 | var data=[]; | 148 | var data=[]; |
| 129 | 149 | ||
| @@ -139,24 +159,31 @@ | @@ -139,24 +159,31 @@ | ||
| 139 | var line =""; | 159 | var line =""; |
| 140 | var xlName =""; | 160 | var xlName =""; |
| 141 | var date = ""; | 161 | var date = ""; |
| 162 | + var date2 =""; | ||
| 142 | $("#query").on("click",function(){ | 163 | $("#query").on("click",function(){ |
| 143 | line = $("#line").val(); | 164 | line = $("#line").val(); |
| 144 | xlName = $("#select2-line-container").html(); | 165 | xlName = $("#select2-line-container").html(); |
| 145 | date = $("#date").val(); | 166 | date = $("#date").val(); |
| 167 | + date2 =$("#date2").val(); | ||
| 146 | if(line=="请选择"){ | 168 | if(line=="请选择"){ |
| 147 | line=""; | 169 | line=""; |
| 148 | } | 170 | } |
| 149 | - $get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName,type:"query"},function(result){ | ||
| 150 | - // 把数据填充到模版中 | ||
| 151 | - var tbodyHtml = template('statisticsDaily',{list:result}); | ||
| 152 | - // 把渲染好的模版html文本追加到表格中 | ||
| 153 | - $('#forms .statisticsDaily').html(tbodyHtml); | ||
| 154 | - | ||
| 155 | - if(result.length == 0) | ||
| 156 | - $("#export").attr('disabled',"true"); | ||
| 157 | - else | ||
| 158 | - $("#export").removeAttr("disabled"); | ||
| 159 | - }); | 171 | + if(date==null || date =="" ||date2==null || date2 ==""){ |
| 172 | + layer.msg('请选择时间段.'); | ||
| 173 | + }else{ | ||
| 174 | + $get('/realSchedule/statisticsDailyTj',{line:line,date:date,date2:date2,xlName:xlName,type:"query"},function(result){ | ||
| 175 | + // 把数据填充到模版中 | ||
| 176 | + var tbodyHtml = template('statisticsDaily',{list:result}); | ||
| 177 | + // 把渲染好的模版html文本追加到表格中 | ||
| 178 | + $('#forms .statisticsDaily').html(tbodyHtml); | ||
| 179 | + | ||
| 180 | + if(result.length == 0) | ||
| 181 | + $("#export").attr('disabled',"true"); | ||
| 182 | + else | ||
| 183 | + $("#export").removeAttr("disabled"); | ||
| 184 | + }); | ||
| 185 | + } | ||
| 186 | + | ||
| 160 | }); | 187 | }); |
| 161 | 188 | ||
| 162 | $("#export").on("click",function(){ | 189 | $("#export").on("click",function(){ |
src/main/resources/static/pages/forms/statement/waybill.html
| @@ -238,13 +238,13 @@ | @@ -238,13 +238,13 @@ | ||
| 238 | // 把渲染好的模版html文本追加到表格中 | 238 | // 把渲染好的模版html文本追加到表格中 |
| 239 | $('#forms .ludan_1').html(ludan_1); | 239 | $('#forms .ludan_1').html(ludan_1); |
| 240 | }); | 240 | }); |
| 241 | - $post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){ | 241 | + $get('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){ |
| 242 | getTime(result); | 242 | getTime(result); |
| 243 | var ludan_2 = template('ludan_2',{list:result}); | 243 | var ludan_2 = template('ludan_2',{list:result}); |
| 244 | // 把渲染好的模版html文本追加到表格中 | 244 | // 把渲染好的模版html文本追加到表格中 |
| 245 | $('#forms .ludan_2').html(ludan_2); | 245 | $('#forms .ludan_2').html(ludan_2); |
| 246 | }); | 246 | }); |
| 247 | - $post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){ | 247 | + $get('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){ |
| 248 | var ludan_3 = template('ludan_3',result); | 248 | var ludan_3 = template('ludan_3',result); |
| 249 | $('#forms .ludan_3').html(ludan_3); | 249 | $('#forms .ludan_3').html(ludan_3); |
| 250 | }); | 250 | }); |
| @@ -254,7 +254,7 @@ | @@ -254,7 +254,7 @@ | ||
| 254 | if(params.length < 1){ | 254 | if(params.length < 1){ |
| 255 | return; | 255 | return; |
| 256 | } | 256 | } |
| 257 | - $post('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){ | 257 | + $get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){ |
| 258 | window.open("/downloadFile/download?fileName="+date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单"); | 258 | window.open("/downloadFile/download?fileName="+date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单"); |
| 259 | }); | 259 | }); |
| 260 | }); | 260 | }); |
src/main/resources/static/pages/forms/statement/waybillQp.html
| @@ -181,13 +181,13 @@ | @@ -181,13 +181,13 @@ | ||
| 181 | $('#forms .ludan_1').html(ludan_1); | 181 | $('#forms .ludan_1').html(ludan_1); |
| 182 | //$('#forms .ludan_4').html(ludan_4); | 182 | //$('#forms .ludan_4').html(ludan_4); |
| 183 | }); | 183 | }); |
| 184 | - $post('/realSchedule/queryListWaybillQp',{clZbh:params[0],date:date,line:line},function(result){ | 184 | + $get('/realSchedule/queryListWaybillQp',{clZbh:params[0],date:date,line:line},function(result){ |
| 185 | getTime(result); | 185 | getTime(result); |
| 186 | var ludan_2 = template('ludan_2',{list:result}); | 186 | var ludan_2 = template('ludan_2',{list:result}); |
| 187 | // 把渲染好的模版html文本追加到表格中 | 187 | // 把渲染好的模版html文本追加到表格中 |
| 188 | $('#forms .ludan_2').html(ludan_2); | 188 | $('#forms .ludan_2').html(ludan_2); |
| 189 | }); | 189 | }); |
| 190 | - $post('/realSchedule/findKMBCQp',{clZbh:params[0],date:date,line:line},function(result){ | 190 | + $get('/realSchedule/findKMBCQp',{clZbh:params[0],date:date,line:line},function(result){ |
| 191 | console.log(result); | 191 | console.log(result); |
| 192 | var ludan_3 = template('ludan_3',{map:result}); | 192 | var ludan_3 = template('ludan_3',{map:result}); |
| 193 | $('#forms .ludan_3').html(ludan_3); | 193 | $('#forms .ludan_3').html(ludan_3); |
| @@ -199,7 +199,7 @@ | @@ -199,7 +199,7 @@ | ||
| 199 | if(params.length < 1){ | 199 | if(params.length < 1){ |
| 200 | return; | 200 | return; |
| 201 | } | 201 | } |
| 202 | - $post('/realSchedule/exportWaybillQp',{clZbh:params[0],date:date,line:line},function(result){ | 202 | + $get('/realSchedule/exportWaybillQp',{clZbh:params[0],date:date,line:line},function(result){ |
| 203 | var fileName=date+"-"+params[0]+"-行车路单" | 203 | var fileName=date+"-"+params[0]+"-行车路单" |
| 204 | window.open("/downloadFile/download?fileName="+fileName); | 204 | window.open("/downloadFile/download?fileName="+fileName); |
| 205 | // window.open("/downloadFile/download?fileName="+encodeURIComponent(encodeURIComponent(fileName))); | 205 | // window.open("/downloadFile/download?fileName="+encodeURIComponent(encodeURIComponent(fileName))); |