Merge branch 'master' of 192.168.168.201:panzhaov5/bsth_control

潘钊
2 parents 68c85bcb bc92ef1e
Showing 1 changed file with 34 additions and 162 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
@@ -47,55 +47,23 @@ public class SchedulePlanInfo {
     @Column(nullable = false)
     private String clZbh;
  
-
-    /** 报道1时间（格式 HH:mm） */
-    private String bd1Time;
-    /** 出场1时间（格式 HH:mm） */
-    @Column(nullable = false)
-    private String cc1Time;
-    /** 关联 bsth_c_personnel 主键，不做mapping */
-    @Column(nullable = false)
-    private Integer j1;
-    /** 驾驶员1工号 */
-    @Column(nullable = false)
-    private String j1Gh;
-    /** 驾驶员1名字 */
-    @Column(nullable = false)
-    private String j1Name;
-    /** 售票员1工号 */
-    private String s1Gh;
-    /** 售票员1名字 */
-    private String s1Name;
-
-    /** 报道2时间（格式 HH:mm） */
-    private String bd2Time;
-    /** 出场2时间（格式 HH:mm） */
-    private String cc2Time;
-    /** 驾驶员2工号 */
-    private String j2Gh;
-    /** 驾驶员2名字 */
-    private String j2Name;
-    /** 售票员2工号 */
-    private String s2Gh;
-    /** 售票员2名字 */
-    private String s2Name;
-
-    // 上面的暂时保留，之后删除
+    /** 当分班的时候，驾驶员会不一样，具体根据规则，还有时刻表决定 */
     /** 报道时间（格式 HH:mm） */
-    @Column(nullable = false)
     private String bdTime;
     /** 出场时间（格式 HH:mm） */
-    @Column(nullable = false)
     private String ccTime;
+    /** 关联 bsth_c_personnel 主键，不做mapping */
+    @Column(nullable = false)
+    private Integer j;
     /** 驾驶员工号 */
     @Column(nullable = false)
     private String jGh;
     /** 驾驶员名字 */
     @Column(nullable = false)
     private String jName;
-    /** 售票员2工号 */
+    /** 售票员工号 */
     private String sGh;
-    /** 售票员2名字 */
+    /** 售票员名字 */
     private String sName;
  
     // 冗余的时刻明细信息，不做mapping
@@ -222,108 +190,60 @@ public class SchedulePlanInfo {
         this.clZbh = clZbh;
     }
  
-    public String getBd1Time() {
-        return bd1Time;
-    }
-
-    public void setBd1Time(String bd1Time) {
-        this.bd1Time = bd1Time;
-    }
-
-    public String getCc1Time() {
-        return cc1Time;
-    }
-
-    public void setCc1Time(String cc1Time) {
-        this.cc1Time = cc1Time;
-    }
-
-    public Integer getJ1() {
-        return j1;
-    }
-
-    public void setJ1(Integer j1) {
-        this.j1 = j1;
-    }
-
-    public String getJ1Gh() {
-        return j1Gh;
-    }
-
-    public void setJ1Gh(String j1Gh) {
-        this.j1Gh = j1Gh;
-    }
-
-    public String getJ1Name() {
-        return j1Name;
-    }
-
-    public void setJ1Name(String j1Name) {
-        this.j1Name = j1Name;
-    }
-
-    public String getS1Gh() {
-        return s1Gh;
-    }
-
-    public void setS1Gh(String s1Gh) {
-        this.s1Gh = s1Gh;
-    }
-
-    public String getS1Name() {
-        return s1Name;
+    public String getBdTime() {
+        return bdTime;
     }
  
-    public void setS1Name(String s1Name) {
-        this.s1Name = s1Name;
+    public void setBdTime(String bdTime) {
+        this.bdTime = bdTime;
     }
  
-    public String getBd2Time() {
-        return bd2Time;
+    public String getCcTime() {
+        return ccTime;
     }
  
-    public void setBd2Time(String bd2Time) {
-        this.bd2Time = bd2Time;
+    public void setCcTime(String ccTime) {
+        this.ccTime = ccTime;
     }
  
-    public String getCc2Time() {
-        return cc2Time;
+    public Integer getJ() {
+        return j;
     }
  
-    public void setCc2Time(String cc2Time) {
-        this.cc2Time = cc2Time;
+    public void setJ(Integer j) {
+        this.j = j;
     }
  
-    public String getJ2Gh() {
-        return j2Gh;
+    public String getjGh() {
+        return jGh;
     }
  
-    public void setJ2Gh(String j2Gh) {
-        this.j2Gh = j2Gh;
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
     }
  
-    public String getJ2Name() {
-        return j2Name;
+    public String getjName() {
+        return jName;
     }
  
-    public void setJ2Name(String j2Name) {
-        this.j2Name = j2Name;
+    public void setjName(String jName) {
+        this.jName = jName;
     }
  
-    public String getS2Gh() {
-        return s2Gh;
+    public String getsGh() {
+        return sGh;
     }
  
-    public void setS2Gh(String s2Gh) {
-        this.s2Gh = s2Gh;
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
     }
  
-    public String getS2Name() {
-        return s2Name;
+    public String getsName() {
+        return sName;
     }
  
-    public void setS2Name(String s2Name) {
-        this.s2Name = s2Name;
+    public void setsName(String sName) {
+        this.sName = sName;
     }
  
     public String getXlDir() {
@@ -445,52 +365,4 @@ public class SchedulePlanInfo {
     public void setUpdateDate(Date updateDate) {
         this.updateDate = updateDate;
     }
-
-    public String getBdTime() {
-        return bdTime;
-    }
-
-    public void setBdTime(String bdTime) {
-        this.bdTime = bdTime;
-    }
-
-    public String getCcTime() {
-        return ccTime;
-    }
-
-    public void setCcTime(String ccTime) {
-        this.ccTime = ccTime;
-    }
-
-    public String getjGh() {
-        return jGh;
-    }
-
-    public void setjGh(String jGh) {
-        this.jGh = jGh;
-    }
-
-    public String getjName() {
-        return jName;
-    }
-
-    public void setjName(String jName) {
-        this.jName = jName;
-    }
-
-    public String getsGh() {
-        return sGh;
-    }
-
-    public void setsGh(String sGh) {
-        this.sGh = sGh;
-    }
-
-    public String getsName() {
-        return sName;
-    }
-
-    public void setsName(String sName) {
-        this.sName = sName;
-    }
 }