潘钊 / bsth_control · Commits

Commit 57014855d09b5b2b054bcde80870fec347a10999

Authored by 廖磊
1 parent b1585754

新报表修改 早晚高峰配车修改

Inline Side-by-side
Showing 10 changed files with 353 additions and 68 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @5701485
... ... @@ -1020,19 +1020,19 @@ public class FormsServiceImpl implements FormsService {
1020 1020 }
1021 1021  
1022 1022 });
1023   - sql = "select name from bsth_c_line where sfyy = 0";
  1023 + sql = "select line_code from bsth_c_line where sfyy = 0";
1024 1024 List<String> strList = new ArrayList<>();
1025 1025 strList = jdbcTemplate.query(sql,
1026 1026 new RowMapper<String>(){
1027 1027 @Override
1028 1028 public String mapRow(ResultSet rs, int rowNum) throws SQLException {
1029   - return rs.getString("name");
  1029 + return rs.getString("line_code");
1030 1030 }
1031 1031 });
1032 1032 lineSet.addAll(strList);
1033 1033  
1034 1034 for(Line line1 : lineList){
1035   - if(lineSet.contains(line1.getName())){
  1035 + if(lineSet.contains(line1.getLineCode())){
1036 1036 continue;
1037 1037 }
1038 1038 if(line.trim().length() == 0 || line1.getLineCode().equals(line)){
... ...
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
  View file @5701485
... ... @@ -738,6 +738,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{
738 738 // TODO Auto-generated method stub
739 739 double ljjcc=0.0;
740 740 double ljyy=0.0;
  741 + double ljkfks=0.0;
741 742 for (int i = 0; i < lists.size(); i++) {
742 743 ScheduleRealInfo t=lists.get(i);
743 744 if(t.isSflj()){
... ... @@ -760,6 +761,24 @@ public class CulateMileageServiceImpl implements CulateMileageService{
760 761 }*/
761 762 }
762 763  
  764 + if(t.getBcType().equals("ldks")){
  765 + Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
  766 + if(childTaskPlans.isEmpty()){
  767 + if(!t.isDestroy()){
  768 + ljkfks =Arith.add(ljkfks, t.getJhlc());
  769 + }
  770 +
  771 + }
  772 + /*else{
  773 + //临加进出场子任务 待统计
  774 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  775 + double zrwlc=0.0;
  776 + boolean fage=false;
  777 + while (it.hasNext()) {
  778 + ChildTaskPlan childTaskPlan = it.next();
  779 + }
  780 + }*/
  781 + }
763 782 if(!isInOut(t)){
764 783 Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
765 784 if(childTaskPlans.isEmpty()){
... ... @@ -774,6 +793,14 @@ public class CulateMileageServiceImpl implements CulateMileageService{
774 793 if(childTaskPlan.getMileageType().equals("service")){
775 794 ljyy =Arith.add(ljyy,childTaskPlan.getMileage());
776 795 }
  796 + if(childTaskPlan.getMileageType().equals("empty")){
  797 + if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
  798 + ljjcc =Arith.add(ljjcc, childTaskPlan.getMileage());
  799 + }
  800 + if(childTaskPlan.getType2().equals("1")){
  801 + ljkfks =Arith.add(ljkfks, childTaskPlan.getMileage());
  802 + }
  803 + }
777 804 }
778 805 }
779 806 }
... ... @@ -784,6 +811,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{
784 811 Map<String, Double> map=new HashMap<String,Double>();
785 812 map.put("ljjcc", ljjcc);
786 813 map.put("ljyy", ljyy);
  814 + map.put("ljkfks", ljkfks);
787 815 return map;
788 816 }
789 817  
... ... @@ -858,20 +886,32 @@ public class CulateMileageServiceImpl implements CulateMileageService{
858 886 double zrwjcclc=0.0;
859 887 for (int i = 0; i < lists.size(); i++) {
860 888 ScheduleRealInfo t=lists.get(i);
861   - if(!isInOut(t)){
862   - Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
863   - if(!childTaskPlans.isEmpty()){
864   - Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
865   - while (it.hasNext()) {
866   - ChildTaskPlan childTaskPlan = it.next();
867   - if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
868   - if (childTaskPlan.isDestroy()) {
869   - if(childTaskPlan.getReason().equals(item)){
870   - zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
871   - }
872   - }
873   - }
874   - }
  889 + if(!t.isSflj()){
  890 + if(!isInOut(t)){
  891 + Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
  892 + if(!childTaskPlans.isEmpty()){
  893 + Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
  894 + while (it.hasNext()) {
  895 + ChildTaskPlan childTaskPlan = it.next();
  896 + if(item.equals("空放")){
  897 + if(childTaskPlan.getType2().equals("1")){
  898 + if (!childTaskPlan.isDestroy()) {
  899 + if(childTaskPlan.getReason().equals(item)){
  900 + zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
  901 + }
  902 + }
  903 + }
  904 + }else{
  905 + if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
  906 + if (!childTaskPlan.isDestroy()) {
  907 + if(childTaskPlan.getReason().equals(item)){
  908 + zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
  909 + }
  910 + }
  911 + }
  912 + }
  913 + }
  914 + }
875 915 }
876 916 }
877 917 }
... ...
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @5701485
... ... @@ -37,6 +37,10 @@ import java.util.*;
37 37 @Service
38 38 public class ReportServiceImpl implements ReportService{
39 39  
  40 + private static long zgf1 = 6 * 60 + 31,
  41 + zgf2 = 8 * 60 + 30,
  42 + wgf1 = 16 * 60 + 1,
  43 + wgf2 = 18 * 60;
40 44  
41 45 private Logger logger = LoggerFactory.getLogger(this.getClass());
42 46  
... ... @@ -466,38 +470,35 @@ public class ReportServiceImpl implements ReportService{
466 470 System.out.println(609360/60);
467 471 System.out.println(609360%60);
468 472 }
469   - @Override
  473 +/* @Override
470 474 public List<Map<String, Object>> tbodyTime3(String line, String ttinfo) {
471 475 // TODO Auto-generated method stub
472 476 List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
473 477  
474 478  
475 479  
476   - String sqlZd=" select t.*,x.station_name as qdz_name from ("
477   - + " select qdz,count(lp) as cls,lx from ( select qdz,lp, 'zqc' as lx "
478   - + " from bsth_c_s_ttinfo_detail where "
479   - + " bc_type='normal' and ttinfo ='"+ttinfo+"' "
480   - + " and fcsj>'06:31' and fcsj<'08:00' group by qdz,lp) t1"
481   - + " group by qdz "
  480 + String sqlZd="select a.qdz_name,COUNT(a.cl_zbh) as cls,'zqc' AS lx from ("
  481 + + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"' "
  482 + + " and bc_type ='normal'"
  483 + + " and ((fcsj >'06:31' and fcsj<'08:30') or ( fcsj>'6:31' and fcsj<'8:30'))"
  484 + + " group by cl_zbh,qdz_name) a group by a.qdz_name"
482 485 + " union "
483   - + " select qdz,count(lp) as cls,lx from ( select qdz,lp, 'wqc' as lx "
484   - + " from bsth_c_s_ttinfo_detail where "
485   - + " bc_type='normal' and ttinfo ='"+ttinfo+"' "
486   - + " and fcsj>'16:01' and fcsj<'18:00' group by qdz,lp) t2"
487   - + " group by qdz "
  486 + + " select a.qdz_name,COUNT(a.cl_zbh) as cls,'wqc' AS lx from ("
  487 + + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
  488 + + " and bc_type ='normal' "
  489 + + " and fcsj >'16:01' and fcsj<'18:00' group by cl_zbh,qdz_name "
  490 + + " ) a group by a.qdz_name "
488 491 + " union "
489   - + " select qdz,count(lp) as cls,lx from ( select qdz,lp, 'zqj' as lx "
490   - + " from bsth_c_s_ttinfo_detail where "
491   - + " bc_type='region' and ttinfo ='"+ttinfo+"' "
492   - + " and fcsj>'06:31' and fcsj<'08:00' group by qdz,lp) t3"
493   - + " group by qdz "
  492 + + " select a.qdz_name,COUNT(a.cl_zbh) as cls,'zqj' AS lx from ("
  493 + + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
  494 + + " and bc_type ='region' "
  495 + + " and ((fcsj >'06:31' and fcsj<'08:30') or ( fcsj>'6:31' and fcsj<'8:30'))"
  496 + + " group by cl_zbh,qdz_name) a group by a.qdz_name"
494 497 + " union "
495   - + " select qdz,count(lp) as cls,lx from ( select qdz,lp, 'wqj' as lx "
496   - + " from bsth_c_s_ttinfo_detail where "
497   - + " bc_type='region' and ttinfo ='"+ttinfo+"' "
498   - + " and fcsj>'16:01' and fcsj<'18:00' group by qdz,lp) t4"
499   - + " group by qdz ) t left join bsth_c_station x on t.qdz=x.id";
500   -
  498 + + " select a.qdz_name,COUNT(a.cl_zbh) as cls,'wqj' AS lx from ("
  499 + + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
  500 + + " and bc_type ='region' and fcsj >'16:01' and fcsj<'18:00'"
  501 + + " group by cl_zbh,qdz_name) a group by a.qdz_name";
501 502 List<Map<String, Object>> lists= jdbcTemplate.query(sqlZd,
502 503 new RowMapper<Map<String, Object>>(){
503 504 @Override
... ... @@ -556,6 +557,208 @@ public class ReportServiceImpl implements ReportService{
556 557  
557 558 }
558 559 return list;
  560 + }*/
  561 + @Override
  562 + public List<Map<String, Object>> tbodyTime3(String line, String ttinfo) {
  563 + // TODO Auto-generated method stub
  564 + List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
  565 + List<Map<String, Object>> list_s=new ArrayList<Map<String,Object>>();
  566 +
  567 +
  568 + /*String sqlZd="select a.qdz_name,COUNT(a.cl_zbh) as cls,'zqc' AS lx from ("
  569 + + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"' "
  570 + + " and bc_type ='normal'"
  571 + + " and ((fcsj >'06:31' and fcsj<'08:30') or ( fcsj>'6:31' and fcsj<'8:30'))"
  572 + + " group by cl_zbh,qdz_name) a group by a.qdz_name"
  573 + + " union "
  574 + + " select a.qdz_name,COUNT(a.cl_zbh) as cls,'wqc' AS lx from ("
  575 + + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
  576 + + " and bc_type ='normal' "
  577 + + " and fcsj >'16:01' and fcsj<'18:00' group by cl_zbh,qdz_name "
  578 + + " ) a group by a.qdz_name "
  579 + + " union "
  580 + + " select a.qdz_name,COUNT(a.cl_zbh) as cls,'zqj' AS lx from ("
  581 + + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
  582 + + " and bc_type ='region' "
  583 + + " and ((fcsj >'06:31' and fcsj<'08:30') or ( fcsj>'6:31' and fcsj<'8:30'))"
  584 + + " group by cl_zbh,qdz_name) a group by a.qdz_name"
  585 + + " union "
  586 + + " select a.qdz_name,COUNT(a.cl_zbh) as cls,'wqj' AS lx from ("
  587 + + " select cl_zbh,qdz_name from bsth_c_s_sp_info where tt_info ='"+ttinfo+"'"
  588 + + " and bc_type ='region' and fcsj >'16:01' and fcsj<'18:00'"
  589 + + " group by cl_zbh,qdz_name) a group by a.qdz_name";*/
  590 +
  591 + String sqlCl="SELECT cl_zbh,qdz_name,bc_type,fcsj,bcsj FROM"
  592 + + " bsth_c_s_sp_info WHERE tt_info = '"+ttinfo+"' "
  593 + + " AND bc_type = 'normal' order by qdz_name";
  594 +
  595 + List<Map<String, Object>> listj= jdbcTemplate.query(sqlCl,
  596 + new RowMapper<Map<String, Object>>(){
  597 + @Override
  598 + public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
  599 + Map<String, Object> m=new HashMap<String,Object>();
  600 + m.put("cl_zbh", rs.getString("cl_zbh"));
  601 + m.put("qdz_name", rs.getString("qdz_name"));
  602 + m.put("bcType", rs.getString("bc_type"));
  603 + m.put("fcsj", rs.getString("fcsj"));
  604 + m.put("bcsj", rs.getString("bcsj"));
  605 + return m;
  606 + }
  607 + });
  608 +
  609 + String sqlZd="select qdz_name ,bc_type from bsth_c_s_sp_info WHERE tt_info = '"+ttinfo+"' "
  610 + + " AND (bc_type = 'normal' or bc_type='region') group by qdz_name ,bc_type "
  611 + + " order by qdz_name";
  612 + List<Map<String, Object>> lists= jdbcTemplate.query(sqlZd,
  613 + new RowMapper<Map<String, Object>>(){
  614 + @Override
  615 + public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
  616 + Map<String, Object> m=new HashMap<String,Object>();
  617 + m.put("zdm", rs.getString("qdz_name"));
  618 + m.put("bcType", rs.getString("bc_type"));
  619 + return m;
  620 + }
  621 + });
  622 +
  623 + for (int i = 0; i < lists.size(); i++) {
  624 + Map<String, Object> z=new HashMap<String,Object>();
  625 + Map<String, Object> w=new HashMap<String,Object>();
  626 + Map<String, Object> p=lists.get(i);
  627 + int zbcs=0;
  628 + int wbcs=0;
  629 + if(p.get("bcType").toString().equals("normal")){
  630 + for (int j = 0; j < listj.size(); j++) {
  631 + if(listj.get(j).get("qdz_name").toString().equals(p.get("zdm").toString()) &&
  632 + listj.get(j).get("bcType").toString().equals("normal")){
  633 + String time=listj.get(j).get("fcsj").toString();
  634 + long bcsj= Long.parseLong(listj.get(j).get("bcsj").toString());
  635 + String clZbh=listj.get(j).get("cl_zbh").toString();
  636 + String[] fcsjStr = time.split(":");
  637 + long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
  638 + long ddsj=fcsj+bcsj;
  639 + if((fcsj>=zgf1 && fcsj<=zgf2) || (ddsj>=zgf1&&ddsj<=zgf2)
  640 + || (fcsj<zgf1&&ddsj>zgf2)){
  641 + if(p.get("z"+clZbh)==null){
  642 + zbcs++;
  643 + p.put("z"+clZbh, clZbh);
  644 + }
  645 + }
  646 +
  647 + if((fcsj>=wgf1 && fcsj<=wgf2) || (ddsj>=wgf1&&ddsj<=wgf2)
  648 + || (fcsj<wgf1&&ddsj>wgf2)){
  649 + if(p.get("w"+clZbh)==null){
  650 + wbcs++;
  651 + p.put("w"+clZbh, clZbh);
  652 + }
  653 + }
  654 + }
  655 +
  656 + }
  657 + if(zbcs>0){
  658 + z.put("zdm", p.get("zdm"));
  659 + z.put("cls", zbcs);
  660 + z.put("lx", "zqc");
  661 + list_s.add(z);
  662 + }
  663 + if(wbcs>0){
  664 + w.put("zdm", p.get("zdm"));
  665 + w.put("cls", zbcs);
  666 + w.put("lx", "wqc");
  667 + list_s.add(w);
  668 + }
  669 +
  670 + }
  671 +
  672 + if(p.get("bcType").equals("region")){
  673 + for (int j = 0; j < listj.size(); j++) {
  674 + if(listj.get(j).get("qdz_name").toString().equals(p.get("zdm").toString()) &&
  675 + listj.get(j).get("bcType").toString().equals("region")){
  676 + String time=listj.get(j).get("fcsj").toString();
  677 + long bcsj= Long.parseLong(listj.get(j).get("bcsj").toString());
  678 + String clZbh=listj.get(j).get("cl_zbh").toString();
  679 + String[] fcsjStr = time.split(":");
  680 + long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
  681 + long ddsj=fcsj+bcsj;
  682 + if((fcsj>=zgf1 && fcsj<=zgf2) || (ddsj>=zgf1&&ddsj<=zgf2)
  683 + || (fcsj<zgf1&&ddsj>zgf2)){
  684 + if(p.get("z"+clZbh)==null){
  685 + zbcs++;
  686 + p.put("z"+clZbh, clZbh);
  687 + }
  688 + }
  689 +
  690 + if((fcsj>=wgf1 && fcsj<=wgf2) || (ddsj>=wgf1&&ddsj<=wgf2)
  691 + || (fcsj<wgf1&&ddsj>wgf2)){
  692 + if(p.get("w"+clZbh)==null){
  693 + wbcs++;
  694 + p.put("w"+clZbh, clZbh);
  695 + }
  696 + }
  697 + }
  698 +
  699 + }
  700 + if(zbcs>0){
  701 + z.put("zdm", p.get("zdm"));
  702 + z.put("cls", zbcs);
  703 + z.put("lx", "zqj");
  704 + list_s.add(z);
  705 + }
  706 + if(wbcs>0){
  707 + w.put("zdm", p.get("zdm"));
  708 + w.put("cls", zbcs);
  709 + w.put("lx", "wqj");
  710 + list_s.add(w);
  711 + }
  712 + }
  713 +
  714 + }
  715 + int a=0;
  716 + int b=0;
  717 + int c=0;
  718 + int d=0;
  719 + for(int i=0;i<list_s.size();i++){
  720 + boolean fage=true;
  721 + Map<String, Object> newMap= new HashMap<String, Object>();
  722 + list.add(newMap);
  723 + Map<String, Object> maps=list_s.get(i);
  724 + if(maps.get("lx").equals("zqc")){
  725 + list.get(a).put("zqcZm", maps.get("zdm"));
  726 + list.get(a).put("zqcCls", maps.get("cls"));
  727 + a++;
  728 + fage=false;
  729 + }else if(maps.get("lx").equals("wqc")){
  730 + list.get(b).put("wqcZm", maps.get("zdm"));
  731 + list.get(b).put("wqcCls", maps.get("cls"));
  732 + b++;
  733 + fage=false;
  734 + }else if(maps.get("lx").equals("zqj")){
  735 + list.get(c).put("zqjZm", maps.get("zdm"));
  736 + list.get(c).put("zqjCls", maps.get("cls"));
  737 + c++;
  738 + fage=false;
  739 + }else if(maps.get("lx").equals("wqj")){
  740 + list.get(d).put("wqjZm", maps.get("zdm"));
  741 + list.get(d).put("wqjCls", maps.get("cls"));
  742 + d++;
  743 + fage=false;
  744 + }
  745 + if(fage){
  746 + break;
  747 + }
  748 + }
  749 + boolean status=true;
  750 + while (status) {
  751 + for (int i = 0; i < list.size(); i++) {
  752 + if(list.get(i).isEmpty()){
  753 + list.remove(i);
  754 + status=true;
  755 + }else{
  756 + status=false;
  757 + }
  758 + }
  759 +
  760 + }
  761 + return list;
559 762 }
560 763  
561 764 @Override
... ... @@ -1501,11 +1704,18 @@ public class ReportServiceImpl implements ReportService{
1501 1704 Map<String, Object> m = new HashMap<String, Object>();
1502 1705 m.put("date", date);
1503 1706 m.put("date1", date2);
  1707 + String by=map.get("by").toString();
  1708 + String xls="";
  1709 + if(by.equals("sj")){
  1710 + xls="countByLine.xls";
  1711 + }else{
  1712 + xls="countByLines.xls";
  1713 + }
1504 1714 ReportUtils ee = new ReportUtils();
1505 1715 try {
1506 1716 listI.add(lMap.iterator());
1507 1717 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
1508   - ee.excelReplace(listI, new Object[]{m}, path + "mould/countByLine.xls",
  1718 + ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
1509 1719 path + "export/线路公里统计表.xls");
1510 1720 } catch (Exception e) {
1511 1721 // TODO: handle exception
... ... @@ -1572,9 +1782,12 @@ public class ReportServiceImpl implements ReportService{
1572 1782 Map<String, Double> culateLjMile=culateService.culateLjMile(lists);
1573 1783 double ljyy=culateLjMile.get("ljyy");
1574 1784 double ljjcc=culateLjMile.get("ljjcc");
  1785 + double ljkfks=culateLjMile.get("ljkfks");
1575 1786 map.put("ljyy", ljyy);
1576 1787 map.put("ljjcc", ljjcc);
1577   - double ljlc=Arith.add(ljyy, ljjcc);
  1788 + map.put("ljkfks", ljkfks);
  1789 +
  1790 + double ljlc=Arith.add(Arith.add(ljyy, ljjcc),ljkfks);
1578 1791  
1579 1792 double lbss=culateService.culateSsMile(list);//烂班少驶
1580 1793 map.put("lbss", lbss);
... ... @@ -1594,18 +1807,18 @@ public class ReportServiceImpl implements ReportService{
1594 1807 double zrwjcclc=culateService.culateZrwJccLc(list, "故障");
1595 1808 double zrwjcclc1=culateService.culateZrwJccLc(list, "肇事");
1596 1809 double zrwjcclc2=culateService.culateZrwJccLc(list, "纠纷");
  1810 + double zrwjcclcqt=culateService.culateZrwJccLc(list, "其他");
  1811 + map.put("jhwjcclc_z", Arith.add(jhwjcclc,zrwjcclcqt));
1597 1812 map.put("zrwjcclc", zrwjcclc);
1598 1813 map.put("zrwjcclc1", zrwjcclc1);
1599 1814 map.put("zrwjcclc2", zrwjcclc2);
1600   - double zrwjcc=Arith.add(Arith.add(zrwjcclc, zrwjcclc1), zrwjcclc2);
1601   - double kfks=culateService.culateKfksLc(lists);
  1815 + map.put("zrwjcclcqt", zrwjcclcqt);
  1816 + double zrwjcc=Arith.add(Arith.add(Arith.add(zrwjcclc, zrwjcclc1), zrwjcclc2),zrwjcclcqt);
  1817 + double kfks=Arith.add(culateService.culateKfksLc(lists),culateService.culateZrwJccLc(list, "空放"));
1602 1818 map.put("kfks", kfks);
1603 1819 double zlc=Arith.add(Arith.add(Arith.add(zrwjcc, ljlc),
1604 1820 Arith.add(zjcclc, zyylc)),kfks);
1605   -
1606   -
1607 1821 map.put("zlc", zlc);
1608   -
1609 1822 }
1610 1823 return map;
1611 1824 }
... ... @@ -1830,10 +2043,22 @@ public class ReportServiceImpl implements ReportService{
1830 2043 m.put("date", date);
1831 2044 m.put("date1", date2);
1832 2045 String xls="";
  2046 + String by=map.get("by").toString();
  2047 +
  2048 +
1833 2049 if(zt.equals("zbh")){
1834   - xls="countByBus1.xls";
  2050 + if(by.equals("sj")){
  2051 + xls="countByBus1.xls";
  2052 + }else{
  2053 + xls="countByBus1s.xls";
  2054 + }
1835 2055 }else{
1836   - xls="countByBus2.xls";
  2056 +
  2057 + if(by.equals("sj")){
  2058 + xls="countByBus2.xls";
  2059 + }else{
  2060 + xls="countByBus2s.xls";
  2061 + }
1837 2062 }
1838 2063 ReportUtils ee = new ReportUtils();
1839 2064 try {
... ... @@ -1896,7 +2121,8 @@ public class ReportServiceImpl implements ReportService{
1896 2121 String jGh= m.get("jGh")==null?"":m.get("jGh").toString();
1897 2122 String sGh= m.get("sGh")==null?"":m.get("sGh").toString();
1898 2123 double jhzlc = 0.0,jhlc= 0.0,jcclc= 0.0,zlc= 0.0,jhnlc= 0.0,jhwlc= 0.0,
1899   - jhnjcclc= 0.0,jhwjcclc= 0.0,zrwjcclc= 0.0,lbss= 0.0,ssgl_lz= 0.0,
  2124 + jhnjcclc= 0.0,jhwjcclc= 0.0,jhwjcclc_z=0.0,zrwjcclc= 0.0,zrwjcclc1= 0.0,zrwjcclc2= 0.0,
  2125 + zrwjcclcqt=0.0,lbss= 0.0,ssgl_lz= 0.0,
1900 2126 ssgl_dm= 0.0,ssgl_gz= 0.0,ssgl_jf= 0.0,ssgl_zs= 0.0,ssgl_qr= 0.0,ssgl_qc= 0.0,
1901 2127 ssgl_kx= 0.0,ssgl_qh= 0.0,ssgl_yw= 0.0,ssgl_other= 0.0,ljyy=0.0,ljjcc=0.0,
1902 2128 kfks=0.0,yhl=0.0,jzl=0.0,hyl=0.0,dhl=0.0,cdl=0.0;
... ... @@ -1915,7 +2141,11 @@ public class ReportServiceImpl implements ReportService{
1915 2141 jhwlc=Arith.add(jhwlc, map.get("jhwlc"));
1916 2142 jhnjcclc=Arith.add(jhnjcclc, map.get("jhnjcclc"));
1917 2143 jhwjcclc=Arith.add(jhwjcclc, map.get("jhwjcclc"));
  2144 + jhwjcclc_z=Arith.add(jhwjcclc_z, map.get("jhwjcclc_z"));
1918 2145 zrwjcclc=Arith.add(zrwjcclc, map.get("zrwjcclc"));
  2146 + zrwjcclc1=Arith.add(zrwjcclc1, map.get("zrwjcclc1"));
  2147 + zrwjcclc2=Arith.add(zrwjcclc2, map.get("zrwjcclc2"));
  2148 + zrwjcclcqt=Arith.add(zrwjcclcqt, map.get("zrwjcclcqt"));
1919 2149 lbss=Arith.add(lbss, map.get("lbss"));
1920 2150 ssgl_lz=Arith.add(ssgl_lz, map.get("ssgl_lz"));
1921 2151 ssgl_dm=Arith.add(ssgl_dm, map.get("ssgl_dm"));
... ... @@ -1962,7 +2192,11 @@ public class ReportServiceImpl implements ReportService{
1962 2192 newMap.put("jhwlc", jhwlc);
1963 2193 newMap.put("jhnjcclc", jhnjcclc);
1964 2194 newMap.put("jhwjcclc", jhwjcclc);
  2195 + newMap.put("jhwjcclc_z", jhwjcclc_z);
1965 2196 newMap.put("zrwjcclc", zrwjcclc);
  2197 + newMap.put("zrwjcclc1", zrwjcclc1);
  2198 + newMap.put("zrwjcclc2", zrwjcclc2);
  2199 + newMap.put("zrwjcclcqt", zrwjcclcqt);
1966 2200 newMap.put("lbss", lbss);
1967 2201 newMap.put("ssgl_lz", ssgl_lz);
1968 2202 newMap.put("ssgl_dm",ssgl_dm);
... ...
src/main/resources/static/pages/forms/mould/countByBus1.xls
View file @5701485
No preview for this file type
src/main/resources/static/pages/forms/mould/countByBus2.xls
View file @5701485
No preview for this file type
src/main/resources/static/pages/forms/mould/countByLine.xls
View file @5701485
No preview for this file type
src/main/resources/static/pages/forms/statement/correctStatis.html
  View file @5701485
... ... @@ -48,17 +48,17 @@
48 48 <span class="item-label" style="width: 80px;">结束时间: </span>
49 49 <input class="form-control" type="text" id="endDate" style="width: 140px;"/>
50 50 </div>
51   - <div style="display: inline-block; margin-left: 10px;">
  51 + <div style="display: inline-block; margin-left: 10px;display: none;">
52 52 <select class="form-control" name="sfqr" id="sfqr" style="width: 75px;">
53 53 <option value="0">全日</option>
54 54 <option value="1">时段</option>
55 55 </select>
56 56 </div>
57   - <div style="display: inline-block;margin-left: 12px;">
  57 + <div style="display: inline-block;margin-left: 12px;display: none;" >
58 58 <span class="item-label" style="width: 80px;"> </span>
59 59 <input class="form-control" type="text" id="times1" style="width: 60px;"/>
60 60 </div>
61   - <div style="display: inline-block;">
  61 + <div style="display: inline-block;display: none;">
62 62 <span class="item-label" style="width: 80px;"> - </span>
63 63 <input class="form-control" type="text" id="times2" style="width: 60px;"/>
64 64 </div>
... ... @@ -427,7 +427,7 @@
427 427 {{/each}}
428 428 {{if list.length == 0}}
429 429 <tr>
430   - <td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
  430 + <td colspan="15"><h6 class="muted">没有找到相关数据</h6></td>
431 431 </tr>
432 432 {{/if}}
433 433 </tbody>
... ...
src/main/resources/static/pages/mforms/changetochanges/changetochange.html
  View file @5701485
... ... @@ -100,7 +100,7 @@
100 100 <td rowspan="3" style="padding-top: 50px;">分公司</td>
101 101 <td rowspan="3" style="padding-top: 50px;">线路</td>
102 102 <td rowspan="3" style="padding-top: 50px;">路牌</td>
103   - <td rowspan="3" style="padding-top: 50px;">发生时间</td>
  103 + <td rowspan="3" style="padding-top: 50px;">发车时间</td>
104 104 <td rowspan="3" style="padding-top: 50px;">修改时间</td>
105 105 <td colspan="2">配车</td>
106 106 <td colspan="4">人员</td>
... ...
src/main/resources/static/pages/report/countMileage/countBus/countBusMileage.html
  View file @5701485
... ... @@ -28,7 +28,7 @@
28 28  
29 29 <div class="page-head">
30 30 <div class="page-title">
31   - <h1>路单数据统计表</h1>
  31 + <h1>路单数据统计表(审计)</h1>
32 32 </div>
33 33 </div>
34 34  
... ... @@ -230,8 +230,9 @@
230 230 params['zt']=zt;
231 231 params['type'] = "query";
232 232 var tbodyHtml = template('countBusDaily',{list:""});
  233 + var i = layer.load(2);
233 234 $get('/report/countBusMileage',params,function(result){
234   - console.log(result);
  235 + layer.close(i);
235 236 // 把数据填充到模版中
236 237 var tbodyHtml = template('countBusDaily',{list:result,zt:zt});
237 238 // 把渲染好的模版html文本追加到表格中
... ... @@ -256,6 +257,7 @@
256 257 params['xlName'] = xlName;
257 258 params['zt']=zt;
258 259 params['type'] = "export";
  260 + params['by']='sj';
259 261 $get('/report/countBusMileage',params,function(result){
260 262 window.open("/downloadFile/download?fileName=路单数据统计表");
261 263 });
... ... @@ -266,7 +268,7 @@
266 268 <script type="text/html" id="countBusDaily">
267 269 <thead>
268 270 <tr>
269   - <th colspan="26">路单数据统计表</th>
  271 + <th colspan="31">路单数据统计表</th>
270 272 </tr>
271 273 <tr>
272 274 <td>序号</td>
... ... @@ -291,6 +293,7 @@
291 293 <td><label>纠纷</label><label>进出场</label><label>空驶</label></td>
292 294 <td>临加营运公里</td>
293 295 <td>临加进出场空驶</td>
  296 + <td>临加空放空驶</td>
294 297 <td>电耗量</td>
295 298 <td>加电量</td>
296 299 <td>耗油量</td>
... ... @@ -317,18 +320,19 @@
317 320 <td>{{obj.jhnlc}}</td>
318 321 <td>{{obj.jhwlc}}</td>
319 322 <td>{{obj.jhnjcclc}}</td>
320   - <td>{{obj.jhwjcclc}}</td>
  323 + <td>{{obj.jhwjcclc_z}}</td>
321 324 <td>{{obj.kfks}}</td>
322 325 <td>{{obj.zrwjcclc}}</td>
323 326 <td>{{obj.zrwjcclc1}}</td>
324 327 <td>{{obj.zrwjcclc2}}</td>
325 328 <td>{{obj.ljyy}}</td>
326 329 <td>{{obj.ljjcc}}</td>
327   - <td>{{obj.yhl}}</td>
328   - <td>{{obj.jzl}}</td>
329   - <td>{{obj.hyl}}</td>
  330 + <td>{{obj.ljkfks}}</td>
330 331 <td>{{obj.dhl}}</td>
331 332 <td>{{obj.cdl}}</td>
  333 + <td>{{obj.yhl}}</td>
  334 + <td>{{obj.hyl}}</td>
  335 + <td>{{obj.jzl}}</td>
332 336 <td>{{obj.jhzlc}}</td>
333 337 </tr>
334 338 {{/each}}
... ...
src/main/resources/static/pages/report/countMileage/countLine/countLineMileage.html
  View file @5701485
... ... @@ -28,7 +28,7 @@
28 28  
29 29 <div class="page-head">
30 30 <div class="page-title">
31   - <h1>线路公里统计表</h1>
  31 + <h1>线路公里统计表(审计)</h1>
32 32 </div>
33 33 </div>
34 34  
... ... @@ -69,7 +69,7 @@
69 69 <table class="table table-bordered table-hover table-checkable" id="forms">
70 70 <thead>
71 71 <tr>
72   - <th colspan="28"><label id="datetodate"></label>线路公里统计表</th>
  72 + <th colspan="30"><label id="datetodate"></label>线路公里统计表</th>
73 73 </tr>
74 74 <tr>
75 75 <td rowspan="2"><span>公司</span></td>
... ... @@ -80,10 +80,10 @@
80 80 <td rowspan="2"><label>计划空</label><label>驶公里</label></td>
81 81 <td rowspan="2"><label>实际</label><label>总公里</label></td>
82 82 <td colspan="2"><label>实际营</label><label>运公里</label></td>
83   - <td colspan="5"><label>实际空</label><label>驶公里</label></td>
  83 + <td colspan="6"><label>实际空</label><label>驶公里</label></td>
84 84 <td rowspan="2"><label>少驶营</label><label>运里程</label></td>
85 85 <td colspan="11">少驶原因(公里)</td>
86   - <td colspan="2">临加公里</td>
  86 + <td colspan="3">临加公里</td>
87 87 </tr>
88 88 <tr>
89 89 <td><label>计划内</label><label>营运</label><label>里程</label></td>
... ... @@ -93,6 +93,7 @@
93 93 <td><label>故障</label><label>进出场</label><label>空驶</label></td>
94 94 <td><label>肇事</label><label>进出场</label><label>空驶</label></td>
95 95 <td><label>纠纷</label><label>进出场</label><label>空驶</label></td>
  96 + <td><label>空放 </label><label>空驶</label></td>
96 97 <td><span>路阻</span></td>
97 98 <td><span>吊慢</span></td>
98 99 <td><span>故障</span></td>
... ... @@ -106,6 +107,7 @@
106 107 <td><span>其他</span></td>
107 108 <td><label>临加营</label><label>运公里</label></td>
108 109 <td><label>临加进出</label><label>场空驶</label></td>
  110 + <td><label>临加</label><label>空放</label><label>空驶</label></td>
109 111 </tr>
110 112  
111 113 </thead>
... ... @@ -260,8 +262,10 @@
260 262 params['date2'] = date2;
261 263 params['xlName'] = xlName;
262 264 params['type'] = "query";
  265 + var i = layer.load(2);
263 266 $get('/report/countLineMileage',params,function(result){
264 267 $("#datetodate").html(date+"至"+date2);
  268 + layer.close(i);
265 269 // 把数据填充到模版中
266 270 var tbodyHtml = template('countLineList',{list:result});
267 271 // 把渲染好的模版html文本追加到表格中
... ... @@ -285,6 +289,7 @@
285 289 params['date2'] = date2;
286 290 params['xlName'] = xlName;
287 291 params['type'] = "export";
  292 + params['by']='sj';
288 293 $get('/report/countLineMileage',params,function(result){
289 294 window.open("/downloadFile/download?fileName=线路公里统计表");
290 295 });
... ... @@ -304,10 +309,11 @@
304 309 <td>{{obj.jhnlc}}</td>
305 310 <td>{{obj.jhwlc}}</td>
306 311 <td>{{obj.jhnjcclc}}</td>
307   - <td>{{obj.jhwjcclc}}</td>
  312 + <td>{{obj.jhwjcclc_z}}</td>
308 313 <td>{{obj.zrwjcclc}}</td>
309 314 <td>{{obj.zrwjcclc1}}</td>
310 315 <td>{{obj.zrwjcclc2}}</td>
  316 + <td>{{obj.kfks}}</td>
311 317 <td>{{obj.lbss}}</td>
312 318 <td>{{obj.ssgl_lz}}</td>
313 319 <td>{{obj.ssgl_dm}}</td>
... ... @@ -322,11 +328,12 @@
322 328 <td>{{obj.ssgl_other}}</td>
323 329 <td>{{obj.ljyy}}</td>
324 330 <td>{{obj.ljjcc}}</td>
  331 + <td>{{obj.ljkfks}}</td>
325 332 </tr>
326 333 {{/each}}
327 334 {{if list.length == 0}}
328 335 <tr>
329   - <td colspan="28"><h6 class="muted">没有找到相关数据</h6></td>
  336 + <td colspan="30"><h6 class="muted">没有找到相关数据</h6></td>
330 337 </tr>
331 338 {{/if}}
332 339 </script>
333 340 \ No newline at end of file
... ...