潘钊 / bsth_control · Commits

Commit a7f7430cd84cc08a39dbe45a210360331d4537d3

Authored by 潘钊
1 parent fd44a5a1

update...

Inline Side-by-side
Showing 8 changed files with 1461 additions and 995 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
  View file @a7f7430
... ... @@ -294,6 +294,21 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo,
294 294 return scheduleRealInfoService.findKMBC(jGh, clZbh,lpName,date,line);
295 295 }
296 296  
  297 + /**
  298 + * 路单公里统计 （闵行审计专用）
  299 + * @param jGh
  300 + * @param clZbh
  301 + * @param lpName
  302 + * @param date
  303 + * @param line
  304 + * @return
  305 + */
  306 + @RequestMapping(value="/findKMBC_mh_2",method = RequestMethod.GET)
  307 + public Map<String,Object> findKMBC_mh_2(@RequestParam String jGh,@RequestParam String clZbh,@RequestParam String lpName
  308 + ,@RequestParam String date,@RequestParam String line){
  309 + return scheduleRealInfoService.findKMBC_mh_2(jGh, clZbh,lpName,date,line);
  310 + }
  311 +
297 312 @RequestMapping(value="/findKMBCQp",method = RequestMethod.GET)
298 313 public Map<String,Object> findKMBCQp(@RequestParam String clZbh
299 314 ,@RequestParam String date,@RequestParam String line){
... ... @@ -337,6 +352,20 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
337 352 return scheduleRealInfoService.queryListWaybill(jName, clZbh,lpName,date,line);
338 353 }
339 354  
  355 + /**
  356 + * @Title queryListWaybill
  357 + * @Description 查询行车路单列表（闵行审计专用路单）
  358 + * @param jName 驾驶员名字
  359 + * @param clZbh 车辆自编号（内部编号）
  360 + * @param lpName 路牌
  361 + * @return
  362 + */
  363 + @RequestMapping(value="/queryListWaybill_mh_2",method = RequestMethod.GET)
  364 + public List<ScheduleRealInfo> queryListWaybill_mh_2(@RequestParam String jName,@RequestParam String clZbh,@RequestParam String lpName
  365 + ,@RequestParam String date,@RequestParam String line){
  366 + return scheduleRealInfoService.queryListWaybill2(jName, clZbh,lpName,date,line);
  367 + }
  368 +
340 369 @RequestMapping(value="/queryListWaybillQp",method = RequestMethod.GET)
341 370 public List<ScheduleRealInfo> queryListWaybillQp(@RequestParam String clZbh,
342 371 @RequestParam String date,@RequestParam String line){
... ... @@ -349,6 +378,12 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
349 378 return scheduleRealInfoService.statisticsDaily(line, date, xlName, type);
350 379 }
351 380  
  381 + @RequestMapping(value="/statisticsDaily_mh_2")
  382 + public List<Map<String,Object>> statisticsDaily_mh_2(@RequestParam String line, @RequestParam String date,
  383 + @RequestParam String xlName, @RequestParam String type){
  384 + return scheduleRealInfoService.statisticsDaily_mh_2(line, date, xlName, type);
  385 + }
  386 +
352 387 @RequestMapping(value="/statisticsDailyTj")
353 388 public List<Map<String,Object>> statisticsDailyTj(@RequestParam Map<String, Object> map){
354 389 String gsdm="";
... ... @@ -404,6 +439,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
404 439 return scheduleRealInfoService.realScheduleList(line,date);
405 440 }
406 441  
  442 + @RequestMapping(value="/realScheduleList_mh_2")
  443 + public List<ScheduleRealInfo> realScheduleList_mh_2(@RequestParam String line,@RequestParam String date){
  444 + return scheduleRealInfoService.realScheduleList_mh_2(line,date);
  445 + }
  446 +
407 447 @RequestMapping(value="/realScheduleListQp")
408 448 public List<ScheduleRealInfo> realScheduleListQp(@RequestParam String line,@RequestParam String date){
409 449 return scheduleRealInfoService.realScheduleListQp(line,date);
... ...
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
  View file @a7f7430
... ... @@ -172,4 +172,12 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
172 172 Map<String,Object> addToHistory(ScheduleRealInfo sch);
173 173  
174 174 Map<String, Object> deleteToHistory(Long id);
  175 +
  176 + List<ScheduleRealInfo> queryListWaybill2(String jName, String clZbh, String lpName, String date, String line);
  177 +
  178 + Map<String,Object> findKMBC_mh_2(String jGh, String clZbh, String lpName, String date, String line);
  179 +
  180 + List<Map<String,Object>> statisticsDaily_mh_2(String line, String date, String xlName, String type);
  181 +
  182 + List<ScheduleRealInfo> realScheduleList_mh_2(String line, String date);
175 183 }
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @a7f7430
... ... @@ -733,13 +733,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
733 733 state = state + "+1";
734 734 type = "ASC";
735 735 }
736   - /*String sqlPlan = "select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh,"
737   - + " s.lp_Name as lpName,s.j_Name as jName,min(s.schedule_date_str) as dateStr ,"
738   - + " min(s.fcsj) as fcsj, min(s.schedule_date) as date"
739   - + " from bsth_c_s_sp_info_real s "
740   - + " where s.xl_Bm = '" + line + "' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='" + date + "' "
741   - + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name"
742   - + " order by (" + state + "),dateStr,fcsj " + type;*/
743 736 String sqlMinYysj="select start_opt from bsth_c_line_config where "
744 737 + " id = ("
745 738 + "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
... ... @@ -773,43 +766,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
773 766 }
774 767 });
775 768 if (lpname.equals("lpName")) {
776   - /* SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
777   - String sqlMinYysj="select start_opt from bsth_c_line_config where "
778   - + " id = ("
779   - + "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
780   - + ")";
781   - String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
782   - String[] minSjs = minfcsj.split(":");
783   - Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
784   - for (int i = 0; i < list.size(); i++) {
785   - ScheduleRealInfo s=list.get(i);
786   - String[] fcsj= s.getFcsj().split(":");
787   - Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
788   -
789   - Long fscjT=0L;
790   - if(fcsjL<minSj){
791   - Calendar calendar = new GregorianCalendar();
792   - calendar.setTime(s.getScheduleDate());
793   - calendar.add(calendar.DATE,1);
794   - s.setScheduleDate(calendar.getTime());
795   - try {
796   - fscjT = sdf.parse(sdf.format(s.getScheduleDate())+" "+s.getFcsj()).getTime();
797   - } catch (ParseException e) {
798   - // TODO Auto-generated catch block
799   - e.printStackTrace();
800   - }
801   -
802   - }else{
803   - try {
804   - fscjT =sdf.parse(s.getScheduleDateStr()+" "+s.getFcsj()).getTime();
805   - } catch (ParseException e) {
806   - // TODO Auto-generated catch block
807   - e.printStackTrace();
808   - };
809   - }
810   - s.setFcsjT(fscjT);
811   - }
812   - Collections.sort(list, new ComparableReal());*/
  769 +
813 770 List<ScheduleRealInfo> listNew = new ArrayList<ScheduleRealInfo>();
814 771 Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
815 772 // if (px.equals("desc")) {
... ... @@ -826,9 +783,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
826 783 listNew.add(t);
827 784 }
828 785 } else {
829   -// if (zt == 2) {
830   -// listNew.add(t);
831   -// }
832 786 continue;
833 787 }
834 788 }
... ... @@ -846,30 +800,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
846 800 listNew.add(t);
847 801 }
848 802 }
849   - /*} else {
850   - int zt = 0;
851   - for (int l = 0; l < 3; l++) {
852   - for (int i = 0; i < list.size(); i++) {
853   - ScheduleRealInfo t = list.get(i);
854   - if (t.getLpName().indexOf("+") != -1) {
855   - if (zt == 2) {
856   - listNew.add(t);
857   - }
858   -
859   - } else if (pattern.matcher(t.getLpName()).matches()) {
860   - if (zt == 1) {
861   - listNew.add(t);
862   - }
863   - } else {
864   - if (zt == 0) {
865   - listNew.add(t);
866   - }
867   - }
868   - }
869   - zt++;
870   - }
871   -
872   - }*/
873 803 return listNew;
874 804 } else {
875 805 return list;
... ... @@ -1089,14 +1019,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1089 1019 List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lineStr));
1090 1020  
1091 1021 Map<Integer, Integer> map = new HashMap<>();
1092   - /*Integer code;
1093   - for (String lineCode : lineList) {
1094   - code = Integer.parseInt(lineCode);
1095   - if (!ScheduleBuffer.trustMap.containsKey(lineCode))
1096   - ScheduleBuffer.trustMap.put(code, 0);
1097   -
1098   - map.put(code, ScheduleBuffer.trustMap.get(code));
1099   - }*/
1100 1022 return map;
1101 1023 }
1102 1024  
... ... @@ -1184,17 +1106,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1184 1106 rs.put("status", ResponseCode.ERROR);
1185 1107 rs.put("msg", "无实发时间，无法撤销！");
1186 1108 } else {
1187   - //将对应的到离站数据标记为不可信 ### 废弃的代码 ####
1188   - /*List<ArrivalEntity> list = ArrivalData_GPS.findByNbbm(sch.getClZbh());
1189   - for (ArrivalEntity arr : list) {
1190   - if (arr.getInOut() == 1
1191   - && arr.getUpDown() == Integer.parseInt(sch.getXlDir())
1192   - && arr.getStopNo().equals(sch.getQdzCode())
1193   - && Math.abs(arr.getTs() - sch.getFcsjActualTime()) < 1000 * 60) {
1194   - arr.setEnable(false);
1195   - break;
1196   - }
1197   - }*/
1198 1109 //日志记录
1199 1110 ScheduleModifyLogger.cxsf(sch);
1200 1111  
... ... @@ -1671,122 +1582,66 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1671 1582 }
1672 1583  
1673 1584  
1674   - /* @Override
1675   - public Map<String, Object> findKMBC(String jName, String clZbh,
  1585 + public Map<String, Object> findKMBC(String jGh, String clZbh,
1676 1586 String lpName, String date, String line) {
1677   - List<ScheduleRealInfo> list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
1678   - DecimalFormat format = new DecimalFormat("0.00");
1679   -// int cjbc = scheduleRealInfoRepository.findCjbc(jName, clZbh, lpName);
1680   -// int ljbc = scheduleRealInfoRepository.findLjbc(jName, clZbh, lpName);
1681   - int jhbc = 0, cjbc = 0, ljbc = 0;
1682   - double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0,jhlcOrig=0, jcclc = 0;
1683   - float addMileage = 0l, remMileage = 0l,addMileageYy = 0l,addMileageJc =0l;
1684 1587 Map<String, Object> map = new HashMap<String, Object>();
1685   - for (ScheduleRealInfo scheduleRealInfo : list) {
1686   - if (scheduleRealInfo != null) {
1687   - //计划里程（主任务过滤掉临加班次），
1688   - //烂班里程（主任务烂班），
1689   - //临加里程（主任务临加），
1690   - //计划班次，烂班班次，增加班次
1691   - tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
1692   - jhlcOrig = scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
1693   -
1694   - if (scheduleRealInfo.isSflj()) {
1695   - addMileage += tempJhlc;
1696   - if (scheduleRealInfo.getBcType().equals("in")
1697   - || scheduleRealInfo.getBcType().equals("out")) {
1698   - addMileageJc +=tempJhlc;
1699   - }else{
1700   - ljbc++;
1701   - addMileageYy +=tempJhlc;
1702   - }
1703   -
1704   - } else {
1705   - if (!(scheduleRealInfo.getBcType().equals("in")
1706   - || scheduleRealInfo.getBcType().equals("out"))) {
1707   - jhbc++;
1708   - jhlc += jhlcOrig;
1709   - if (scheduleRealInfo.getStatus() == -1) {
1710   - remMileage += jhlcOrig;
1711   - cjbc++;
1712   - }
1713   - }
1714   -
1715   - }
1716   - Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
1717   - //计算营运里程，空驶里程
1718   - if (childTaskPlans.isEmpty()) {
1719   - if (scheduleRealInfo.getBcType().equals("in") ||
1720   - scheduleRealInfo.getBcType().equals("out")) {
1721   - if (scheduleRealInfo.getStatus() != -1) {
1722   - jcclc += tempJhlc;
1723   - }
1724   -
1725   - }
1726   - //主任务 放空班次属于营运
1727   -// else if(scheduleRealInfo.getBcType().equals("venting")){
1728   -// ksgl += tempJhlc;
1729   -// }
1730   - else {
1731   - if (scheduleRealInfo.getStatus() != -1) {
1732   - yygl += tempJhlc;
1733   - }
1734   - }
1735   - } else {
1736   - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
1737   - while (it.hasNext()) {
1738   - ChildTaskPlan childTaskPlan = it.next();
1739   - if (childTaskPlan.getMileageType().equals("empty")) {
1740   - if (childTaskPlan.isDestroy()) {
1741   - remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
1742   - } else {
1743   - ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
1744   - }
1745   - } else {
1746   - if (childTaskPlan.isDestroy()) {
1747   - remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
1748   -// cjbc++;
1749   - } else {
1750   - yygl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
1751   - }
1752   - }
1753   - }
1754   - }
  1588 + List<ScheduleRealInfo> list=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
  1589 + List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
  1590 + for (int i = 0; i < list.size(); i++) {
  1591 + ScheduleRealInfo s=list.get(i);
  1592 + Set<ChildTaskPlan> cts = s.getcTasks();
  1593 + if(cts != null && cts.size() > 0){
  1594 + lists.add(s);
  1595 + }else{
  1596 + if(s.getZdsjActual()!=null){
  1597 + lists.add(s);
  1598 + }
1755 1599 }
1756 1600 }
1757   -
1758   - //yygl 包含了临加的营运公里 jcclc包含了临加的进出场里程
1759   - map.put("jhlc", format.format(jhlc));
1760   - map.put("remMileage", format.format(remMileage));
1761   - map.put("addMileage", format.format(addMileage));
1762   - map.put("yygl", format.format(yygl));
1763   - map.put("ksgl", format.format(ksgl));
1764   - map.put("realMileage", format.format(yygl + ksgl + jcclc));
1765   -// map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
1766   - map.put("jhbc", jhbc);
1767   - map.put("cjbc", cjbc);
1768   - map.put("ljbc", ljbc);
1769   - map.put("sjbc", jhbc - cjbc + ljbc);
1770   - map.put("jcclc", jcclc);
1771   - map.put("zkslc", format.format(ksgl + jcclc));
1772   -// map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
  1601 + double ksgl=culateService.culateKsgl(list);
  1602 + double sjgl=culateService.culateSjgl(lists);
  1603 + double jccgl=culateService.culateJccgl(lists);
  1604 + double ljgl=culateService.culateLjgl(lists);
  1605 +
  1606 + map.put("jhlc", Arith.add(culateService.culateJhgl(list),culateService.culateJhJccgl(list))); //计划里程
  1607 + map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
  1608 + map.put("addMileage", ljgl); //临加公里
  1609 + map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
  1610 + map.put("ksgl", ksgl);//空驶公里
  1611 + map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
  1612 +// map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
  1613 + map.put("jhbc", culateService.culateJhbc(list,""));
  1614 + map.put("cjbc", culateService.culateLbbc(list));
  1615 + map.put("ljbc", culateService.culateLjbc(lists,""));
  1616 + map.put("sjbc", culateService.culateJhbc(lists,"") - culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
  1617 + map.put("jcclc", jccgl);
  1618 + map.put("zkslc", Arith.add(ksgl,jccgl));
  1619 +// map.put("zkslc", format.format(ksgl + jcclc+addMileageJc));
1773 1620 return map;
1774   - }*/
  1621 + }
