潘钊 / bsth_control · Commits

Commit c44ef6e1bbc1eba9b0e92e285676e663e5dc4f52

Authored by yiming
1 parent abb80d72
build: skipped

路线月报台账、线路月报同比 子线路分开统计

Inline Side-by-side
Showing 4 changed files with 10 additions and 10 deletions
src/main/java/com/bsth/entity/oil/Jdl.java
  View file @c44ef6e
... ... @@ -29,7 +29,6 @@ public class Jdl {
29 29 private String remarks;
30 30 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
31 31 private Date createrDate;
32   - private String rqStr;
33 32 private String plate;
34 33  
35 34 public Integer getId() {
... ... @@ -105,10 +104,6 @@ public class Jdl {
105 104 this.jsy = jsy;
106 105 }
107 106  
108   - static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
109   - public String getRqStr() {
110   - return sdf.format(rq);
111   - }
112 107  
113 108 public String getPlate() {
114 109 return plate;
... ...
src/main/java/com/bsth/entity/oil/Jql.java
  View file @c44ef6e
... ... @@ -25,7 +25,6 @@ public class Jql {
25 25 private String remarks;
26 26 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
27 27 private Date createrDate;
28   - private String rqStr;
29 28 private String plate;
30 29  
31 30 public Integer getId() {
... ...
src/main/java/com/bsth/entity/report/LineCompare.java
  View file @c44ef6e
... ... @@ -14,6 +14,7 @@ public class LineCompare {
14 14 private String convoy;//车队
15 15 private String lineCode;//线路编码
16 16 private String namePw;//票务系统线路名
  17 + private int subLine;//是否子线路0-否 1是
17 18  
18 19 public Integer getId() {
19 20 return id;
... ... @@ -27,7 +28,7 @@ public class LineCompare {
27 28 if(lineCodeOut==null){
28 29 return null;
29 30 }
30   - else if(lineCodeOut.length()>4){
  31 + else if(lineCodeOut.length()>4 && subLine==0){
31 32 return lineCodeOut.substring(lineCodeOut.length()-4);
32 33 }else {
33 34 while (lineCodeOut.length()<4){
... ... @@ -72,4 +73,12 @@ public class LineCompare {
72 73 public void setNamePw(String namePw) {
73 74 this.namePw = namePw;
74 75 }
  76 +
  77 + public int getSubLine() {
  78 + return subLine;
  79 + }
  80 +
  81 + public void setSubLine(int subLine) {
  82 + this.subLine = subLine;
  83 + }
75 84 }
... ...
src/main/java/com/bsth/service/report/impl/XlybtzServiceImpl.java
  View file @c44ef6e
... ... @@ -627,9 +627,6 @@ public class XlybtzServiceImpl implements XlybtzService {
627 627 Xlybtz xlybtz=new Xlybtz();
628 628 xlybtz.setXl(lineName);// 路线
629 629 xlybtz.setXlcd((lines.get(lineCode).getUpMileage()+lines.get(lineCode).getDownMileage())/2);// 线路长度
630   - if(carCounts.get(BasicData.lineId2CodeMap.inverse().get(lineCode))==null){
631   - System.out.println(BasicData.lineId2CodeMap.inverse().get(lineCode));
632   - }
633 630 int clsdx=carCounts.get(BasicData.lineId2CodeMap.inverse().get(lineCode).toString());
634 631 xlybtz.setCldx(clsdx);// 车辆数大型
635 632 xlybtz.setClzx(0);// 31中型
... ...