补缴表

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssReimburseOrder.java

@@ -52,6 +52,41 @@ public class AssReimburseOrder extends StringPropertyUUIDEntity {
 	@NotBlank
 	@Column(name = "INFO")
 	private String info;//补缴原因
+	@NotNull
+	@Column(name = "reimburse_Status")
+	private Integer reimburseStatus=0;//状态，0-未完成 2-已完成
+	@Column(name = "INSERT_TIME")
+	private LocalDateTime reimburseTime;//补缴完成时间
+
+	/**交易相关*/
+	@NotBlank
+	@Size(max = 20)
+	@Column(name = "CARD_ID")
+	private String cardId;
+	@NotNull
+	@Column(name = "TYPE")
+	private Integer type = 1;// 流水类型1-高速 2-停车场
+	@NotBlank
+	@Size(max = 32)
+	@Column(name = "LIST_NO")
+	private String listNo;//流水编号
+	@Size(max = 100)
+	@Column(name = "EN_STATION_NAME")
+	private String enStationName;//入口站名称,type=1有值
+	@Size(max = 100)
+	@Column(name = "PARK_NAME")
+	private String parkName;//停车场名称,type=2有值
+	@NotBlank
+	@Size(max = 32)
+	@Column(name = "EN_TIME")
+	private String enTime;//入口时间
+	@Size(max = 100)
+	@Column(name = "EX_STATION_NAME")
+	private String exStationName;//出口站名称,type=1有值
+	@NotBlank
+	@Size(max = 32)
+	@Column(name = "EX_TIME")
+	private String exTime;//出口时间
 
 	/**审核相关*/
 	@NotNull

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssReimburseOrderTrans.java

@@ -1,79 +0,0 @@
-package cn.com.taiji.core.entity.ass;
-
-import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import java.time.LocalDateTime;
-
-
-/**
-* 补缴流水明细
-*
-*/
-@Getter
-@Setter
-@Entity
-@Table(name = "ASS_REIMBURSE_ORDER_TRANS")
-public class AssReimburseOrderTrans extends StringPropertyUUIDEntity {
-
-	@NotBlank
-	@Size(max = 32)
-	@Column(name = "ORDER_NO")
-	private String orderNo;//订单编号
-	@NotNull
-	@Column(name = "TYPE")
-	private Integer type = 1;// 流水类型1-高速 2-停车场
-	@NotBlank
-	@Size(max = 32)
-	@Column(name = "LIST_NO")
-	private String listNo;
-	@Size(max = 100)
-	@Column(name = "EN_STATION_NAME")
-	private String enStationName;
-	@Size(max = 100)
-	@Column(name = "PARK_NAME")
-	private String parkName;
-	@NotBlank
-	@Size(max = 32)
-	@Column(name = "EN_TIME")
-	private String enTime;
-	@Size(max = 100)
-	@Column(name = "EX_STATION_NAME")
-	private String exStationName;
-	@NotBlank
-	@Size(max = 32)
-	@Column(name = "EX_TIME")
-	private String exTime;
-	@NotBlank
-	@Column(name = "VEHICLE_ID")
-	private String vehicleId;//车辆ID;
-	@NotBlank
-	@Size(max = 64)
-	@Column(name = "VEHICLE_PLATE")
-	private String vehiclePlate;//车牌号;
-	@NotNull
-	@Column(name = "VEHICLE_PLATECOLOR")
-	private Integer vehiclePlateColor;//车牌颜色;
-	@NotBlank
-	@Size(max = 20)
-	@Column(name = "CARD_ID")
-	private String cardId;
-	@NotNull
-	@Size(max = 32)
-	@Column(name = "FEE")
-	private Long fee;
-	@NotNull
-	@Column(name = "INSERT_TIME")
-	private LocalDateTime insertTime = LocalDateTime.now();//创建时间
-	@NotNull
-	@Column(name = "UPDATE_TIME")
-	private LocalDateTime updateTime = LocalDateTime.now();//更新时间
-
-}