1775 1622  
1776   - public Map<String, Object> findKMBC(String jGh, String clZbh,
  1623 + public Map<String, Object> findKMBC_mh_2(String jGh, String clZbh,
1777 1624 String lpName, String date, String line) {
1778 1625 Map<String, Object> map = new HashMap<String, Object>();
1779 1626 List<ScheduleRealInfo> list=scheduleRealInfoRepository.queryListWaybillXcld(jGh, clZbh, lpName, date, line);
1780 1627 List<ScheduleRealInfo> lists=new ArrayList<ScheduleRealInfo>();
1781 1628 for (int i = 0; i < list.size(); i++) {
1782 1629 ScheduleRealInfo s=list.get(i);
  1630 + if(s.isDestroy() && s.isReissue()){
  1631 + s.setRemark("");
  1632 + s.setFcsjActual(s.getDfsj());
  1633 + s.setZdsjActual(s.getZdsj());
  1634 + s.setStatus(2);
  1635 + s.setJhlc(s.getJhlcOrig());
  1636 + }
  1637 +
1783 1638 Set<ChildTaskPlan> cts = s.getcTasks();
1784 1639 if(cts != null && cts.size() > 0){
1785   - lists.add(s);
  1640 + lists.add(s);
1786 1641 }else{
1787   - if(s.getZdsjActual()!=null){
1788   - lists.add(s);
1789   - }
  1642 + if(s.getZdsjActual()!=null){
  1643 + lists.add(s);
  1644 + }
1790 1645 }
1791 1646 }
1792 1647 double ksgl=culateService.culateKsgl(list);
... ... @@ -1905,63 +1760,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1905 1760  
1906 1761 return listMap;
1907 1762 }
1908   -
1909   - /* @Override
1910   - public List<ScheduleRealInfo> correctForm(String line, String startDate,
1911   - String endDate, String lpName, String code, String type) {
1912   - List<ScheduleRealInfo> list = scheduleRealInfoRepository.correctForm(line, startDate, endDate, lpName, code);
1913   -
1914   - if (type != null && type.length() != 0 && type.equals("export")) {
1915   - SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
1916   - sdfSimple = new SimpleDateFormat("yyyyMMdd");
1917   - List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
1918   - Map<String, Object> m = new HashMap<String, Object>();
1919   - ReportUtils ee = new ReportUtils();
1920   - m.put("dates", startDate + " 至 " + endDate);
1921   - List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
1922   - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
1923   - for (ScheduleRealInfo schedule : list) {
1924   - Map<String, Object> tempMap = new HashMap<String, Object>();
1925   - tempMap.put("xlName", schedule.getXlName() != null ? schedule.getXlName() : "");
1926   - tempMap.put("lpName", schedule.getLpName() != null ? schedule.getLpName() : "");
1927   - tempMap.put("clZbh", schedule.getClZbh() != null ? schedule.getClZbh() : "");
1928   - tempMap.put("jName", schedule.getjName() != null ? schedule.getjName() : "");
1929   - tempMap.put("sName", schedule.getsName() != null ? schedule.getsName() : "");
1930   - tempMap.put("fcsj", schedule.getFcsj() != null ? schedule.getFcsj() : "");
1931   - tempMap.put("fcsjActual", schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "");
1932   - tempMap.put("zdsj", schedule.getZdsj() != null ? schedule.getZdsj() : "");
1933   - tempMap.put("zdsjActual", schedule.getZdsjActual() != null ? schedule.getZdsjActual() : "");
1934   - if (schedule.getUpdateBy() != null) {
1935   - if (schedule.getUpdateBy().getName() != null)
1936   - tempMap.put("userName", schedule.getUpdateBy().getName());
1937   - else
1938   - tempMap.put("userName", "");
1939   - } else {
1940   - tempMap.put("userName", "");
1941   - }
1942   - if (schedule.getUpdateDate() != null) {
1943   - tempMap.put("updateDate", sdf.format(schedule.getUpdateDate()));
1944   - } else {
1945   - tempMap.put("updateDate", "");
1946   - }
1947   - tempMap.put("remarks", schedule.getRemarks() != null ? schedule.getRemarks() : "");
1948   - tempList.add(tempMap);
1949   - }
1950   - try {
1951   - listI.add(tempList.iterator());
1952   - String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
1953   - ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls",
1954   - path + "export/修正报表" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
1955   - } catch (Exception e) {
1956   - // TODO: handle exception
1957   - e.printStackTrace();
1958   - }
1959   - Map<String, Object> map = tempList.get(tempList.size() - 1);
1960   - System.out.println("tempMap:" + map);
1961   - }
1962   -
1963   - return list;
1964   - }*/
1965 1763  
1966 1764 @Override
1967 1765 public List<SchEditInfoDto> correctForm(String line,String date,String endDate,
... ... @@ -2141,32 +1939,112 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2141 1939 t.setAdjustExps("子");
2142 1940 listSchedule.add(t);
2143 1941 }
2144   - /* String sqlPc = "select * from bsth_c_s_child_task where schedule=" + s.getId() + " order by start_date ";
2145   - List<ScheduleRealInfo> lists = jdbcTemplate.query(sqlPc,
2146   - new RowMapper<ScheduleRealInfo>() {
2147   - @Override
2148   - public ScheduleRealInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
2149   - ScheduleRealInfo t = new ScheduleRealInfo();
2150   - if (rs.getInt("destroy") == 0) {
2151   - t.setFcsjActual(rs.getString("start_date"));
2152   - t.setZdsjActual(rs.getString("end_date"));
2153   - t.setJhlc(rs.getDouble("mileage"));
2154   - } else {
2155   - t.setFcsjActual("");
2156   - t.setZdsjActual("");
2157   - t.setJhlc(0.0);
2158   - }
2159   - t.setQdzName(rs.getString("start_station_name"));
2160   - t.setZdzName(rs.getString("end_station_name"));
2161   - t.setRemarks(rs.getString("remarks"));
2162   - t.setAdjustExps("子");
2163   - return t;
2164   - }
2165   - });
2166   - for (int j = 0; j < lists.size(); j++) {
2167   - ScheduleRealInfo t = lists.get(j);
  1942 + }
  1943 + }
  1944 +
  1945 + return listSchedule;
  1946 + }
  1947 +
  1948 + @Override
  1949 + public List<ScheduleRealInfo> queryListWaybill2(String jName, String clZbh,
  1950 + String lpName, String date, String line) {
  1951 + List<ScheduleRealInfo> listSchedule = new ArrayList<ScheduleRealInfo>();
  1952 + List<ScheduleRealInfo> list = null;
  1953 + list = scheduleRealInfoRepository.queryListWaybill(jName, clZbh, lpName, date, line);
  1954 + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm");
  1955 + String sqlMinYysj="select start_opt from bsth_c_line_config where "
  1956 + + " id = ("
  1957 + + "select max(id) from bsth_c_line_config where line ='"+BasicData.lineId2CodeMap.inverse().get(line) +"'"
  1958 + + ")";
  1959 + String minfcsj=jdbcTemplate.queryForObject(sqlMinYysj, String.class);
  1960 + String[] minSjs = minfcsj.split(":");
  1961 + Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]);
  1962 +
  1963 + for (int i = 0; i < list.size(); i++) {
  1964 + ScheduleRealInfo s=list.get(i);
  1965 + String[] fcsj= s.getFcsj().split(":");
  1966 + Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
  1967 +
  1968 + Long fscjT=0L;
  1969 + if(fcsjL<minSj){
  1970 + Calendar calendar = new GregorianCalendar();
  1971 + calendar.setTime(s.getScheduleDate());
  1972 + calendar.add(calendar.DATE,1);
  1973 + s.setScheduleDate(calendar.getTime());
  1974 + try {
  1975 + fscjT = sdf.parse(sdf.format(s.getScheduleDate())+" "+s.getFcsj()).getTime();
  1976 + } catch (ParseException e) {
  1977 + // TODO Auto-generated catch block
  1978 + e.printStackTrace();
  1979 + }
  1980 +
  1981 + }else{
  1982 + try {
  1983 + fscjT =sdf.parse(s.getScheduleDateStr()+" "+s.getFcsj()).getTime();
  1984 + } catch (ParseException e) {
  1985 + // TODO Auto-generated catch block
  1986 + e.printStackTrace();
  1987 + };
  1988 + }
  1989 + s.setFcsjT(fscjT);
  1990 + }
  1991 + Collections.sort(list, new ComparableReal());
  1992 + for (int i = 0; i < list.size(); i++) {
  1993 + ScheduleRealInfo s = list.get(i);
  1994 + s.setAdjustExps(i + 1 + "");
  1995 + String remarks = "";
  1996 + if (s.getRemarks() != null) {
  1997 + remarks += s.getRemarks();
  1998 + }
  1999 +
  2000 + Set<ChildTaskPlan> childTaskPlans = s.getcTasks();
  2001 + if (!childTaskPlans.isEmpty()) {
  2002 + s.setFcsjActual("");
  2003 + s.setZdsjActual("");
  2004 + s.setJhlc(0.0);
  2005 + }
  2006 +
  2007 + if (s.isDestroy()) {
  2008 + if(s.isReissue()){
  2009 + s.setFcsjActual(s.getDfsj());
  2010 + s.setZdsjActual(s.getZdsj());
  2011 + s.setRemarks("");
  2012 + s.setStatus(2);
  2013 + s.setJhlc(s.getJhlcOrig());
  2014 + }
  2015 + else{
  2016 + s.setFcsjActual("");
  2017 + s.setZdsjActual("");
  2018 + s.setJhlc(0.0);
  2019 + remarks += "(烂班)";
  2020 + s.setRemarks(remarks);
  2021 + }
  2022 + }
  2023 +
  2024 + listSchedule.add(s);
  2025 + //计算营运里程，空驶里程
  2026 + if (!childTaskPlans.isEmpty()) {
  2027 +// Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  2028 + List<ChildTaskPlan> listit=new ArrayList<ChildTaskPlan>(childTaskPlans);
  2029 + Collections.sort(listit, new ComparableChild());
  2030 + for (int j = 0; j < listit.size(); j++) {
  2031 + ScheduleRealInfo t = new ScheduleRealInfo();
  2032 + ChildTaskPlan childTaskPlan = listit.get(j);
  2033 + if (childTaskPlan.isDestroy()) {
  2034 + t.setFcsjActual("");
  2035 + t.setZdsjActual("");
  2036 + t.setJhlc(0.0);
  2037 + } else {
  2038 + t.setFcsjActual(childTaskPlan.getStartDate());
  2039 + t.setZdsjActual(childTaskPlan.getEndDate());
  2040 + t.setJhlc(Double.parseDouble(String.valueOf(childTaskPlan.getMileage())));
  2041 + }
  2042 + t.setQdzName(childTaskPlan.getStartStationName());
  2043 + t.setZdzName(childTaskPlan.getEndStationName());
  2044 + t.setRemarks(childTaskPlan.getRemarks());
  2045 + t.setAdjustExps("子");
2168 2046 listSchedule.add(t);
2169   - }*/
  2047 + }
