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

yiming
1 parent abb80d72
Showing 4 changed files with 10 additions and 10 deletions
src/main/java/com/bsth/entity/oil/Jdl.java
src/main/java/com/bsth/entity/oil/Jql.java
src/main/java/com/bsth/entity/report/LineCompare.java
src/main/java/com/bsth/service/report/impl/XlybtzServiceImpl.java
@@ -29,7 +29,6 @@ public class Jdl {
 	private String remarks;
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date createrDate;
-	private String rqStr;
 	private String plate;
 	public Integer getId() {
@@ -105,10 +104,6 @@ public class Jdl {
 		this.jsy = jsy;
 	}
-	static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-	public String getRqStr() {
-		return sdf.format(rq);
-	}
 	public String getPlate() {
 		return plate;
@@ -25,7 +25,6 @@ public class Jql {
 	private String remarks;
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	private Date createrDate;
-	private String rqStr;
 	private String plate;
 	public Integer getId() {
@@ -14,6 +14,7 @@ public class LineCompare {
     private String convoy;//车队
     private String lineCode;//线路编码
     private String namePw;//票务系统线路名
+    private int subLine;//是否子线路0-否 1是
     public Integer getId() {
         return id;
@@ -27,7 +28,7 @@ public class LineCompare {
         if(lineCodeOut==null){
             return null;
         }
-        else if(lineCodeOut.length()>4){
+        else if(lineCodeOut.length()>4 && subLine==0){
             return lineCodeOut.substring(lineCodeOut.length()-4);
         }else {
             while (lineCodeOut.length()<4){
@@ -72,4 +73,12 @@ public class LineCompare {
     public void setNamePw(String namePw) {
         this.namePw = namePw;
     }
+
+    public int getSubLine() {
+        return subLine;
+    }
+
+    public void setSubLine(int subLine) {
+        this.subLine = subLine;
+    }
 }
@@ -627,9 +627,6 @@ public class XlybtzServiceImpl implements XlybtzService {
                 Xlybtz xlybtz=new Xlybtz();
                 xlybtz.setXl(lineName);// 路线
                 xlybtz.setXlcd((lines.get(lineCode).getUpMileage()+lines.get(lineCode).getDownMileage())/2);// 线路长度
-                if(carCounts.get(BasicData.lineId2CodeMap.inverse().get(lineCode))==null){
-                    System.out.println(BasicData.lineId2CodeMap.inverse().get(lineCode));
-                }
                 int clsdx=carCounts.get(BasicData.lineId2CodeMap.inverse().get(lineCode).toString());
                 xlybtz.setCldx(clsdx);// 车辆数大型
                 xlybtz.setClzx(0);// 31中型