Update

徐烜
1 parent 4bfbe881
Showing 2 changed files with 93 additions and 109 deletions
pom.xml
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
@@ -259,11 +259,11 @@
 		</dependency>
-		<dependency>
-			<groupId>ojdbc</groupId>
-			<artifactId>ojdbc</artifactId>
-			<version>14</version>
-		</dependency>
+		<!--<dependency>-->
+			<!--<groupId>ojdbc</groupId>-->
+			<!--<artifactId>ojdbc</artifactId>-->
+			<!--<version>14</version>-->
+		<!--</dependency>-->
 	</dependencies>
 	<dependencyManagement>
@@ -89,8 +89,8 @@ public class SchedulePlanInfo {
     private String xlDir;
     /** 起点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
     // 这个字段以后不用了
-    @Column(nullable = false)
-    private Integer qdz;
+//    @Column(nullable = false)
+//    private Integer qdz;
     /** 起点站code */
     private String qdzCode;
     /** 起点站名字 */
@@ -98,8 +98,8 @@ public class SchedulePlanInfo {
     private String qdzName;
     /** 终点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
     // 这个字段以后不用了
-    @Column(nullable = false)
-    private Integer zdz;
+//    @Column(nullable = false)
+//    private Integer zdz;
     /** 终点站code */
     private String zdzCode;
     /** 终点站名字 */
@@ -264,7 +264,7 @@ public class SchedulePlanInfo {
         if (pzType != null && !pzType.equals("BSY")) {
             if ("ZW".equals(pzType)) { // 只看早晚进出场
                 if (isFirstBc) { // 第一个班次是出场
-                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
+//                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
                     this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
                     this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
@@ -272,7 +272,7 @@ public class SchedulePlanInfo {
                     this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
                 } else if (isLastBc) { // 最后一个班次是进场
-                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
+//                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
                     this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
                     this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
@@ -282,7 +282,7 @@ public class SchedulePlanInfo {
             } else if ("FS".equals(pzType)) { // 所有进出场
                 if ("out".equals(this.bcType)) { // 出场班次
-                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
+//                    this.qdz = carConfigInfo.getTcc().getId(); // 起点站-停车场id
                     this.qdzCode = carConfigInfo.getTcc().getParkCode(); // 起点站-停车场code
                     this.qdzName = carConfigInfo.getTcc().getParkName(); // 起点站-停车场name
@@ -290,7 +290,7 @@ public class SchedulePlanInfo {
                     this.bcsj = "0".equals(this.xlDir) ? carConfigInfo.getUpOutSj().intValue() : carConfigInfo.getDownOutSj().intValue();
                 } else if ("in".equals(this.bcType)) {
-                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
+//                    this.zdz = carConfigInfo.getTcc().getId(); // 终点站-停车场id
                     this.zdzCode = carConfigInfo.getTcc().getParkCode(); // 终点站-停车场code
                     this.zdzName = carConfigInfo.getTcc().getParkName(); // 终点站-停车场name
@@ -303,14 +303,6 @@ public class SchedulePlanInfo {
     }
-    public Integer getS() {
-        return s;
-    }
-
-    public void setS(Integer s) {
-        this.s = s;
-    }
-
     public Long getId() {
         return id;
     }
@@ -327,6 +319,46 @@ public class SchedulePlanInfo {
         this.scheduleDate = scheduleDate;
     }
+    public String getGsName() {
+        return gsName;
+    }
+
+    public void setGsName(String gsName) {
+        this.gsName = gsName;
+    }
+
+    public String getGsBm() {
+        return gsBm;
+    }
+
+    public void setGsBm(String gsBm) {
+        this.gsBm = gsBm;
+    }
+
+    public String getFgsName() {
+        return fgsName;
+    }
+
+    public void setFgsName(String fgsName) {
+        this.fgsName = fgsName;
+    }
+
+    public String getFgsBm() {
+        return fgsBm;
+    }
+
+    public void setFgsBm(String fgsBm) {
+        this.fgsBm = fgsBm;
+    }
+
+    public Integer getCcno() {
+        return ccno;
+    }
+
+    public void setCcno(Integer ccno) {
+        this.ccno = ccno;
+    }
+
     public Integer getXl() {
         return xl;
     }
@@ -423,6 +455,14 @@ public class SchedulePlanInfo {
         this.jName = jName;
     }
+    public Integer getS() {
+        return s;
+    }
+
+    public void setS(Integer s) {
+        this.s = s;
+    }
+
     public String getsGh() {
         return sGh;
     }
@@ -447,12 +487,12 @@ public class SchedulePlanInfo {
         this.xlDir = xlDir;
     }
-    public Integer getQdz() {
-        return qdz;
+    public String getQdzCode() {
+        return qdzCode;
     }
-    public void setQdz(Integer qdz) {
-        this.qdz = qdz;
+    public void setQdzCode(String qdzCode) {
+        this.qdzCode = qdzCode;
     }
     public String getQdzName() {
@@ -463,12 +503,12 @@ public class SchedulePlanInfo {
         this.qdzName = qdzName;
     }
-    public Integer getZdz() {
-        return zdz;
+    public String getZdzCode() {
+        return zdzCode;
     }
-    public void setZdz(Integer zdz) {
-        this.zdz = zdz;
+    public void setZdzCode(String zdzCode) {
+        this.zdzCode = zdzCode;
     }
     public String getZdzName() {
@@ -527,6 +567,30 @@ public class SchedulePlanInfo {
         this.bcType = bcType;
     }
+    public Long getTtInfo() {
+        return ttInfo;
+    }
+
+    public void setTtInfo(Long ttInfo) {
+        this.ttInfo = ttInfo;
+    }
+
+    public String getTtInfoName() {
+        return ttInfoName;
+    }
+
+    public void setTtInfoName(String ttInfoName) {
+        this.ttInfoName = ttInfoName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public SysUser getCreateBy() {
         return createBy;
     }
@@ -559,62 +623,6 @@ public class SchedulePlanInfo {
         this.updateDate = updateDate;
     }
-    public String getQdzCode() {
-        return qdzCode;
-    }
-
-    public void setQdzCode(String qdzCode) {
-        this.qdzCode = qdzCode;
-    }
-
-    public String getZdzCode() {
-        return zdzCode;
-    }
-
-    public void setZdzCode(String zdzCode) {
-        this.zdzCode = zdzCode;
-    }
-
-    public String getGsName() {
-        return gsName;
-    }
-
-    public void setGsName(String gsName) {
-        this.gsName = gsName;
-    }
-
-    public String getGsBm() {
-        return gsBm;
-    }
-
-    public void setGsBm(String gsBm) {
-        this.gsBm = gsBm;
-    }
-
-    public String getFgsName() {
-        return fgsName;
-    }
-
-    public void setFgsName(String fgsName) {
-        this.fgsName = fgsName;
-    }
-
-    public String getFgsBm() {
-        return fgsBm;
-    }
-
-    public void setFgsBm(String fgsBm) {
-        this.fgsBm = fgsBm;
-    }
-
-    public Integer getCcno() {
-        return ccno;
-    }
-
-    public void setCcno(Integer ccno) {
-        this.ccno = ccno;
-    }
-
     public SchedulePlan getSchedulePlan() {
         return schedulePlan;
     }
@@ -622,28 +630,4 @@ public class SchedulePlanInfo {
     public void setSchedulePlan(SchedulePlan schedulePlan) {
         this.schedulePlan = schedulePlan;
     }
-
-    public Long getTtInfo() {
-        return ttInfo;
-    }
-
-    public void setTtInfo(Long ttInfo) {
-        this.ttInfo = ttInfo;
-    }
-
-    public String getTtInfoName() {
-        return ttInfoName;
-    }
-
-    public void setTtInfoName(String ttInfoName) {
-        this.ttInfoName = ttInfoName;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
 }