2170 2048 }
2171 2049 }
2172 2050  
... ... @@ -2256,551 +2134,79 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2256 2134 return lMap;
2257 2135 }
2258 2136  
2259   - /* @Override
2260   - public List<Map<String, Object>> statisticsDaily(String line, String date,
  2137 + @Override
  2138 + public List<Map<String, Object>> statisticsDaily_mh_2(String line, String date,
2261 2139 String xlName, String type) {
2262   - List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
2263   - if (date.length() == 10)
2264   - list = scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
2265   - else if (date.length() == 7)
2266   - list = scheduleRealInfoRepository.scheduleByDateAndLine3(line, date);
2267   -
2268   -
2269   - List<Map<String, Object>> lMap = new ArrayList<Map<String, Object>>();
2270   - DecimalFormat format = new DecimalFormat("0.00");
2271   - double jhlc = 0, tempJhlc = 0, childMileage = 0,jhlcOrig=0;
2272   - 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;
2273   - //班次
2274   - 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;
2275   - int sj_0 = 6 * 60 + 31, sj_1 = 8 * 60 + 30, sj_2 = 16 * 60 + 1, sj_3 = 18 * 60;
2276   - int jhbc = 0, jhbc_m = 0, jhbc_a = 0;
2277   - int sjbc = 0, sjbc_m = 0, sjbc_a = 0;
2278   - int ljbc = 0, ljbc_m = 0, ljbc_a = 0;
2279   - int fzbc = 0, fzbc_m = 0, fzbc_a = 0;
2280   - int dtbc = 0, dtbc_m = 0, dtbc_a = 0;
2281   - int djg = 0, djg_m = 0, djg_a = 0, djg_time = 0;
2282   -
2283   - double jhlcZ = 0, tempJhlcZ = 0, childMileageZ = 0;
2284   - float sjglZ = 0f, ssglZ = 0f, ssgl_lzZ = 0f, ssgl_dmZ = 0f,
2285   - ssgl_gzZ = 0f, ssgl_jfZ = 0f, ssgl_zsZ = 0f, ssgl_qrZ = 0f, ssgl_qcZ = 0f,
2286   - ssgl_kxZ = 0f, ssgl_qhZ = 0f, ssgl_ywZ = 0f, ssgl_otherZ = 0f, ljglZ = 0f;
2287   - //班次
2288   - 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;
2289   - int jhbcZ = 0, jhbc_mZ = 0, jhbc_aZ = 0;
2290   - int sjbcZ = 0, sjbc_mZ = 0, sjbc_aZ = 0;
2291   - int ljbcZ = 0, ljbc_mZ = 0, ljbc_aZ = 0;
2292   - int fzbcZ = 0, fzbc_mZ = 0, fzbc_aZ = 0;
2293   - int dtbcZ = 0, dtbc_mZ = 0, dtbc_aZ = 0;
2294   - int djgZ = 0, djg_mZ = 0, djg_aZ = 0, djg_timeZ = 0;
2295   - Map<String, Object> map = null;
2296   -
2297   - double xgssgl=0,xgljgl=0,lj=0,cj=0;
2298   - for (int i = 0; i < list.size(); i++) {
2299   - ScheduleRealInfo scheduleRealInfo = list.get(i);
  2140 + List<Map<String, Object>> lMap= new ArrayList<Map<String, Object>>();
  2141 + List<ScheduleRealInfo>list_s=scheduleRealInfoRepository.scheduleByDateAndLine2(line, date);
  2142 + List<ScheduleRealInfo> lists =new ArrayList<ScheduleRealInfo>();
  2143 + for (int i = 0; i < list_s.size(); i++) {
  2144 + ScheduleRealInfo s=list_s.get(i);
  2145 + if(s.isDestroy() && s.isReissue()){
  2146 + s.setRemark("");
  2147 + s.setFcsjActual(s.getDfsj());
  2148 + s.setZdsjActual(s.getZdsj());
  2149 + s.setStatus(2);
  2150 + s.setJhlc(s.getJhlcOrig());
  2151 + }
2300 2152  
2301   - if (scheduleRealInfo != null) {
2302   - Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
2303   - //计算实际里程，少驶里程，计划里程=实际里程+少驶里程
2304   - if(!scheduleRealInfo.isSflj()){
2305   - jhlc += tempJhlc;
2306   - jhlcZ += tempJhlc;
2307   - }
2308   - if (childTaskPlans.isEmpty()) {
2309   - tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
2310   - jhlcOrig = scheduleRealInfo.getJhlcOrig() == null ? 0 : scheduleRealInfo.getJhlcOrig();
2311   -
2312   - if(jhlcOrig-tempJhlc>0){
2313   - xgssgl +=jhlcOrig-tempJhlc;
2314   - cj += jhlcOrig-tempJhlc;
2315   - }else{
2316   - xgljgl +=tempJhlc-jhlcOrig;
2317   - lj +=tempJhlc-jhlcOrig;
2318   - }
2319   - //临加公里
2320   - if (scheduleRealInfo.isSflj()) {
2321   - ljgl += tempJhlc;
2322   - ljglZ += tempJhlc;
2323   - }
2324   -
2325   - if (scheduleRealInfo.getStatus() == -1) {
2326   - ssgl += tempJhlc;
2327   - ssglZ += tempJhlc;
2328   - ssbc++;
2329   - ssbcZ++;
2330   - if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("路阻") != -1) {
2331   - ssgl_lz += tempJhlc;
2332   - ssgl_lzZ += tempJhlc;
2333   - ssbc_lz++;
2334   - ssbc_lzZ++;
2335   - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("吊慢") != -1) {
2336   - ssgl_dm += tempJhlc;
2337   - ssgl_dmZ += tempJhlc;
2338   - ssbc_dm++;
2339   - ssbc_dmZ++;
2340   - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("故障") != -1) {
2341   - ssgl_gz += tempJhlc;
2342   - ssgl_gzZ += tempJhlc;
2343   - ssbc_gz++;
2344   - ssbc_gzZ++;
2345   - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("纠纷") != -1) {
2346   - ssgl_jf += tempJhlc;
2347   - ssgl_jfZ += tempJhlc;
2348   - ssbc_jf++;
2349   - ssbc_jfZ++;
2350   - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("肇事") != -1) {
2351   - ssgl_zs += tempJhlc;
2352   - ssgl_zsZ += tempJhlc;
2353   - ssbc_zs++;
2354   - ssbc_zsZ++;
2355   - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺人") != -1) {
2356   - ssgl_qr += tempJhlc;
2357   - ssgl_qrZ += tempJhlc;
2358   - ssbc_qr++;
2359   - ssbc_qrZ++;
2360   - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("缺车") != -1) {
2361   - ssgl_qc += tempJhlc;
2362   - ssgl_qcZ += tempJhlc;
2363   - ssbc_qc++;
2364   - ssbc_qcZ++;
2365   - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("客稀") != -1) {
2366   - ssgl_kx += tempJhlc;
2367   - ssgl_kxZ += tempJhlc;
2368   - ssbc_kx++;
2369   - ssbc_kxZ++;
2370   - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("气候") != -1) {
2371   - ssgl_qh += tempJhlc;
2372   - ssgl_qhZ += tempJhlc;
2373   - ssbc_qh++;
2374   - ssbc_qhZ++;
2375   - } else if ((scheduleRealInfo.getRemarks() == null ? "" : scheduleRealInfo.getRemarks()).indexOf("援外") != -1) {
2376   - ssgl_yw += tempJhlc;
2377   - ssgl_ywZ += tempJhlc;
2378   - ssbc_yw++;
2379   - ssbc_ywZ++;
2380   - } else {
2381   - ssgl_other += tempJhlc;
2382   - ssgl_otherZ += tempJhlc;
2383   - ssbc_other++;
2384   - ssbc_otherZ++;
2385   - }
2386   - } else {
2387   - sjgl += tempJhlc;
2388   - sjglZ += tempJhlc;
2389   - }
2390   - } else {
2391   - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
2392   - while (it.hasNext()) {
2393   - ChildTaskPlan childTaskPlan = it.next();
2394   - childMileage = childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
2395   - if (childTaskPlan.isDestroy()) {
2396   - ssgl += childMileage;
2397   - ssglZ += childMileage;
2398   - ssbc++;
2399   - ssbcZ++;
2400   - if (childTaskPlan.getDestroyReason().equals("路阻")) {
2401   - ssgl_lz += childTaskPlan.getMileage();
2402   - ssgl_lzZ += childTaskPlan.getMileage();
2403   - ssbc_lzZ++;
2404   - ssbc_lzZ++;
2405   - } else if (childTaskPlan.getDestroyReason().equals("吊慢")) {
2406   - ssgl_dm += childTaskPlan.getMileage();
2407   - ssgl_dmZ += childTaskPlan.getMileage();
2408   - ssbc_dm++;
2409   - ssbc_dmZ++;
2410   - } else if (childTaskPlan.getDestroyReason().equals("故障")) {
2411   - ssgl_gz += childTaskPlan.getMileage();
2412   - ssgl_gzZ += childTaskPlan.getMileage();
2413   - ssbc_gz++;
2414   - ssbc_gzZ++;
2415   - } else if (childTaskPlan.getDestroyReason().equals("纠纷")) {
2416   - ssgl_jf += childTaskPlan.getMileage();
2417   - ssgl_jfZ += childTaskPlan.getMileage();
2418   - ssbc_jf++;
2419   - ssbc_jfZ++;
2420   - } else if (childTaskPlan.getDestroyReason().equals("肇事")) {
2421   - ssgl_zs += childTaskPlan.getMileage();
2422   - ssgl_zsZ += childTaskPlan.getMileage();
2423   - ssbc_zs++;
2424   - ssbc_zsZ++;
2425   - } else if (childTaskPlan.getDestroyReason().equals("缺人")) {
2426   - ssgl_qr += childTaskPlan.getMileage();
2427   - ssgl_qrZ += childTaskPlan.getMileage();
2428   - ssbc_qr++;
2429   - ssbc_qrZ++;
2430   - } else if (childTaskPlan.getDestroyReason().equals("缺车")) {
2431   - ssgl_qc += childTaskPlan.getMileage();
2432   - ssgl_qcZ += childTaskPlan.getMileage();
2433   - ssbc_qc++;
2434   - ssbc_qcZ++;
2435   - } else if (childTaskPlan.getDestroyReason().equals("客稀")) {
2436   - ssgl_kx += childTaskPlan.getMileage();
2437   - ssgl_kxZ += childTaskPlan.getMileage();
2438   - ssbc_kx++;
2439   - ssbc_kxZ++;
2440   - } else if (childTaskPlan.getDestroyReason().equals("气候")) {
2441   - ssgl_qh += childTaskPlan.getMileage();
2442   - ssgl_qhZ += childTaskPlan.getMileage();
2443   - ssbc_qh++;
2444   - ssbc_qhZ++;
2445   - } else if (childTaskPlan.getDestroyReason().equals("援外")) {
2446   - ssgl_yw += childTaskPlan.getMileage();
2447   - ssgl_ywZ += childTaskPlan.getMileage();
2448   - ssbc_yw++;
2449   - ssbc_ywZ++;
2450   - } else {
2451   - ssgl_other += childTaskPlan.getMileage();
2452   - ssgl_otherZ += childTaskPlan.getMileage();
2453   - ssbc_other++;
2454   - ssbc_otherZ++;
2455   - }
2456   - } else {
2457   - if (scheduleRealInfo.isSflj()) {
2458   - ljgl += tempJhlc;
2459   - ljglZ += tempJhlc;
2460   - } else{
2461   - sjgl += childMileage;
2462   - sjglZ += childMileage;
2463   - }
2464   - }
2465   - }
2466   - }
2467   -
2468   - //班次
2469   - jhbc++;
2470   - jhbcZ++;
2471   - String[] fcsj = scheduleRealInfo.getFcsj().split(":");
2472   - String[] fcsjActual = (scheduleRealInfo.getFcsjActual() == null ? "0:00" : scheduleRealInfo.getFcsjActual()).split(":");
2473   - if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_0 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_1) {
2474   - jhbc_m++;
2475   - jhbc_mZ++;
2476   - } else if ((Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) > sj_2 && (Integer.parseInt(fcsj[0]) * 60 + Integer.parseInt(fcsj[1])) < sj_3) {
2477   - jhbc_a++;
2478   - jhbc_aZ++;
2479   - }
2480   - if (scheduleRealInfo.getStatus() != -1) {
2481   - sjbc++;
2482   - sjbcZ++;
2483   - if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
2484   - sjbc_m++;
2485   - sjbc_mZ++;
2486   - } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
2487   - sjbc_a++;
2488   - sjbc_aZ++;
2489   - }
2490   - }
2491   - if (scheduleRealInfo.isSflj()) {
2492   - ljbc++;
2493   - ljbcZ++;
2494   - if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
2495   - ljbc_m++;
2496   - ljbc_mZ++;
2497   - } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
2498   - ljbc_a++;
2499   - ljbc_aZ++;
2500   - }
2501   - }
2502   - if (scheduleRealInfo.getBcType().equals("venting")) {
2503   - fzbc++;
2504   - fzbcZ++;
2505   - if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_0 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_1) {
2506   - fzbc_m++;
2507   - fzbc_mZ++;
2508   - } else if ((Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) > sj_2 && (Integer.parseInt(fcsjActual[0]) * 60 + Integer.parseInt(fcsjActual[1])) < sj_3) {
2509   - fzbc_a++;
2510   - fzbc_aZ++;
2511   - }
2512   - }
2513   -
2514   - if (i < list.size() - 1) {
2515   - if (!scheduleRealInfo.getXlBm().equals(list.get(i + 1).getXlBm())) {
2516   - map = new HashMap<String, Object>();
2517   - map.put("xlName", scheduleRealInfo.getXlName());
2518   - map.put("jhlc", format.format(jhlc));
2519   - map.put("sjgl", format.format(sjgl));
2520   - map.put("ssgl", format.format(ssgl+cj));
2521   - map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
2522   - map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
2523   - map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
2524   - map.put("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));
2525   - map.put("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));
2526   - map.put("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));
2527   - map.put("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));
2528   - map.put("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));
2529   - map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
2530   - map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
2531   - map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
2532   - map.put("ssbc", ssbc);
2533   - map.put("ssbc_lz", ssbc_lz);
2534   - map.put("ssbc_dm", ssbc_dm);
2535   - map.put("ssbc_gz", ssbc_gz);
2536   - map.put("ssbc_jf", ssbc_jf);
2537   - map.put("ssbc_zs", ssbc_zs);
2538   - map.put("ssbc_qr", ssbc_qr);
2539   - map.put("ssbc_qc", ssbc_qc);
2540   - map.put("ssbc_kx", ssbc_kx);
2541   - map.put("ssbc_qh", ssbc_qh);
2542   - map.put("ssbc_yw", ssbc_yw);
2543   - map.put("ssbc_other", ssbc_other);
2544   - map.put("ljgl", format.format(ljgl+lj));
2545   - map.put("jhbc", jhbc);
2546   - map.put("jhbc_m", jhbc_m);
2547   - map.put("jhbc_a", jhbc_a);
2548   - map.put("sjbc", sjbc);
2549   - map.put("sjbc_m", sjbc_m);
2550   - map.put("sjbc_a", sjbc_a);
2551   - map.put("ljbc", ljbc);
2552   - map.put("ljbc_m", ljbc_m);
2553   - map.put("ljbc_a", ljbc_a);
2554   - map.put("fzbc", fzbc);
2555   - map.put("fzbc_m", fzbc_m);
2556   - map.put("fzbc_a", fzbc_a);
2557   - map.put("dtbc", dtbc);
2558   - map.put("dtbc_m", dtbc_m);
2559   - map.put("dtbc_a", dtbc_a);
2560   - map.put("djg", djg);
2561   - map.put("djg_m", djg_m);
2562   - map.put("djg_a", djg_a);
2563   - map.put("djg_time", djg_time);
2564   - lMap.add(map);
2565   - jhlc = 0;
2566   - tempJhlc = 0;
2567   - childMileage = 0;
2568   - sjgl = 0f;
2569   - ssgl = 0f;
2570   - ssgl_lz = 0f;
2571   - ssgl_dm = 0f;
2572   - ssgl_gz = 0f;
2573   - ssgl_jf = 0f;
2574   - ssgl_zs = 0f;
2575   - ssgl_qr = 0f;
2576   - ssgl_qc = 0f;
2577   - ssgl_kx = 0f;
2578   - ssgl_qh = 0f;
2579   - ssgl_yw = 0f;
2580   - ssgl_other = 0f;
2581   - ljgl = 0f;
2582   - //班次
2583   - jhbc = 0;
2584   - jhbc_m = 0;
2585   - jhbc_a = 0;
2586   - sjbc = 0;
2587   - sjbc_m = 0;
2588   - sjbc_a = 0;
2589   - ljbc = 0;
2590   - ljbc_m = 0;
2591   - ljbc_a = 0;
2592   - fzbc = 0;
2593   - fzbc_m = 0;
2594   - fzbc_a = 0;
2595   - dtbc = 0;
2596   - dtbc_m = 0;
2597   - dtbc_a = 0;
2598   - djg = 0;
2599   - djg_m = 0;
2600   - djg_a = 0;
2601   - djg_time = 0;
2602   - lj=0;
2603   - cj=0;
2604   - }
2605   - } else {
2606   - map = new HashMap<String, Object>();
2607   - map.put("xlName", scheduleRealInfo.getXlName());
2608   - map.put("jhlc", format.format(jhlc));
2609   - map.put("sjgl", format.format(sjgl));
2610   - map.put("ssgl", format.format(ssgl+cj));
2611   - map.put("ssgl_lz", ssgl_lz == 0 ? 0 : format.format(ssgl_lz));
2612   - map.put("ssgl_dm", ssgl_dm == 0 ? 0 : format.format(ssgl_dm));
2613   - map.put("ssgl_gz", ssgl_gz == 0 ? 0 : format.format(ssgl_gz));
2614   - map.put("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));
2615   - map.put("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));
2616   - map.put("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));
2617   - map.put("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));
2618   - map.put("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));
2619   - map.put("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
2620   - map.put("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
2621   - map.put("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
2622   - map.put("ssbc", ssbc);
2623   - map.put("ssbc_lz", ssbc_lz);
2624   - map.put("ssbc_dm", ssbc_dm);
2625   - map.put("ssbc_gz", ssbc_gz);
2626   - map.put("ssbc_jf", ssbc_jf);
2627   - map.put("ssbc_zs", ssbc_zs);
2628   - map.put("ssbc_qr", ssbc_qr);
2629   - map.put("ssbc_qc", ssbc_qc);
2630   - map.put("ssbc_kx", ssbc_kx);
2631   - map.put("ssbc_qh", ssbc_qh);
2632   - map.put("ssbc_yw", ssbc_yw);
2633   - map.put("ssbc_other", ssbc_other);
2634   - map.put("ljgl", format.format(ljgl+lj));
2635   - map.put("jhbc", jhbc);
2636   - map.put("jhbc_m", jhbc_m);
2637   - map.put("jhbc_a", jhbc_a);
2638   - map.put("sjbc", sjbc);
2639   - map.put("sjbc_m", sjbc_m);
2640   - map.put("sjbc_a", sjbc_a);
2641   - map.put("ljbc", ljbc);
2642   - map.put("ljbc_m", ljbc_m);
2643   - map.put("ljbc_a", ljbc_a);
2644   - map.put("fzbc", fzbc);
2645   - map.put("fzbc_m", fzbc_m);
2646   - map.put("fzbc_a", fzbc_a);
2647   - map.put("dtbc", dtbc);
2648   - map.put("dtbc_m", dtbc_m);
2649   - map.put("dtbc_a", dtbc_a);
2650   - map.put("djg", djg);
2651   - map.put("djg_m", djg_m);
2652   - map.put("djg_a", djg_a);
2653   - map.put("djg_time", djg_time);
2654   - lMap.add(map);
2655   - jhlc = 0;
2656   - tempJhlc = 0;
2657   - childMileage = 0;
2658   - sjgl = 0f;
2659   - ssgl = 0f;
2660   - ssgl_lz = 0f;
2661   - ssgl_dm = 0f;
2662   - ssgl_gz = 0f;
2663   - ssgl_jf = 0f;
2664   - ssgl_zs = 0f;
2665   - ssgl_qr = 0f;
2666   - ssgl_qc = 0f;
2667   - ssgl_kx = 0f;
2668   - ssgl_qh = 0f;
2669   - ssgl_yw = 0f;
2670   - ssgl_other = 0f;
2671   - ljgl = 0f;
2672   - //班次
2673   - jhbc = 0;
2674   - jhbc_m = 0;
2675   - jhbc_a = 0;
2676   - sjbc = 0;
2677   - sjbc_m = 0;
2678   - sjbc_a = 0;
2679   - ljbc = 0;
2680   - ljbc_m = 0;
2681   - ljbc_a = 0;
2682   - fzbc = 0;
2683   - fzbc_m = 0;
2684   - fzbc_a = 0;
2685   - dtbc = 0;
2686   - dtbc_m = 0;
2687   - dtbc_a = 0;
2688   - djg = 0;
2689   - djg_m = 0;
2690   - djg_a = 0;
2691   - djg_time = 0;
2692   - lj=0;
2693   - cj=0;
  2153 + Set<ChildTaskPlan> cts = s.getcTasks();
  2154 + if(cts != null && cts.size() > 0){
  2155 + lists.add(s);
  2156 + }else{
  2157 + if(s.getZdsjActual()!=null){
  2158 + lists.add(s);
2694 2159 }
2695 2160 }
2696 2161 }
2697   - map = new HashMap<String, Object>();
2698   - map.put("xlName", "合计");
2699   - map.put("jhlc", format.format(jhlcZ));
2700   - map.put("sjgl", format.format(sjglZ));
2701   - map.put("ssgl", format.format(ssglZ+xgssgl));
2702   - map.put("ssgl_lz", ssgl_lzZ == 0 ? 0 : format.format(ssgl_lzZ));
2703   - map.put("ssgl_dm", ssgl_dmZ == 0 ? 0 : format.format(ssgl_dmZ));
2704   - map.put("ssgl_gz", ssgl_gzZ == 0 ? 0 : format.format(ssgl_gzZ));
2705   - map.put("ssgl_jf", ssgl_jfZ == 0 ? 0 : format.format(ssgl_jfZ));
2706   - map.put("ssgl_zs", ssgl_zsZ == 0 ? 0 : format.format(ssgl_zsZ));
2707   - map.put("ssgl_qr", ssgl_qrZ == 0 ? 0 : format.format(ssgl_qrZ));
2708   - map.put("ssgl_qc", ssgl_qcZ == 0 ? 0 : format.format(ssgl_qcZ));
2709   - map.put("ssgl_kx", ssgl_kxZ == 0 ? 0 : format.format(ssgl_kxZ));
2710   - map.put("ssgl_qh", ssgl_qhZ == 0 ? 0 : format.format(ssgl_qhZ));
2711   - map.put("ssgl_yw", ssgl_ywZ == 0 ? 0 : format.format(ssgl_ywZ));
2712   - map.put("ssgl_other", ssgl_otherZ == 0 ? 0 : format.format(ssgl_otherZ));
2713   - map.put("ssbc", ssbcZ);
2714   - map.put("ssbc_lz", ssbc_lzZ);
2715   - map.put("ssbc_dm", ssbc_lzZ);
2716   - map.put("ssbc_gz", ssbc_gzZ);
2717   - map.put("ssbc_jf", ssbc_jfZ);
2718   - map.put("ssbc_zs", ssbc_zsZ);
2719   - map.put("ssbc_qr", ssbc_qrZ);
2720   - map.put("ssbc_qc", ssbc_qcZ);
2721   - map.put("ssbc_kx", ssbc_qcZ);
2722   - map.put("ssbc_qh", ssbc_qhZ);
2723   - map.put("ssbc_yw", ssbc_ywZ);
2724   - map.put("ssbc_other", ssbc_otherZ);
2725   - map.put("ljgl", format.format(ljglZ+xgljgl));
2726   - map.put("jhbc", jhbcZ);
2727   - map.put("jhbc_m", jhbc_mZ);
2728   - map.put("jhbc_a", jhbc_aZ);
2729   - map.put("sjbc", sjbcZ);
2730   - map.put("sjbc_m", sjbc_mZ);
2731   - map.put("sjbc_a", sjbc_aZ);
2732   - map.put("ljbc", ljbcZ);
2733   - map.put("ljbc_m", ljbc_mZ);
2734   - map.put("ljbc_a", ljbc_aZ);
2735   - map.put("fzbc", fzbcZ);
2736   - map.put("fzbc_m", fzbc_mZ);
2737   - map.put("fzbc_a", fzbc_aZ);
2738   - map.put("dtbc", dtbcZ);
2739   - map.put("dtbc_m", dtbc_mZ);
2740   - map.put("dtbc_a", dtbc_aZ);
2741   - map.put("djg", djgZ);
2742   - map.put("djg_m", djg_mZ);
2743   - map.put("djg_a", djg_aZ);
2744   - map.put("djg_time", djg_timeZ);
  2162 + Map<String, Object> map = new HashMap<String, Object>();
  2163 + map.put("xlName", xlName);
  2164 + double jhlc=culateService.culateJhgl(list_s);
  2165 + map.put("jhlc",jhlc);
  2166 + map.put("sjgl", Arith.add(culateService.culateSjgl(lists),culateService.culateLjgl(lists)));
  2167 + double lbgl=culateService.culateLbgl(list_s);
  2168 + map.put("ssgl", lbgl);
  2169 + map.put("ssgl_lz", culateService.culateCJLC(list_s, "路阻"));
  2170 + map.put("ssgl_dm", culateService.culateCJLC(list_s, "吊慢"));
  2171 + map.put("ssgl_gz", culateService.culateCJLC(list_s, "故障"));
  2172 + map.put("ssgl_jf", culateService.culateCJLC(list_s, "纠纷"));
  2173 + map.put("ssgl_zs", culateService.culateCJLC(list_s, "肇事"));
  2174 + map.put("ssgl_qr", culateService.culateCJLC(list_s, "缺人"));
  2175 + map.put("ssgl_qc", culateService.culateCJLC(list_s, "缺车"));
  2176 + map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));
  2177 + map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));
  2178 + map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));
  2179 + double ssgl_pc=culateService.culateCJLC(list_s, "配车");
  2180 + double ssgl_by=culateService.culateCJLC(list_s, "保养");
  2181 + double ssgl_cj=culateService.culateCJLC(list_s, "抽减");
  2182 + double ssgl_qt=culateService.culateCJLC(list_s, "其他");
  2183 + map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
  2184 + map.put("ssbc", culateService.culateLbbc(list_s));
  2185 + double ljgl=culateService.culateLjgl(lists);
  2186 + map.put("ljgl", ljgl);
  2187 + map.put("jhbc", culateService.culateJhbc(list_s,""));
  2188 + map.put("jhbc_m", culateService.culateJhbc(list_s, "zgf"));
  2189 + map.put("jhbc_a", culateService.culateJhbc(list_s, "wgf"));
  2190 + map.put("sjbc", culateService.culateSjbc(lists,""));
  2191 + map.put("sjbc_m", culateService.culateSjbc(lists,"zgf"));
  2192 + map.put("sjbc_a", culateService.culateSjbc(lists,"wgf"));
  2193 + map.put("ljbc", culateService.culateLjbc(lists,""));
  2194 + map.put("ljbc_m", culateService.culateLjbc(lists,"zgf"));
  2195 + map.put("ljbc_a", culateService.culateLjbc(lists,"wgf"));
  2196 + map.put("fzbc", culateService.culateFzbc(lists, ""));
  2197 + map.put("fzbc_m", culateService.culateFzbc(lists, "zgf"));
  2198 + map.put("fzbc_a", culateService.culateFzbc(lists, "wgf"));
  2199 + map.put("dtbc", 0);
  2200 + map.put("dtbc_m", 0);
  2201 + map.put("dtbc_a", 0);
  2202 + map.put("djg", 0);
  2203 + map.put("djg_m", 0);
  2204 + map.put("djg_a", 0);
  2205 + map.put("djg_time", 0);
  2206 + map.put("jls", Arith.sub(Arith.add(jhlc, ljgl), lbgl));
2745 2207 lMap.add(map);
2746   - for (int i = 0; i < lMap.size(); i++) {
2747   - Map<String, Object> m=lMap.get(i);
2748   -// m.get(""))
2749   - jhlc += Double.parseDouble(m.get("jhlc").toString());
2750   - sjgl += Double.parseDouble(m.get("sjgl").toString());
2751   - ssgl += Double.parseDouble( m.get("ssgl").toString());
2752   - ssgl_lz += Double.parseDouble( m.get("ssgl_lz").toString());
2753   - ssgl_dm += Double.parseDouble(m.get("ssgl_dm").toString());
2754   - ssgl_gz += Double.parseDouble( m.get("ssgl_gz").toString());
2755   - ssgl_jf += m.get("ssgl_jf", ssgl_jf == 0 ? 0 : format.format(ssgl_jf));
2756   - m.get("ssgl_zs", ssgl_zs == 0 ? 0 : format.format(ssgl_zs));
2757   - m.get("ssgl_qr", ssgl_qr == 0 ? 0 : format.format(ssgl_qr));
2758   - m.get("ssgl_qc", ssgl_qc == 0 ? 0 : format.format(ssgl_qc));
2759   - m.get("ssgl_kx", ssgl_kx == 0 ? 0 : format.format(ssgl_kx));
2760   - m.get("ssgl_qh", ssgl_qh == 0 ? 0 : format.format(ssgl_qh));
2761   - m.get("ssgl_yw", ssgl_yw == 0 ? 0 : format.format(ssgl_yw));
2762   - m.get("ssgl_other", ssgl_other == 0 ? 0 : format.format(ssgl_other));
2763   - m.get("ljgl", ljgl == 0 ? 0 : format.format(ljgl));
2764   - m.get("jhbc", jhbc);
2765   - m.get("jhbc_m", jhbc_m);
2766   - m.get("jhbc_a", jhbc_a);
2767   - m.get("sjbc", sjbc);
2768   - m.get("sjbc_m", sjbc_m);
2769   - m.get("sjbc_a", sjbc_a);
2770   - m.get("ljbc", ljbc);
2771   - m.get("ljbc_m", ljbc_m);
2772   - m.get("ljbc_a", ljbc_a);
2773   - m.get("fzbc", fzbc);
2774   - m.get("fzbc_m", fzbc_m);
2775   - m.get("fzbc_a", fzbc_a);
2776   - m.get("dtbc", dtbc);
2777   - m.get("dtbc_m", dtbc_m);
2778   - m.get("dtbc_a", dtbc_a);
2779   - m.get("djg", djg);
2780   - m.get("djg_m", djg_m);
2781   - m.get("djg_a", djg_a);
2782   - m.get("djg_time", djg_time);
2783   - }
2784   -
2785   - if (type != null && type.length() != 0 && type.equals("export")) {
2786   - SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
2787   - sdfSimple = new SimpleDateFormat("yyyyMMdd");
2788   - List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
2789   - Map<String, Object> m = new HashMap<String, Object>();
2790   - ReportUtils ee = new ReportUtils();
2791   - try {
2792   - listI.add(lMap.iterator());
2793   - String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
2794   - ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls",
2795   - path + "export/统计日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
2796   - } catch (Exception e) {
2797   - // TODO: handle exception
2798   - e.printStackTrace();
2799   - }
2800   - }
2801   -
2802 2208 return lMap;
2803   - }*/
  2209 + }
