From c16329fad94c7a783aae1fc204b9b9818dcf1d29 Mon Sep 17 00:00:00 2001 From: shiyunteng <shiyunteng@example.com> Date: 星期一, 31 三月 2025 11:04:48 +0800 Subject: [PATCH] 合同新增添加中标单关联,根据选择的中标单赋值乙方 中标单中标厂家改成下拉 验收单来源类型根据合同类型,查询条件和结果新增合同名称 --- platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseWinningLetterEntity.java | 62 ++++++++++++------------------ 1 files changed, 25 insertions(+), 37 deletions(-) diff --git a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseWinningLetterEntity.java b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseWinningLetterEntity.java index 3c6b7f0..5482de7 100644 --- a/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseWinningLetterEntity.java +++ b/platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/PurchaseWinningLetterEntity.java @@ -6,7 +6,10 @@ 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.time.LocalDateTime; /** @@ -16,122 +19,107 @@ * @date 2025-03-24 17:13:08 */ @Data +@Entity @TableName("purchase_winning_letter") -@EqualsAndHashCode(callSuper = true) -@Schema(description = "涓爣閫氱煡涔�") +@javax.persistence.Table(name = "purchase_winning_letter") +@Table(appliesTo = "purchase_winning_letter", comment = "涓爣閫氱煡") public class PurchaseWinningLetterEntity extends BaseModel<PurchaseWinningLetterEntity> { /** * 涓爣閫氱煡涔︾紪鐮� */ @Schema(description="涓爣閫氱煡涔︾紪鐮�") + @Column(columnDefinition="varchar(100) comment '涓爣閫氱煡涔︾紪鐮�'") private String winningCode; /** * 閲囪喘璁″垝缂栧彿 */ @Schema(description="閲囪喘璁″垝缂栧彿") - private String purchasePlanCode; + @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="鍗曚綅") + @Column(columnDefinition="varchar(32) comment '鍗曚綅'") private String unit; /** * 涓爣鍗曚环 /鍒� */ @Schema(description="涓爣鍗曚环 /鍒�") + @Column(columnDefinition="DECIMAL(10,0) comment '涓爣鍗曚环 /鍒�'") private Integer winningPrice; /** * 涓爣鎬婚 /鍒� */ @Schema(description="涓爣鎬婚 /鍒�") + @Column(columnDefinition="DECIMAL(10,0) comment '涓爣鎬婚 /鍒�'") private Integer totalWinningAmount; /** * 鎷熶娇鐢ㄥ湴鐐� */ @Schema(description="鎷熶娇鐢ㄥ湴鐐�") + @Column(columnDefinition="varchar(256) comment '鎷熶娇鐢ㄥ湴鐐�'") private String locationUsed; /** * 涓爣鍘傚 */ @Schema(description="涓爣鍘傚") + @Column(columnDefinition="varchar(100) comment '涓爣鍘傚'") private String winningBidder; /** - * 鐢宠浜� - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description="鐢宠浜�") - private String createBy; - - /** - * 鍒涘缓鏃堕棿 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description="鍒涘缓鏃堕棿") - private LocalDateTime createTime; - - /** - * 淇敼浜� - */ - @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; + * 涓爣鍘傚ID + */ + @Schema(description="涓爣鍘傚") + @Column(columnDefinition="bigint comment '浣跨敤鍏徃'") + private Long winningManufacturerId; } \ No newline at end of file -- Gitblit v1.9.1