From 286e7ec66098f4f7deeae806781d6faab5ad0d21 Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期三, 02 四月 2025 17:24:32 +0800 Subject: [PATCH] fix: 租赁计划修改page方法 --- platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseTendrOrderEntity.java | 71 +++++++++++++++++------------------ 1 files changed, 34 insertions(+), 37 deletions(-) diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseTendrOrderEntity.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseTendrOrderEntity.java index 2c66fcd..e763eab 100644 --- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseTendrOrderEntity.java +++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseTendrOrderEntity.java @@ -5,6 +5,11 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.Table; + +import javax.persistence.Column; +import javax.persistence.Entity; +import java.math.BigDecimal; import java.time.LocalDateTime; /** @@ -14,116 +19,108 @@ * @date 2025-03-24 15:45:03 */ @Data +@Entity @TableName("purchase_tendr_order") -@EqualsAndHashCode(callSuper = true) -@Schema(description = "鎷涙爣閲囪喘鍗�") +@javax.persistence.Table(name = "purchase_tendr_order") +@Table(appliesTo = "purchase_tendr_order", comment = "鎷涙爣閲囪喘鍗�") public class PurchaseTendrOrderEntity extends BaseModel<PurchaseTendrOrderEntity> { /** * 閲囪喘璁″垝缂栧彿 */ @Schema(description="閲囪喘璁″垝缂栧彿") + @Column(columnDefinition="varchar(100) comment '閲囪喘璁″垝缂栧彿'") private String purchasePlanCode; /** * 璁惧缂栫爜 */ @Schema(description="璁惧缂栫爜") + @Column(columnDefinition="varchar(256) comment '璁惧缂栫爜'") private String deviceCode; /** * 璁惧鍚嶇О */ @Schema(description="璁惧鍚嶇О") + @Column(columnDefinition="varchar(256) comment '璁惧鍚嶇О'") private String deviceName; /** * 瑙勬牸鍨嬪彿 */ @Schema(description="瑙勬牸鍨嬪彿") + @Column(columnDefinition="varchar(256) comment '瑙勬牸鍨嬪彿'") private String deviceModels; /** * 鍏抽敭鍙傛暟 */ @Schema(description="鍏抽敭鍙傛暟") + @Column(columnDefinition="varchar(256) comment '鍏抽敭鍙傛暟'") private String keyParameter; /** * 鍒拌揣鏈堜唤 */ @Schema(description="鍒拌揣鏈堜唤") + @Column(columnDefinition="int comment '鍒拌揣鏈堜唤'") private Integer arrivalMonth; /** * 鏁伴噺 */ @Schema(description="鏁伴噺") + @Column(columnDefinition="int comment '鏁伴噺'") private Integer quantity; /** - * 鍗曚綅 + * 璁¢噺鍗曚綅 */ - @Schema(description="鍗曚綅") + @Schema(description="璁¢噺鍗曚綅") + @Column(columnDefinition="varchar(20) comment '璁¢噺鍗曚綅'") private String unit; /** * 棰勪及鍗曚环 /鍒� */ @Schema(description="棰勪及鍗曚环 /鍒�") - private Integer estimatePrice; + @Column(columnDefinition="decimal(10,2) comment '棰勪及鍗曚环'") + private BigDecimal estimatePrice; /** * 璁″垝鎬婚 /鍒� */ @Schema(description="璁″垝鎬婚 /鍒�") - private Integer totalPlanndAmount; + @Column(columnDefinition="decimal(10,2) comment '璁″垝鎬婚'") + private BigDecimal totalPlanndAmount; /** * 鎷熶娇鐢ㄥ湴鐐� */ @Schema(description="鎷熶娇鐢ㄥ湴鐐�") + @Column(columnDefinition="varchar(256) comment '鎷熶娇鐢ㄥ湴鐐�'") private String locationUsed; /** * 鐘舵�� */ @Schema(description="鐘舵��") + @Column(columnDefinition="varchar(32) comment '鐘舵��'") private String status; /** - * 鐢宠浜� - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description="鐢宠浜�") - private String createBy; + * 鎷涙爣閲囪喘璁″垝鍚嶇О + */ + @Schema(description="鎷涙爣閲囪喘璁″垝鍚嶇О") + @Column(columnDefinition="varchar(256) comment '鎷涙爣閲囪喘璁″垝鍚嶇О'") + private String orderName; /** - * 鍒涘缓鏃堕棿 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description="鍒涘缓鏃堕棿") - private LocalDateTime createTime; + * 璁惧ID + */ + @Schema(description="璁惧ID") + @Column(columnDefinition="bigint comment '璁惧ID'") + private Long deviceId; - /** - * 淇敼浜� - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description="淇敼浜�") - private String updateBy; - - /** - * 淇敼鏃堕棿 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description="淇敼鏃堕棿") - private LocalDateTime updateTime; - - /** - * delFlag - */ - @TableLogic - @TableField(fill = FieldFill.INSERT) - @Schema(description="delFlag") - private String delFlag; } \ No newline at end of file -- Gitblit v1.9.1