2804 2210  
2805 2211 public final Map<String, Object> staticTj(List<ScheduleRealInfo> list){
2806 2212  
... ... @@ -3094,15 +2500,93 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3094 2500  
3095 2501 @Override
3096 2502 public List<ScheduleRealInfo> realScheduleList(String line, String date) {
3097   - /*List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.queryUserInfo(line, date);
3098   - List<ScheduleRealInfo> listTotal = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
3099   - for(ScheduleRealInfo info:listInfo){
3100   - for(ScheduleRealInfo total:listTotal){
3101   - if(info.getjGh().equals(total.getjGh()) && info.getLpName().equals(total.getLpName()) && info.getClZbh().equals(total.getClZbh())){
  2503 + List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
  2504 + String lpName = "lpName";
  2505 + String zdsj = "";
  2506 + String zdsjActual = "";
  2507 + String zdsj1 = "";
  2508 + String zdsjActual1 = "";
  2509 + List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleByDateAndLineQp(line, date);
  2510 + for (int i = 0; i < listInfo.size(); i++) {
  2511 + ScheduleRealInfo t = listInfo.get(i);
  2512 + if (!lpName.equals(t.getLpName())) {
  2513 + zdsjActual = t.getZdsjActual();
  2514 + zdsj = t.getZdsj();
  2515 + t.setZdsjActual("");
  2516 + t.setZdsj("");
  2517 + } else {
  2518 + zdsj1 = t.getZdsj();
  2519 + zdsjActual1 = t.getZdsjActual();
  2520 + t.setZdsjActual(zdsjActual);
  2521 + t.setZdsj(zdsj);
  2522 + zdsj = zdsj1;
  2523 + zdsjActual = zdsjActual1;
  2524 + }
  2525 + lpName = t.getLpName();
  2526 + list.add(t);
  2527 + }
3102 2528  
3103   - }
3104   - }
3105   - }*/
  2529 + List<ScheduleRealInfo> listInfo2 = scheduleRealInfoRepository.scheduleByDateAndLineQp2(line, date);
  2530 + List<ScheduleRealInfo> xList = new ArrayList<ScheduleRealInfo>();
  2531 + List<ScheduleRealInfo> yList = new ArrayList<ScheduleRealInfo>();
  2532 + List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>();
  2533 + List<ScheduleRealInfo> newList = new ArrayList<ScheduleRealInfo>();
  2534 + if (listInfo2.size() > 0) {
  2535 + int a = listInfo2.size() % 3;
  2536 + int b = listInfo2.size() / 3;
  2537 + int x = 0, y = 0;
  2538 + if (a == 2) {
  2539 + x = b + 1;
  2540 + y = x * 2;
  2541 + ;
  2542 + } else if (b == 1) {
  2543 + x = b + 1;
  2544 + y = x * 2 - 1;
  2545 + ;
  2546 + } else {
  2547 + x = b;
  2548 + y = 2 * x;
  2549 +
  2550 + }
  2551 + for (int i = 0; i < listInfo2.size(); i++) {
  2552 + ScheduleRealInfo s = listInfo2.get(i);
  2553 + if (i + 1 <= x) {
  2554 + xList.add(s);
  2555 + } else if ((i + 1) > x && (i + 1) <= y) {
  2556 + yList.add(s);
  2557 + } else {
  2558 + zList.add(s);
  2559 + }
  2560 + }
  2561 + for (int i = 0; i < x; i++) {
  2562 + newList.add(xList.get(i));
  2563 + if (yList.size() > i) {
  2564 + newList.add(yList.get(i));
  2565 + } else {
  2566 + newList.add(new ScheduleRealInfo());
  2567 + }
  2568 + if (zList.size() > i) {
  2569 + newList.add(zList.get(i));
  2570 + } else {
  2571 + newList.add(new ScheduleRealInfo());
  2572 + }
  2573 +
  2574 + }
  2575 + }
  2576 + for (int i = 0; i < newList.size(); i++) {
  2577 + ScheduleRealInfo t1 = newList.get(i);
  2578 + for (int j = 0; j < list.size(); j++) {
  2579 + ScheduleRealInfo t2 = list.get(j);
  2580 + if (t1.getId() == t2.getId()) {
  2581 + t1 = t2;
  2582 + }
  2583 + }
  2584 + }
  2585 + return newList;
  2586 + }
  2587 +
  2588 + @Override
  2589 + public List<ScheduleRealInfo> realScheduleList_mh_2(String line, String date) {
3106 2590 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
3107 2591 String lpName = "lpName";
3108 2592 String zdsj = "";
... ... @@ -3110,6 +2594,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3110 2594 String zdsj1 = "";
3111 2595 String zdsjActual1 = "";
3112 2596 List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.scheduleByDateAndLineQp(line, date);
  2597 +
  2598 + for(ScheduleRealInfo s : listInfo){
  2599 + if(s.isDestroy() && s.isReissue()){
  2600 + s.setRemark("");
  2601 + s.setFcsjActual(s.getDfsj());
  2602 + s.setZdsjActual(s.getZdsj());
  2603 + s.setStatus(2);
  2604 + s.setJhlc(s.getJhlcOrig());
  2605 + }
  2606 + }
  2607 +
3113 2608 for (int i = 0; i < listInfo.size(); i++) {
3114 2609 ScheduleRealInfo t = listInfo.get(i);
3115 2610 if (!lpName.equals(t.getLpName())) {
... ... @@ -3190,15 +2685,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3190 2685  
3191 2686 @Override
3192 2687 public List<ScheduleRealInfo> realScheduleListQp(String line, String date) {
3193   - /*List<ScheduleRealInfo> listInfo = scheduleRealInfoRepository.queryUserInfo(line, date);
3194   - List<ScheduleRealInfo> listTotal = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
3195   - for(ScheduleRealInfo info:listInfo){
3196   - for(ScheduleRealInfo total:listTotal){
3197   - if(info.getjGh().equals(total.getjGh()) && info.getLpName().equals(total.getLpName()) && info.getClZbh().equals(total.getClZbh())){
3198   -
3199   - }
3200   - }
3201   - }*/
3202 2688 List<ScheduleRealInfo> list = new ArrayList<ScheduleRealInfo>();
3203 2689 String lpName = "lpName";
3204 2690 String zdsj = "";
... ... @@ -3221,18 +2707,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3221 2707 zdsj = zdsj1;
3222 2708 zdsjActual = zdsjActual1;
3223 2709 }
3224   - /*if(i<listInfo.size()-1){
3225   - if(s.getLpName().equals(listInfo.get(i+1).getLpName())){
3226   - zdsj=s.getZdsj();
3227   - zdsjActual=s.getZdsjActual();
3228   - }else{
3229   - zdsj="";
3230   - zdsjActual="";
3231   - }
3232   - }else{
3233   - zdsj=s.getZdsj();
3234   - zdsjActual=s.getZdsjActual();
3235   - }*/
3236 2710  
3237 2711 lpName = t.getLpName();
3238 2712 list.add(t);
... ... @@ -3241,12 +2715,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3241 2715 }
3242 2716  
3243 2717 public List<Map<String, Object>> yesterdayDataList(String line, String date,String gsbm,String fgsbm,String jGh,String nbbm) {
3244   -// Arith arith=new Arith();
3245   - //前一天日期
3246   -// String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
3247   -// String date = "2016-09-20";
3248   -// System.out.println("shijian1:"+new Date());
3249   -
3250 2718 List<Map<String, Object>> yesterdayDataList = new ArrayList<Map<String, Object>>();
3251 2719 if(line.equals("")){
3252 2720 yesterdayDataList=scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm,nbbm);
... ... @@ -3279,67 +2747,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3279 2747 fage = false;
3280 2748 }
3281 2749 listS.add(scheduleRealInfo);
3282   -
3283   - /* if (scheduleRealInfo != null) {
3284   - //计划里程（主任务过滤掉临加班次），
3285   - //烂班里程（主任务烂班），
3286   - //临加里程（主任务临加），
3287   - //计划班次，烂班班次，增加班次
3288   - tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
3289   - if (scheduleRealInfo.isSflj()) {
3290   - if(scheduleRealInfo.getStatus() == -1){
3291   - addMileage =Arith.add(addMileage, tempJhlc);
3292   - }
3293   - } else {
3294   - if (!(scheduleRealInfo.getBcType().equals("in")
3295   - || scheduleRealInfo.getBcType().equals("out"))) {
3296   - jhlc =Arith.add(jhlc,tempJhlc);
3297   - }
3298   -
3299   - if (scheduleRealInfo.getStatus() == -1) {
3300   - remMileage =Arith.add(remMileage,tempJhlc);
3301   - }
3302   - }
3303   - Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
3304   - //计算营运里程，空驶里程
3305   - if (childTaskPlans.isEmpty()) {
3306   - if (scheduleRealInfo.getBcType().equals("in") ||
3307   - scheduleRealInfo.getBcType().equals("out")) {
3308   - if (scheduleRealInfo.getStatus() != -1) {
3309   - jcclc=Arith.add(jcclc,tempJhlc);
3310   - }
3311   - }
3312   - //主任务 放空班次属于营运
3313   - // else if(scheduleRealInfo.getBcType().equals("venting")){
3314   - // ksgl += tempJhlc;
3315   - // }
3316   - else {
3317   - if (scheduleRealInfo.getStatus() != -1) {
3318   - yygl=Arith.add(yygl,tempJhlc);
3319   - }
3320   - }
3321   - } else {
3322   - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
3323   - while (it.hasNext()) {
3324   - ChildTaskPlan childTaskPlan = it.next();
3325   - if (childTaskPlan.getMileageType().equals("empty")) {
3326   - if (childTaskPlan.isDestroy()) {
3327   - remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
3328   - } else {
3329   - ksgl += Arith.add(ksgl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
3330   - }
3331   - } else {
3332   - if (childTaskPlan.isDestroy()) {
3333   - remMileage=Arith.add(remMileage,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
3334   -
3335   - } else {
3336   - yygl=Arith.add(yygl,childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage());
3337   -
3338   - }
3339   - }
3340   - }
3341   - }
3342   - }*/
3343 2750 }
3344 2751 }
3345 2752  
... ... @@ -3802,10 +3209,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3802 3209 ) {
3803 3210 jcclc += tempJhlc;
3804 3211 }
3805   - //主任务 放空班次属于营运
3806   -// else if(scheduleRealInfo.getBcType().equals("venting")){
3807   -// ksgl += tempJhlc;
3808   -// }
3809 3212 else {
3810 3213 if (scheduleRealInfo.getStatus() != -1) {
3811 3214 if (scheduleRealInfo.isSflj()) {
... ... @@ -3973,86 +3376,6 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3973 3376 double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0,ljjcclc=0,jhjcclc=0;
3974 3377 double addMileage = 0, remMileage = 0, addgl = 0, remgl = 0;
3975 3378 Map<String, Object> map = new HashMap<String, Object>();
3976   - /* for (ScheduleRealInfo scheduleRealInfo : list) {
3977   - if (scheduleRealInfo != null) {
3978   - //计划里程（主任务过滤掉临加班次），
3979   - //烂班里程（主任务烂班），
3980   - //临加里程（主任务临加），
3981   - //计划班次，烂班班次，增加班次
3982   - double jh = 0, sj = 0;
3983   - tempJhlc = scheduleRealInfo.getJhlc() == null ? 0 : scheduleRealInfo.getJhlc();
3984   - if (scheduleRealInfo.isSflj()) {
3985   - if(!(scheduleRealInfo.getBcType().equals("in")
3986   - || scheduleRealInfo.getBcType().equals("out"))){
3987   - ljbc++;
3988   - }
3989   - } else {
3990   - if (!(scheduleRealInfo.getBcType().equals("in")
3991   - || scheduleRealInfo.getBcType().equals("out"))) {
3992   - jhbc++;
3993   - jh += tempJhlc;
3994   - }
3995   -
3996   - if (scheduleRealInfo.getStatus() == -1) {
3997   - remMileage += tempJhlc;
3998   - cjbc++;
3999   - }
4000   - }
4001   - Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
4002   - //计算营运里程，空驶里程
4003   - if (childTaskPlans.isEmpty()) {
4004   - if (scheduleRealInfo.getBcType().equals("in") ||
4005   - scheduleRealInfo.getBcType().equals("out")) {
4006   - if(scheduleRealInfo.getStatus() != -1){
4007   - if(scheduleRealInfo.isSflj()){
4008   - ljjcclc += tempJhlc;
4009   - }else{
4010   - jcclc += tempJhlc;
4011   - }
4012   - }
4013   - }else {
4014   - if (scheduleRealInfo.getStatus() != -1) {
4015   - if (scheduleRealInfo.isSflj()) {
4016   - addMileage += tempJhlc;
4017   - }
4018   - sj += tempJhlc;
4019   - }
4020   - }
4021   - } else {
4022   - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
4023   - while (it.hasNext()) {
4024   - ChildTaskPlan childTaskPlan = it.next();
4025   - if (childTaskPlan.getMileageType().equals("empty")) {
4026   - if (childTaskPlan.isDestroy()) {
4027   - remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
4028   - } else {
4029   - if (scheduleRealInfo.isSflj()) {
4030   - addMileage += tempJhlc;
4031   - }
4032   - ksgl += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
4033   - }
4034   - } else {
4035   - if (childTaskPlan.isDestroy()) {
4036   - remMileage += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
4037   -// cjbc++;
4038   - } else {
4039   - if (scheduleRealInfo.isSflj()) {
4040   - addMileage += tempJhlc;
4041   - }
4042   - sj += childTaskPlan.getMileage() == null ? 0 : childTaskPlan.getMileage();
4043   - }
4044   - }
4045   - }
4046   - }
4047   - jhlc += jh;
4048   - yygl += sj;
4049   - if (jh > sj) {
4050   - remgl += jh - sj;
4051   - } else if (sj > jh) {
4052   - addgl += sj - jh;
4053   - }
4054   - }
4055   - }*/
4056 3379 jhlc=culateMieageService.culateJhgl(lists);
4057 3380 jcclc=culateMieageService.culateJccgl(lists);
4058 3381 jhjcclc=culateMieageService.culateJhJccgl(lists);
... ...
src/main/resources/static/pages/forms/mh_sj/scheduleDaily/scheduleDaily_mh.html 0 → 100644
  View file @a7f7430
  1 +<style type="text/css">
  2 + .table-bordered {
  3 + border: 1px solid; }
  4 + .table-bordered > thead > tr > th,
  5 + .table-bordered > thead > tr > td,
  6 + .table-bordered > tbody > tr > th,
  7 + .table-bordered > tbody > tr > td,
  8 + .table-bordered > tfoot > tr > th,
  9 + .table-bordered > tfoot > tr > td {
  10 + border: 1px solid;
  11 + text-align: center; }
  12 + .table-bordered > thead > tr > th,
  13 + .table-bordered > thead > tr > td {
  14 + border-bottom-width: 2px; }
  15 +
  16 + .table > tbody + tbody {
  17 + border-top: 1px solid; }
  18 +
  19 + #forms > thead > tr> td >span{
  20 +
  21 + width: 5px;
  22 +word-wrap: break-word;
  23 +/* letter-spacing: 20px; */
  24 + }
  25 +
  26 + #forms tr> td >label{
  27 + word-break: keep-all;white-space:nowrap;
  28 + }
  29 +</style>
  30 +
  31 +<div class="page-head">
  32 + <div class="page-title">
  33 + <h1>调度日报</h1>
  34 + </div>
  35 +</div>
  36 +
  37 +<div class="row">
  38 + <div class="col-md-12">
  39 + <div class="portlet light porttlet-fit bordered">
  40 + <div class="portlet-title">
  41 + <form class="form-inline" action="">
  42 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_ddrb">
  43 + <span class="item-label" style="width: 80px;">公司: </span>
  44 + <select class="form-control" name="company" id="gsdmDdrb" style="width: 180px;"></select>
  45 + </div>
  46 + <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_ddrb">
  47 + <span class="item-label" style="width: 80px;">分公司: </span>
  48 + <select class="form-control" name="subCompany" id="fgsdmDdrb" style="width: 180px;"></select>
  49 + </div>
  50 + <div style="margin-top: 2px"></div>
  51 + <div style="display: inline-block;">
  52 + <span class="item-label" style="width: 80px;margin-left: 33px;">线路: </span>
  53 + <select class="form-control" name="line" id="line" style="width: 180px;"></select>
  54 + </div>
  55 + <div style="display: inline-block;margin-left: 24px;">
  56 + <span class="item-label" style="width: 80px;">&nbsp;时间: </span>
  57 + <input class="form-control" type="text" id="date" style="width: 180px;"/>
  58 + </div>
  59 + <div class="form-group">
  60 + <input class="btn btn-default" type="button" id="query" value="查询"/>
  61 +<!-- <input class="btn btn-default" type="button" id="month" value="按月查询"/> -->
  62 + <input class="btn btn-default" type="button" id="export" value="导出"/>
  63 + </div>
  64 + </form>
  65 + </div>
  66 + <div class="portlet-body">
  67 + <div class="table-container" id="ddrbBody" style="margin-top: 10px;overflow:auto;min-width: 906px">
  68 + <label>日期：<span id="rqxs"></span>&nbsp;&nbsp;&nbsp;&nbsp;早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
  69 + <br/><label>计划+临加-少驶=<span id="jls"></span>&nbsp;&nbsp;计算机实驶:<span id="jsjss"></span></label>
  70 + <table class="table table-bordered table-hover table-checkable" id="forms">
  71 + <thead>
  72 + <tr>
  73 + <th colspan="40">线路调度日报</th>
  74 + </tr>
  75 + <tr>
  76 + <td rowspan="3"><span >路线名</span></td>
  77 + <td colspan="16"><c>全日</c>营运里程（公里）</td>
  78 + <td colspan="15"><c>全日</c>营运班次</td>
  79 + <td colspan="9">大间隔情况</td>
  80 + </tr>
  81 + <tr>
  82 + <td rowspan="2"><span >计划</span></td>
  83 + <td rowspan="2"><span >实驶</span></td>
  84 + <td rowspan="2"><span>少驶公里</span></td>
  85 + <td rowspan="2"><span>少驶班次</span></td>
  86 + <td colspan="11">少驶原因（公里）</td>
  87 + <td rowspan="2"><span >临加公里</span></td>
  88 + <td colspan="3">计划班次</td>
  89 + <td colspan="3">实际班次</td>
  90 + <td colspan="3">临加班次</td>
  91 + <td colspan="3">放站班次</td>
  92 + <td colspan="3">调头班次</td>
  93 + <td colspan="3">发生次数</td>
  94 + <td rowspan="2">最大间隔时间（分）</td>
  95 + <td colspan="5" rowspan="2">原因</td>
  96 + </tr>
  97 + <tr>
  98 + <td><span >路阻</span></td>
  99 + <td><span>吊慢</span></td>
  100 + <td><span >故障</span></td>
  101 + <td><span >纠纷</span></td>
  102 + <td><span >肇事</span></td>
  103 + <td><span>缺人</span></td>
  104 + <td><span>缺车</span></td>
  105 + <td><span >客稀</span></td>
  106 + <td><span>气候</span></td>
  107 + <td><span>援外</span></td>
  108 + <td><span>其他</span></td>
  109 + <td><span ><c>全日</c></span></td>
  110 + <td><span >早高峰</span></td>
  111 + <td><span>晚高峰</span></td>
  112 + <td><span><c>全日</c></span></td>
  113 + <td><span>早高峰</span></td>
  114 + <td><span>晚高峰</span></td>
  115 + <td><span><c>全日</c></span></td>
  116 + <td><span>早高峰</span></td>
  117 + <td><span>晚高峰</span></td>
  118 + <td><span><c>全日</c></span></td>
  119 + <td><span>早高峰</span></td>
  120 + <td><span>晚高峰</span></td>
  121 + <td><span><c>全日</c></span></td>
  122 + <td><span>早高峰</span></td>
  123 + <td><span>晚高峰</span></td>
  124 + <td><span><c>全日</c></span></td>
  125 + <td><span>早高峰</span></td>
  126 + <td><span>晚高峰</span></td>
  127 + </tr>
  128 + </thead>
  129 +
  130 + <tbody class="scheduleDaily_1">
  131 +
  132 + </tbody>
  133 + <tr>
  134 + <td colspan="40">&nbsp;</td>
  135 + </tr>
  136 + <!-- <tr>
  137 + <td colspan="40">合计</td>
  138 + </tr>
  139 + <tr>
  140 + <td>售票</td>
  141 + <td colspan="2">1元</td>
  142 + <td colspan="2">2元</td>
  143 + <td colspan="2">3元</td>
  144 + <td colspan="2">4元</td>
  145 + <td colspan="2">5元</td>
  146 + <td colspan="2">6元</td>
  147 + <td colspan="2">7元</td>
  148 + <td colspan="2">8元</td>
  149 + <td colspan="2">9元</td>
  150 + <td colspan="2">10元</td>
  151 + <td colspan="2">&nbsp;</td>
  152 + <td colspan="2">合计张数</td>
  153 + <td colspan="2">&nbsp;</td>
  154 + <td colspan="2">预售票</td>
  155 + <td colspan="2">1元</td>
  156 + <td colspan="2">1.5元</td>
  157 + <td colspan="2">合计张数</td>
  158 + <td colspan="5">&nbsp;</td>
  159 + </tr>
  160 + <tr>
  161 + <td>张数</td>
  162 + <td colspan="2">&nbsp;</td>
  163 + <td colspan="2">&nbsp;</td>
  164 + <td colspan="2">&nbsp;</td>
  165 + <td colspan="2">&nbsp;</td>
  166 + <td colspan="2">&nbsp;</td>
  167 + <td colspan="2">&nbsp;</td>
  168 + <td colspan="2">&nbsp;</td>
  169 + <td colspan="2">&nbsp;</td>
  170 + <td colspan="2">&nbsp;</td>
  171 + <td colspan="2">&nbsp;</td>
  172 + <td colspan="2">&nbsp;</td>
  173 + <td colspan="2">合计金额</td>
  174 + <td colspan="2">&nbsp;</td>
  175 + <td colspan="2">张数</td>
  176 + <td colspan="2">&nbsp;</td>
  177 + <td colspan="2">&nbsp;</td>
  178 + <td colspan="2">合计金额</td>
  179 + <td colspan="5">&nbsp;</td>
  180 + </tr>
  181 + <tr>
  182 + <td colspan="40">&nbsp;</td>
  183 + </tr> -->
  184 + <tr>
  185 + <td colspan="2"><label>路牌</label></td>
  186 + <td colspan="2"><label>车号</label></td>
  187 + <td> <label>司早</label></td>
  188 + <td><label>售早</label></td>
  189 + <td><label>司晚</label></td>
  190 + <td><label>售晚</label></td>
  191 + <td colspan="2"><label>路牌</label></td>
  192 + <td colspan="2"><label>车号</label></td>
  193 + <td><label>司早</label></td>
  194 + <td><label>售早</label></td>
  195 + <td><label>司晚</label></td>
  196 + <td><label>售晚</label></td>
  197 + <td colspan="2"><label>路牌</label></td>
  198 + <td colspan="2"><label>车号</label></td>
  199 + <td><label>司早</label></td>
  200 + <td><label>售早</label></td>
  201 + <td><label>司晚</label></td>
  202 + <td><label>售晚</label></td>
  203 + <td colspan="2"><label>路牌</label></td>
  204 + <td colspan="2"><label>车号</label></td>
  205 + <td><label>司早</label></td>
  206 + <td><label>售早</label></td>
  207 + <td><label>司晚</label></td>
  208 + <td><label>售晚</label></td>
  209 + <td colspan="2"><label>路牌</label></td>
  210 + <td colspan="2"><label>车号</label></td>
  211 + <td><label>司早</label></td>
  212 + <td><label>售早</label></td>
  213 + <td><label>司晚</label></td>
  214 + <td><label>售晚</label></td>
  215 + </tr>
  216 + <tbody class="scheduleDaily_2">
  217 +
  218 + </tbody>
  219 + <tr>
  220 + <td colspan="40">&nbsp;</td>
  221 + </tr>
  222 + <tr>
  223 + <td rowspan="2">路牌</td>
  224 + <td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
  225 + <td colspan="4">到达时间</td>
  226 + <td colspan="4">发车时间</td>
  227 + <td colspan="2" rowspan="2">备注</td>
  228 + <td rowspan="2">路牌</td>
  229 + <td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
  230 + <td colspan="4">到达时间</td>
  231 + <td colspan="4">发车时间</td>
  232 + <td colspan="2" rowspan="2">备注</td>
  233 + <td rowspan="2">路牌</td>
  234 + <td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
  235 + <td colspan="4">到达时间</td>
  236 + <td colspan="4">发车时间</td>
  237 + <td colspan="2" rowspan="2">备注</td>
  238 + <td>&nbsp;</td>
  239 + </tr>
  240 + <tr>
  241 + <td>应到</td>
  242 + <td>实到</td>
  243 + <td>快</td>
  244 + <td>慢</td>
  245 + <td>应发</td>
  246 + <td>实发</td>
  247 + <td>快</td>
  248 + <td>慢</td>
  249 + <td>应到</td>
  250 + <td>实到</td>
  251 + <td>快</td>
  252 + <td>慢</td>
  253 + <td>应发</td>
  254 + <td>实发</td>
  255 + <td>快</td>
  256 + <td>慢</td>
  257 + <td>应到</td>
  258 + <td>实到</td>
  259 + <td>快</td>
  260 + <td>慢</td>
  261 + <td>应发</td>
  262 + <td>实发</td>
  263 + <td>快</td>
  264 + <td>慢</td>
  265 + <td>&nbsp;</td>
  266 + </tr>
  267 + <tbody class="scheduleDaily_3">
  268 +
  269 + </tbody>
  270 + </table>
  271 + </div>
  272 + </div>
  273 + </div>
  274 + </div>
  275 +</div>
  276 +
  277 +<script>
  278 + $(function(){
  279 + // 关闭左侧栏
  280 + if (!$('body').hasClass('page-sidebar-closed'))
  281 + $('.menu-toggler.sidebar-toggler').click();
  282 +
  283 + $("#date").datetimepicker({
  284 + format : 'YYYY-MM-DD',
  285 + locale : 'zh-cn'
  286 + });
  287 + var d = new Date();
  288 + var year = d.getFullYear();
  289 + var month = d.getMonth() + 1;
  290 + var day = d.getDate();
  291 + if(month < 10)
  292 + month = "0" + month;
  293 + if(day < 10)
  294 + day = "0" + day;
  295 + $("#date").val(year + "-" + month + "-" + day);
  296 +
  297 + $("#ddrbBody").height($(window).height()-100);
  298 + /* $.get('/basic/lineCode2Name',function(result){
  299 + var data=[];
  300 +
  301 + for(var code in result){
  302 + data.push({id: code, text: result[code]});
  303 + }
  304 + initPinYinSelect2('#line',data,'');
  305 +
  306 + }) */
  307 + var fage=false;
  308 + var obj = [];
  309 + var xlList;
  310 + $.get('/report/lineList',function(result){
  311 + xlList=result;
  312 + $.get('/user/companyData', function(result){
  313 + obj = result;
  314 + var options = '';
  315 + for(var i = 0; i < obj.length; i++){
  316 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  317 + }
  318 +
  319 + if(obj.length ==0){
  320 + $("#gsdmDiv_ddrb").css('display','none');
  321 + }else if(obj.length ==1){
  322 + $("#gsdmDiv_ddrb").css('display','none');
  323 + if(obj[0].children.length == 1 || obj[0].children.length ==0)
  324 + $('#fgsdmDiv_ddrb').css('display','none');
  325 + }
  326 + $('#gsdmDdrb').html(options);
  327 + updateCompany();
  328 + });
  329 + })
  330 + $("#gsdmDdrb").on("change",updateCompany);
  331 + function updateCompany(){
  332 + var company = $('#gsdmDdrb').val();
  333 + var options = '';
  334 + for(var i = 0; i < obj.length; i++){
  335 + if(obj[i].companyCode == company){
  336 + var children = obj[i].children;
  337 + for(var j = 0; j < children.length; j++){
  338 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
  339 + }
  340 + }
  341 + }
  342 + $('#fgsdmDdrb').html(options);
  343 + initXl();
  344 + }
  345 + $("#fgsdmDdrb").on("change",initXl);
  346 + function initXl(){
  347 + var data=[];
  348 + if(fage){
  349 + $("#line").select2("destroy").html('');
  350 + }
  351 + var fgs=$('#fgsdmDdrb').val();
  352 + var gs=$('#gsdmDdrb').val();
  353 + for(var i=0;i<xlList.length;i++){
  354 + if(gs!=""){
  355 + if(fgs!=""){
  356 + if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
  357 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  358 + }
  359 + }else{
  360 + if(xlList[i]["gsbm"]==gs){
  361 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  362 + }
  363 + }
  364 + }
  365 + }
  366 + initPinYinSelect2('#line',data,'');
  367 + fage=true;
  368 + }
  369 + $('#export').attr('disabled', "true");
  370 +
  371 + var line = $("#line").val();
  372 + var xlName = $("#select2-line-container").html();
  373 + var date = $("#date").val();
  374 +
  375 + function getTime(list){
  376 + $.each(list, function(i, obj) {
  377 + if(obj.zdsj != null && obj.zdsjActual != null ){
  378 + var zdsjActual = (obj.zdsjActual).split(":");
  379 + var zdsj = (obj.zdsj).split(":");
  380 + if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
  381 + obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
  382 + }
  383 + else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
  384 + obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
  385 + }
  386 + }
  387 +
  388 + if(obj.fcsj != null && obj.fcsjActual != null ){
  389 + var fcsjActual = (obj.fcsjActual).split(":");
  390 + var fcsj = (obj.fcsj).split(":");
  391 + if(fcsjActual[0]*60+Number(fcsjActual[1]) > fcsj[0]*60+Number(fcsj[1])){
  392 + obj["slow0"] = (fcsjActual[0]*60+Number(fcsjActual[1])) - (fcsj[0]*60+Number(fcsj[1]));
  393 + }
  394 + else if(fcsjActual[0]*60+Number(fcsjActual[1]) < fcsj[0]*60+Number(fcsj[1])){
  395 + obj["fast0"] = (fcsj[0]*60+Number(fcsj[1])) - (fcsjActual[0]*60+Number(fcsjActual[1]));
  396 + }
  397 + }
  398 + });
  399 + }
  400 + //查询
  401 + $("#query").on('click',function(){
  402 + line = $("#line").val();
  403 + xlName = $("#select2-line-container").html();
  404 + date = $("#date").val();
  405 + $("#rqxs").html(date);
  406 + if(date == null || date.length == 0){
  407 + layer.msg("请选择时间");
  408 + return;
  409 + }
  410 + $("#ddrbBody").height($(window).height()-100);
  411 + $("c").html("全日");
  412 + $("#export").removeAttr("disabled");
  413 + $get('/realSchedule/statisticsDaily_mh_2',{line:line,date:date,xlName:xlName,type:"query"},function(result){
  414 + var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
  415 + $("#jls").html(result[0].jls);
  416 + $("#jsjss").html(result[0].sjgl);
  417 + $('#forms .scheduleDaily_1').html(scheduleDaily_1);
  418 + });
  419 + $.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2,type:"query"},function(result){
  420 + var scheduleDaily_2 = template('scheduleDaily_2',{list:result});
  421 + $('#forms .scheduleDaily_2').html(scheduleDaily_2);
  422 + });
  423 + $.get('/realSchedule/realScheduleList_mh_2',{line:line,date:date,type:"query"},function(result){
  424 + getTime(result);
  425 + var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
  426 + $('#forms .scheduleDaily_3').html(scheduleDaily_3);
  427 + });
  428 +
  429 + });
  430 +
  431 + //按月查询
  432 + /* $("#month").on('click',function(){
  433 + line = $("#line").val();
  434 + xlName = $("#select2-line-container").html();
  435 + date = $("#date").val();
  436 + if(date == null || date.length == 0){
  437 + layer.msg("请选择时间");
  438 + return;
  439 + }
  440 + date = date.substring(0, 7);
  441 + $("c").html("全月");
  442 + $("#export").removeAttr("disabled");
  443 + $get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName,type:"query"},function(result){
  444 + var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
  445 + $('#forms .scheduleDaily_1').html(scheduleDaily_1);
  446 + });
  447 + $('#forms .scheduleDaily_2').html("");
  448 + $('#forms .scheduleDaily_3').html("");
  449 +
  450 + }); */
  451 +
  452 + $("#export").on("click",function(){
  453 + var params = {};
  454 + if(date == null || date.length == 0){
  455 + layer.msg("请选择时间");
  456 + return;
  457 + }
  458 + params['line'] = line;
  459 + params['date'] = date;
  460 + params['xlName'] = xlName;
  461 + params['type'] = "export";
  462 + params['state'] = '2';
  463 + $get('/realSchedule/scheduleDailyExport', params, function(result){
  464 + if(date.length == 10)
  465 + window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMMDD"));
  466 + else
  467 + window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMM"));
  468 + });
  469 + });
  470 +
  471 + });
  472 +</script>
  473 +<script type="text/html" id="scheduleDaily_1">
  474 + {{each list as obj i}}
  475 + <tr >
  476 + <td>{{obj.xlName}}</td>
  477 + <td>{{obj.jhlc}}</td>
  478 + <td>{{obj.sjgl}}</td>
  479 + <td>{{obj.ssgl}}</td>
  480 + <td>{{obj.ssbc}}</td>
  481 + <td>{{obj.ssgl_lz}}</td>
  482 + <td>{{obj.ssgl_dm}}</td>
  483 + <td>{{obj.ssgl_gz}}</td>
  484 + <td>{{obj.ssgl_jf}}</td>
  485 + <td>{{obj.ssgl_zs}}</td>
  486 + <td>{{obj.ssgl_qr}}</td>
  487 + <td>{{obj.ssgl_qc}}</td>
  488 + <td>{{obj.ssgl_kx}}</td>
  489 + <td>{{obj.ssgl_qh}}</td>
  490 + <td>{{obj.ssgl_yw}}</td>
  491 + <td>{{obj.ssgl_other}}</td>
  492 + <td>{{obj.ljgl}}</td>
  493 + <td>{{obj.jhbc}}</td>
  494 + <td>{{obj.jhbc_m}}</td>
  495 + <td>{{obj.jhbc_a}}</td>
  496 + <td>{{obj.sjbc}}</td>
  497 + <td>{{obj.sjbc_m}}</td>
  498 + <td>{{obj.sjbc_a}}</td>
  499 + <td>{{obj.ljbc}}</td>
  500 + <td>{{obj.ljbc_m}}</td>
  501 + <td>{{obj.ljbc_a}}</td>
  502 + <td>{{obj.fzbc}}</td>
  503 + <td>{{obj.fzbc_m}}</td>
  504 + <td>{{obj.fzbc_a}}</td>
  505 + <td>{{obj.dtbc}}</td>
  506 + <td>{{obj.dtbc_m}}</td>
  507 + <td>{{obj.dtbc_a}}</td>
  508 + <td>{{obj.djg}}</td>
  509 + <td>{{obj.djg_m}}</td>
  510 + <td>{{obj.djg_a}}</td>
  511 + <td>{{obj.djg_time}}</td>
  512 + <td colspan="5">&nbsp;</td>
  513 + </tr>
  514 + {{/each}}
  515 + {{if list.length == 0}}
  516 + <tr>
  517 + <td colspan="40"><h6 class="muted">没有找到相关数据</h6></td>
  518 + </tr>
  519 + {{/if}}
  520 +</script>
  521 +<script type="text/html" id="scheduleDaily_2">
  522 + {{each list as obj i}}
  523 + {{if i%5 == 0}}
  524 + <tr>
  525 + {{/if}}
  526 + <td colspan="2">{{obj[3]}}</td>
  527 + <td colspan="2">{{obj[2]}}</td>
  528 + <td>{{obj[1]}}/{{obj[4]}}</td>
  529 + <td>{{if obj[5] !=null}}
  530 + {{obj[5]}}/
  531 + {{obj[6]}}
  532 +
  533 + {{/if}}
  534 + </td>
  535 + <td>&nbsp;</td>
  536 + <td>&nbsp;</td>
  537 + {{if (i+1)%5 == 0}}
  538 + </tr>
  539 + {{/if}}
  540 + {{/each}}
  541 + {{if list.length == 0}}
  542 + <tr>
  543 + <td colspan="40"><h6 class="muted">没有找到相关数据</h6></td>
  544 + </tr>
  545 + {{/if}}
  546 +</script>
  547 +<script type="text/html" id="scheduleDaily_3">
  548 + {{each list as obj i}}
  549 + {{if i%3 == 0}}
  550 + <tr>
  551 + {{/if}}
  552 + <td>{{obj.lpName}}</td>
  553 + <td colspan="2" style="word-break: keep-all;white-space:nowrap;">{{obj.qdzName}}</td>
  554 + <td>{{obj.zdsj}}</td>
  555 + <td>{{obj.zdsjActual}}</td>
  556 + <td>{{obj.fast}}</td>
  557 + <td>{{obj.slow}}</td>
  558 + <td>{{obj.fcsj}}</td>
  559 + <td>{{obj.fcsjActual}}
  560 + {{if obj.bcType== "in"}}
  561 + (进)
  562 + {{/if}}
  563 + {{if obj.bcType== "out"}}
  564 + (出)
  565 + {{/if}}
  566 + </td>
  567 + <td>{{obj.fast0}}</td>
  568 + <td>{{obj.slow0}}
  569 +
  570 + </td>
  571 + <td colspan="2">{{obj.remarks}}</td>
  572 + {{if (i+1)%3 == 0}}
  573 + <td>&nbsp;</td>
  574 + </tr>
  575 + {{/if}}
  576 + {{/each}}
  577 + {{if list.length == 0}}
  578 + <tr>
  579 + <td colspan="40"><h6 class="muted">没有找到相关数据</h6></td>
  580 + </tr>
  581 + {{/if}}
  582 +</script>
