update

徐烜
1 parent 7a047c1a
Showing 3 changed files with 61 additions and 28 deletions
src/main/java/com/bsth/entity/Cars.java
src/main/java/com/bsth/entity/schedule/CarConfigInfo.java
src/main/java/com/bsth/entity/schedule/EmployeeConfigInfo.java
@@ -29,7 +29,7 @@ public class Cars {
 	private Integer id;
     /** 自编号/内部编号 */
-    @Column(nullable = false, length = 8)
+    @Column(nullable = false, length = 8, unique = true)
     private String insideCode;
     // 公司、分公司暂时不用关联实体
@@ -140,11 +140,11 @@ public class Cars {
     @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
 	private SysUser updateBy;
-	// 创建日期
+	/** 创建日期 */
 	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
 	private Date createDate;
-	// 修改日期
+	/** 修改日期 */
 	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
@@ -2,6 +2,7 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
+import com.bsth.entity.sys.SysUser;
 import javax.persistence.*;
 import java.util.Date;
@@ -18,8 +19,6 @@ public class CarConfigInfo {
     @GeneratedValue
     private Long id;
-    /** TODO：等其他实体类完整后，做关联引用 */
-
     /** 线路关联 */
     @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
     private Line xl;
@@ -36,18 +35,28 @@ public class CarConfigInfo {
     private String mbsj;
     /** 启用日期 */
+    @Column(nullable = false)
     private Date qyrq;
     /** 终止日期 */
     private Date zzrq;
-    /** 停车点（TODO：这个不知道是否要关联）（ */
+    @Column(nullable = false)
+    /** 停车点（TODO：这个不知道是否要关联）*/
     private String tcd;
-    /** 受否切换（TODO：不懂） */
+    /** 受否切换 0或者1（TODO：不懂，貌似喝历史配车有关） */
+    @Column(nullable = false)
     private int isSwitch;
-    // 创建日期
+    /** 创建人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser createBy;
+    /** 修改人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser updateBy;
+
+    /** 创建日期 */
     @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
     private Date createDate;
-    // 修改日期
+    /** 修改日期 */
     @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
     private Date updateDate;
@@ -75,6 +84,22 @@ public class CarConfigInfo {
         this.cl = cl;
     }
+    public String getZbsj() {
+        return zbsj;
+    }
+
+    public void setZbsj(String zbsj) {
+        this.zbsj = zbsj;
+    }
+
+    public String getMbsj() {
+        return mbsj;
+    }
+
+    public void setMbsj(String mbsj) {
+        this.mbsj = mbsj;
+    }
+
     public Date getQyrq() {
         return qyrq;
     }
@@ -107,32 +132,32 @@ public class CarConfigInfo {
         this.isSwitch = isSwitch;
     }
-    public Date getCreateDate() {
-        return createDate;
+    public SysUser getCreateBy() {
+        return createBy;
     }
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
+    public void setCreateBy(SysUser createBy) {
+        this.createBy = createBy;
     }
-    public Date getUpdateDate() {
-        return updateDate;
+    public SysUser getUpdateBy() {
+        return updateBy;
     }
-    public String getZbsj() {
-        return zbsj;
+    public void setUpdateBy(SysUser updateBy) {
+        this.updateBy = updateBy;
     }
-    public void setZbsj(String zbsj) {
-        this.zbsj = zbsj;
+    public Date getCreateDate() {
+        return createDate;
     }
-    public String getMbsj() {
-        return mbsj;
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
     }
-    public void setMbsj(String mbsj) {
-        this.mbsj = mbsj;
+    public Date getUpdateDate() {
+        return updateDate;
     }
     public void setUpdateDate(Date updateDate) {
@@ -3,6 +3,7 @@ package com.bsth.entity.schedule;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
+import com.bsth.entity.sys.SysUser;
 import javax.persistence.*;
 import java.util.Date;
@@ -23,22 +24,29 @@ public class EmployeeConfigInfo {
     @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
     private Line xl;
     /** 车辆关联 */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
     private Cars cl;
     /** 人员关联（驾驶员） */
     @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
     private Personnel jsy;
     /** 人员关联（售票员） */
-    @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
+    @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
     private Personnel spy;
-    /** 搭班编码（TODO：不懂） */
+    /** 搭班编码（TODO：估计是售票员和驾驶员搭配时使用） */
     private String dbbm;
-    // 创建日期
+    /** 创建人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser createBy;
+    /** 修改人 */
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    private SysUser updateBy;
+
+    /** 创建日期 */
     @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
     private Date createDate;
-    // 修改日期
+    /** 修改日期 */
     @Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
     private Date updateDate;