0 583 \ No newline at end of file
... ...
src/main/resources/static/pages/forms/mh_sj/waybill/waybill_mh.html 0 → 100644
  View file @a7f7430
  1 +<style type="text/css">
  2 + .table-bordered {
  3 + border: 1px solid; }
  4 + .table-bordered > thead > tr > th,
  5 + .table-bordered > thead > tr > td,
  6 + .table-bordered > tbody > tr > th,
  7 + .table-bordered > tbody > tr > td,
  8 + .table-bordered > tfoot > tr > th,
  9 + .table-bordered > tfoot > tr > td {
  10 + border: 1px solid; }
  11 + .table-bordered > thead > tr > th,
  12 + .table-bordered > thead > tr > td {
  13 + border-bottom-width: 2px; }
  14 +
  15 + .table > tbody + tbody {
  16 + border-top: 1px solid; }
  17 +</style>
  18 +
  19 +<div class="page-head">
  20 + <div class="page-title">
  21 + <h1>行车路单</h1>
  22 + </div>
  23 +</div>
  24 +
  25 +<div class="row">
  26 + <div class="col-md-12">
  27 + <div class="portlet light porttlet-fit bordered">
  28 + <div class="portlet-title">
  29 + <form class="form-inline" action="">
  30 + <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_xcld">
  31 + <span class="item-label" style="width: 80px;">公司: </span>
  32 + <select class="form-control" name="company" id="gsdmXcld" style="width: 180px;"></select>
  33 + </div>
  34 + <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_xcld">
  35 + <span class="item-label" style="width: 80px;">分公司: </span>
  36 + <select class="form-control" name="subCompany" id="fgsdmXcld" style="width: 180px;"></select>
  37 + </div>
  38 + <div style="margin-top: 2px"></div>
  39 + <div style="display: inline-block; margin-left: 33px;">
  40 + <span class="item-label" style="width: 80px;">线路: </span>
  41 + <select class="form-control" name="line" id="line" style="width: 180px;"></select>
  42 + </div>
  43 + <div style="display: inline-block;margin-left: 24px;">
  44 + <span class="item-label" style="width: 80px;">&nbsp;时间: </span>
  45 + <input class="form-control" type="text" id="date" style="width: 180px;"/>
  46 + </div>
  47 + <div class="form-group" style="display: inline-block;margin-left: 15px;">
  48 + <input class="btn btn-default" type="button" id="query" value="查询"/>
  49 + <input class="btn btn-default" type="button" id="export" value="导出"/>
  50 + <input class="btn btn-default" type="button" id="print" value="打印"/>
  51 + <input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
  52 + </div>
  53 + </form>
  54 + </div>
  55 + <div class="portlet-body">
  56 + <div class="row">
  57 + <div class="col-md-3">
  58 + <div class="" id="left_height" style="margin-top: 10px;overflow:auto;">
  59 + <table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
  60 + <thead>
  61 + <tr class="hidden">
  62 + <th class="rypx" style="cursor:pointer ">人员</th>
  63 + <th class="zbhpx" style="cursor:pointer ">自编号</th>
  64 + <th class="lppx" style="cursor:pointer ">路牌</th>
  65 + </tr>
  66 + </thead>
  67 + <tbody>
  68 +
  69 + </tbody>
  70 + </table>
  71 + </div>
  72 + </div>
  73 + <div class="col-md-9" id="printArea">
  74 + <div class="table-container" id="xcld_height" style="margin-top: 10px;overflow:auto;min-width: 906px;">
  75 + <table class="table table-bordered table-checkable" id="forms">
  76 + <tbody class="ludan_1">
  77 +
  78 + </tbody>
  79 + <tbody class="ludan_2">
  80 +
  81 + </tbody>
  82 + <tbody class="ludan_3">
  83 +
  84 + </tbody>
  85 + <tbody class="ludan_4">
  86 +
  87 + </tbody>
  88 + </table>
  89 + </div>
  90 + </div>
  91 + </div>
  92 + </div>
  93 + </div>
  94 + </div>
  95 +</div>
  96 +
  97 +<script>
  98 + $(function(){
  99 + var fage=false;
  100 + // 关闭左侧栏
  101 + if (!$('body').hasClass('page-sidebar-closed'))
  102 + $('.menu-toggler.sidebar-toggler').click();
  103 +
  104 + $("#date").datetimepicker({
  105 + format : 'YYYY-MM-DD',
  106 + locale : 'zh-cn'
  107 + });
  108 +
  109 + $("#left_height").height($(window).height()-100);
  110 + $("#xcld_height").height($(window).height()-100);
  111 +
  112 + var d = new Date();
  113 + var year = d.getFullYear();
  114 + var month = d.getMonth() + 1;
  115 + var day = d.getDate();
  116 + if(month < 10)
  117 + month = "0" + month;
  118 + if(day < 10)
  119 + day = "0" + day;
  120 + $("#date").val(year + "-" + month + "-" + day);
  121 +
  122 + var obj = [];
  123 + var xlList;
  124 + $.get('/report/lineList',function(result){
  125 + xlList=result;
  126 +
  127 + $.get('/user/companyData', function(result){
  128 + obj = result;
  129 + console.log(obj);
  130 + var options = '';
  131 + for(var i = 0; i < obj.length; i++){
  132 + options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
  133 + }
  134 +
  135 + if(obj.length ==0){
  136 + $("#gsdmDiv_xcld").css('display','none');
  137 + }else if(obj.length ==1){
  138 + $("#gsdmDiv_xcld").css('display','none');
  139 + if(obj[0].children.length == 1 || obj[0].children.length ==0)
  140 + $('#fgsdmDiv_xcld').css('display','none');
  141 + }
  142 + $('#gsdmXcld').html(options);
  143 +
  144 + updateCompany();
  145 + });
  146 + });
  147 +
  148 + $("#gsdmXcld").on("change",updateCompany);
  149 + function updateCompany(){
  150 + var company = $('#gsdmXcld').val();
  151 + var options = '';
  152 + for(var i = 0; i < obj.length; i++){
  153 + if(obj[i].companyCode == company){
  154 + var children = obj[i].children;
  155 + for(var j = 0; j < children.length; j++){
  156 + options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
  157 + }
  158 + }
  159 + }
  160 + $('#fgsdmXcld').html(options);
  161 + initXl();
  162 + }
  163 +
  164 +
  165 +
  166 +
  167 + $("#fgsdmXcld").on("change",initXl);
  168 + function initXl(){
  169 + var data=[];
  170 + if(fage){
  171 + $("#line").select2("destroy").html('');
  172 + }
  173 + var fgs=$('#fgsdmXcld').val();
  174 + var gs=$('#gsdmXcld').val();
  175 + for(var i=0;i<xlList.length;i++){
  176 + if(gs!=""){
  177 + if(fgs!=""){
  178 + if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
  179 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  180 + }
  181 + }else{
  182 + if(xlList[i]["gsbm"]==gs){
  183 + data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
  184 + }
  185 + }
  186 + }
  187 + }
  188 + initPinYinSelect2('#line',data,'');
  189 + fage=true;
  190 + }
  191 + var date = '';
  192 + var line = '';
  193 + $("#query").on("click",function(){
  194 + $("#left_height").height($(window).height()-100);
  195 + line = $("#line").val();
  196 + date = $("#date").val();
  197 + $(".hidden").removeClass("hidden");
  198 + $get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){
  199 + // 把数据填充到模版中
  200 + var tbodyHtml = template('list_info',{list:result});
  201 + // 把渲染好的模版html文本追加到表格中
  202 + $('#info tbody').html(tbodyHtml);
  203 + });
  204 + });
  205 + var type="desc";
  206 + $(".rypx").on("click",function(){
  207 + line = $("#line").val();
  208 + date = $("#date").val();
  209 + $(".hidden").removeClass("hidden");
  210 + $get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"j_Gh",type:type},function(result){
  211 + if(type=="desc"){
  212 + type ="asc";
  213 + }else{
  214 + type ="desc";
  215 + }
  216 + // 把数据填充到模版中
  217 + var tbodyHtml = template('list_info_px',{list:result});
  218 + // 把渲染好的模版html文本追加到表格中
  219 + $('#info tbody').html(tbodyHtml);
  220 + });
  221 + })
  222 +
  223 + $(".zbhpx").on("click",function(){
  224 + line = $("#line").val();
  225 + date = $("#date").val();
  226 + $(".hidden").removeClass("hidden");
  227 + $get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"clZbh",type:type},function(result){
  228 + if(type=="desc"){
  229 + type ="asc";
  230 + }else{
  231 + type ="desc";
  232 + }
  233 + // 把数据填充到模版中
  234 + var tbodyHtml = template('list_info_px',{list:result});
  235 + // 把渲染好的模版html文本追加到表格中
  236 + $('#info tbody').html(tbodyHtml);
  237 + });
  238 + })
  239 +
  240 + $(".lppx").on("click",function(){
  241 + line = $("#line").val();
  242 + date = $("#date").val();
  243 + $(".hidden").removeClass("hidden");
  244 + $get('/realSchedule/queryUserInfoPx',{line:line,date:date,state:"lpName",type:type},function(result){
  245 + if(type=="desc"){
  246 + type ="asc";
  247 + }else{
  248 + type ="desc";
  249 + }
  250 + // 把数据填充到模版中
  251 + var tbodyHtml = template('list_info_px',{list:result});
  252 + // 把渲染好的模版html文本追加到表格中
  253 + $('#info tbody').html(tbodyHtml);
  254 + });
  255 + })
  256 +
  257 + var params = new Array();
  258 + var jName = '';
  259 + var jGh = '';
  260 + $("#info tbody").on("click","tr",function(){
  261 + if($(this).children().size() < 2){
  262 + return;
  263 + }
  264 + $("#xcld_height").height($(window).height()-100);
  265 + $(this).children().each(function(index){
  266 + params[index] = $(this).text();
  267 + });
  268 + jName = params[0].split("\\")[0];
  269 + jGh = params[0].split("\\")[1];
  270 + var id = params[3];
  271 + var obj = $(this);
  272 + $get('/realSchedule/MapById',{id:id},function(result){
  273 + result.scheduleDate = moment(result.scheduleDate).format("YYYY/MM/DD");
  274 + var ludan_1 = template('ludan_1',result);
  275 + // 把渲染好的模版html文本追加到表格中
  276 + $('#forms .ludan_1').html(ludan_1);
  277 + });
  278 + $get('/realSchedule/queryListWaybill_mh_2',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
  279 + getTime(result);
  280 + var ludan_2 = template('ludan_2',{list:result});
  281 + // 把渲染好的模版html文本追加到表格中
  282 + $('#forms .ludan_2').html(ludan_2);
  283 + });
  284 + $get('/realSchedule/findKMBC_mh_2',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
  285 + var ludan_3 = template('ludan_3',result);
  286 + $('#forms .ludan_3').html(ludan_3);
  287 + $("#info tbody tr").css('background-color', '');
  288 + obj.css('background-color', '#99CCFF');
  289 + });
  290 +
  291 +
  292 + });
  293 +
  294 + $("#export").on("click",function(){
  295 + if(params.length < 1){
  296 + return;
  297 + }
  298 + $get('/realSchedule/exportWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
  299 + window.open("/downloadFile/download?fileName="+date+"-"+jName+"-"+params[1]+"-"+params[2]+"-行车路单");
  300 + });
  301 + });
  302 +
  303 + $("#print").click(function(){
  304 + $("#printArea").printArea();
  305 + });
  306 +
  307 + $("#exportMore").on("click",function(){
  308 + if($("#info tbody tr td").length <= 1)
  309 + return;
  310 + var param = new Array();
  311 + $("#info tbody tr").each(function(index){
  312 + param[index] = new Array();
  313 + $(this).children().each(function(i){
  314 + if(i<3){
  315 + param[index][i] = $(this).text().split("\\")[0];
  316 + if(i==0){
  317 + param[index][3] = $(this).text().split("\\")[1];
  318 +
  319 + }
  320 + }
  321 + });
  322 + });
  323 + $get('/realSchedule/exportWaybillMore',{date:date,line:line,strs:JSON.stringify(param)},function(result){
  324 + window.open("/downloadFile/downloadList?fileName="+result.fileName);
  325 + });
  326 + });
  327 +
  328 + function getTime(list){
  329 + $.each(list, function(i, obj) {
  330 + if(obj.zdsj != null && obj.zdsjActual != null ){
  331 + var zdsjActual = (obj.zdsjActual).split(":");
  332 + var zdsj = (obj.zdsj).split(":");
  333 + if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
  334 + obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
  335 + }
  336 + else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
  337 + obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
  338 + }
  339 + }
  340 + });
  341 + }
  342 + });
  343 +</script>
  344 +<script type="text/html" id="list_info">
  345 + {{each list as obj i}}
  346 + <tr>
  347 + <td width="45%">{{obj[4]}}\{{obj[1]}}</td>
  348 + <td width="32%">{{obj[2]}}</td>
  349 + <td width="20%">{{obj[3]}}</td>
  350 + <td width="3%" hidden="true">{{obj[0]}}</td>
  351 + </tr>
  352 + {{/each}}
  353 + {{if list.length == 0}}
  354 + <tr>
  355 + <td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
  356 + </tr>
  357 + {{/if}}
  358 +</script>
  359 +<script type="text/html" id="list_info_px">
  360 + {{each list as obj i}}
  361 + <tr>
  362 +
  363 + <td width="45%">{{obj.jName}}\{{obj.jGh}}</td>
  364 + <td width="32%">{{obj.clZbh}}</td>
  365 + <td width="23%">{{obj.lpName}}</td>
  366 + <td hidden="true">{{obj.id}}</td>
  367 + </tr>
  368 + {{/each}}
  369 + {{if list.length == 0}}
  370 + <tr>
  371 + <td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
  372 + </tr>
  373 + {{/if}}
  374 +</script>
  375 +<script type="text/html" id="ludan_1">
  376 + <tr>
  377 + <td colspan="14">行车路单</td>
  378 + </tr>
  379 + <tr>
  380 + <td colspan="14">路别:{{xlName}} 路牌:{{lpName}} 车号:{{clZbh}}({{plate}}) 出场时间:{{fcsjActual}} 到达站名:{{zdzName}} 当班调派:{{dbdp}} 日期:{{scheduleDate}}</td>
  381 + </tr>
  382 + <tr>
  383 + <td colspan="2">出场存油 {{ccyl}}升</td>
  384 + <td colspan="2">加注量 {{jzl}}升</td>
  385 + <td colspan="2">进场存油 {{jcyl}}升</td>
  386 + <td colspan="4">加注机油 &nbsp;升</td>
  387 + <td colspan="4">本日耗油 {{yh}}升</td>
  388 + </tr>
  389 + <tr>
  390 + <td rowspan="2">调度章</td>
  391 + <td colspan="1">&nbsp;</td>
  392 + <td rowspan="2">早班</td>
  393 + <td colspan="1">&nbsp;</td>
  394 + <td rowspan="2">夜班</td>
  395 + <td colspan="1">&nbsp;</td>
  396 + <td rowspan="2" colspan="2">交叉</td>
  397 + <td colspan="2">&nbsp;</td>
  398 + <td rowspan="2">其他</td>
  399 + <td colspan="1">&nbsp;</td>
  400 + <td colspan="1">&nbsp;</td>
  401 + <td colspan="1">&nbsp;</td>
  402 + </tr>
  403 + <tr>
  404 + <td colspan="1">&nbsp;</td>
  405 + <td colspan="1">&nbsp;</td>
  406 + <td colspan="1">&nbsp;</td>
  407 + <td colspan="2">&nbsp;</td>
  408 + <td colspan="1">&nbsp;</td>
  409 + <td colspan="1">&nbsp;</td>
  410 + <td colspan="1">&nbsp;</td>
  411 + </tr>
  412 + <tr>
  413 + <td rowspan="2">车次</td>
  414 + <td colspan="2">工号</td>
  415 + <td rowspan="2">公里耗油</td>
  416 + <td colspan="2">起讫站</td>
  417 + <td colspan="4">时间</td>
  418 + <td colspan="2">误点</td>
  419 + <td rowspan="2" width="66px">里程(公里)计划</td>
  420 + <td rowspan="2">备注</td>
  421 + </tr>
  422 + <tr>
  423 + <td colspan="1" width="60px">司&nbsp;机</td>
  424 + <td colspan="1" width="60px">售&nbsp;票</td>
  425 + <td colspan="1">起点</td>
  426 + <td colspan="1">终点</td>
  427 + <td colspan="1">计发</td>
  428 + <td colspan="1">实发</td>
  429 + <td colspan="1">应到</td>
  430 + <td colspan="1">实到</td>
  431 + <td colspan="1">快</td>
  432 + <td colspan="1">慢</td>
  433 + </tr>
  434 +</script>
  435 +<script type="text/html" id="ludan_2">
  436 + {{each list as obj i}}
  437 + <tr>
  438 + <td>{{obj.adjustExps}}</td>
  439 + <td>{{obj.jGh}}{{obj.jName}}</td>
  440 + <td>{{if obj.sGh !=null}}
  441 + {{obj.sGh}}{{obj.sName}}
  442 + {{/if}}
  443 + </td>
  444 + <td>&nbsp;</td>
  445 + <td>{{obj.qdzName}}</td>
  446 + <td>{{obj.zdzName}}</td>
  447 + <td>{{obj.fcsj}}</td>
  448 + <td>{{obj.fcsjActual}}</td>
  449 + <td>{{obj.zdsj}}</td>
  450 + <td>{{obj.zdsjActual}}</td>
  451 + <td>{{obj.fast}}</td>
  452 + <td>{{obj.slow}}</td>
  453 + <td>
  454 + {{if obj.zdsjActual!=null}}
  455 + {{obj.jhlc}}
  456 + {{/if}}
  457 + </td>
  458 + <td >
  459 + {{obj.remarks}}
  460 + </td>
  461 + </tr>
  462 + {{/each}}
  463 + {{if list.length == 0}}
  464 + <tr>
  465 + <td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
  466 + </tr>
  467 + {{/if}}
  468 +</script>
  469 +<script type="text/html" id="ludan_3">
  470 + <tr>
  471 + <td colspan="2">计划班次</td>
  472 + <td>{{jhbc}}</td>
  473 + <td colspan="2">计划公里</td>
  474 + <td>{{jhlc}}</td>
  475 + <td colspan="2">烂班班次</td>
  476 + <td>{{cjbc}}</td>
  477 + <td colspan="3"> 烂班公里</td>
  478 + <td colspan="2">{{remMileage}}</td>
  479 + </tr>
  480 + <tr>
  481 + <td colspan="2">临加班次</td>
  482 + <td>{{ljbc}}</td>
  483 + <td colspan="2">临加公里</td>
  484 + <td>{{addMileage}}</td>
  485 + <td colspan="2">实际班次</td>
  486 + <td>{{sjbc}}</td>
  487 + <td colspan="3">营运公里</td>
  488 + <td colspan="2">{{yygl}}</td>
  489 + </tr>
  490 + <tr>
  491 + <td colspan="2">空驶公里</td>
  492 + <td>{{zkslc}}</td>
  493 + <td colspan="2">总公里</td>
  494 + <td>{{realMileage}}</td>
  495 + <td colspan="2"></td>
  496 + <td></td>
  497 + <td colspan="3"></td>
  498 + <td colspan="2"></td>
  499 + </tr>
  500 +</script>
... ...
src/main/resources/static/pages/permission/user/changePWD.html
  View file @a7f7430
... ... @@ -49,8 +49,8 @@
49 49 $(function(){
50 50 $("#confirm").on("click",function(){
51 51 var data = $('#changePWDForm').serializeJSON();
52   - $.post('/user/changePWD',data,function(){
53   -
  52 + $.post('/user/changePWD',data,function(msg){
  53 + layer.alert(msg);
54 54 });
55 55 });
56 56 });
... ...
src/main/resources/static/real_control_v2/js/forms/wrap.html
  View file @a7f7430
... ... @@ -94,8 +94,15 @@
94 94 }
95 95 storage.removeItem(key);
96 96 $('.form-page-content').load(pageUrl, function () {
97   - //时间默认当天
98   - $('#date', '.form-page-content').val(moment().format('YYYY-MM-DD'));
  97 + //限制日期
  98 + var d = moment(top.gb_second_timer.now()),
  99 + f='YYYY-MM-DD',
  100 + ed=d.format(f),
  101 + sd=d.subtract(3, 'days').format(f);
  102 +
  103 + $('#date', '.form-page-content').data('DateTimePicker')
  104 + .defaultDate(d)
  105 + .maxDate(ed).minDate(sd);
99 106  
100 107 if($("#ddrbBody").length > 0){
101 108 $("#ddrbBody").height("620px");
... ...
src/main/resources/static/real_control_v2/js/north/second_timer.js
  View file @a7f7430
... ... @@ -64,4 +64,10 @@ var gb_second_timer = (function () {
64 64 };
65 65  
66 66 window.setTimeout(init, 6000);
  67 +
  68 + return {
  69 + now: function () {
  70 + return now;
  71 + }
  72 + }
67 73 })();
68 74 \ No newline at end of file
... ...