From c05ddf57634572b43869e00d426efe05d2df5077 Mon Sep 17 00:00:00 2001 From: shiyunteng <shiyunteng@example.com> Date: 星期三, 10 六月 2026 08:16:23 +0800 Subject: [PATCH] feat:模版合同加备注、水电房屋租赁执行次数改为合同有效期、合同履约列表新增双方履约、开票新增拟开票数量 --- platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java | 104 +++++++++++++++++++++++++++------------------------ 1 files changed, 55 insertions(+), 49 deletions(-) diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java index 466b768..23e92ef 100644 --- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java +++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java @@ -79,58 +79,64 @@ @Column(columnDefinition="text comment '鍒拌揣鍗曟嵁璺緞'") private String arrivalAttPaths; - - //浠ヤ笅寮�绁ㄧ浉鍏� - - @Schema(description = "缁撶畻id") - @Column(columnDefinition = "bigint default null comment '缁撶畻id'") - private Long saleCreditId; - @Schema(description = "寮�绁ㄧ姸鎬侊紙0-鏈紑绁� 1-寮�绁ㄤ腑 2-宸插紑绁級") - @Column(columnDefinition = "tinyint(2) default 0 comment '寮�绁ㄧ姸鎬侊紙0-鏈紑绁� 1-寮�绁ㄤ腑 2-宸插紑绁級'") - private Integer invoiceSatus; + @Column(columnDefinition = "char default 0 comment '寮�绁ㄧ姸鎬侊紙0-鏈紑绁� 1-寮�绁ㄤ腑 2-宸插紑绁級'") + private String invoiceStatus; - @Schema(description = "鎬诲崟浠�") - @Column(columnDefinition = "decimal(10,0) comment '鎬诲崟浠�'") - private BigDecimal totalPrice; + @Schema(description = "宸插紑绁ㄦ暟閲�") + @Column(columnDefinition="decimal(10,2) comment '宸插紑绁ㄦ暟閲�'") + private BigDecimal invoiceNum; - @Schema(description = "鎬荤◣棰�") - @Column(columnDefinition = "decimal(10,0) comment '鎬荤◣棰�'") - private BigDecimal totalTax; - //浜у搧淇℃伅 +// //浠ヤ笅寮�绁ㄧ浉鍏� +// +// @Schema(description = "缁撶畻id") +// @Column(columnDefinition = "bigint default null comment '缁撶畻id'") +// private Long saleCreditId; +// - @Schema(description = "浜у搧id") - @Column(columnDefinition = "bigint comment '浜у搧id'") - private Long productId; - - @Schema(description = "寮�绁ㄤ骇鍝佸悕绉�") - @Column(columnDefinition = "VARCHAR(50) comment '寮�绁ㄤ骇鍝佸悕绉�'") - private String invoiceName; - - @Schema(description = "绋庣巼锛堢櫨鍒嗘瘮锛屽13琛ㄧず13%锛�") - @Column(columnDefinition = "double default 0.00 comment '绋庣巼'") - private Double taxRate; - - @Schema(description = "绋庢敹鍒嗙被") - @Column(columnDefinition = "VARCHAR(50) comment '绋庢敹鍒嗙被'") - private String taxClass; - - @Schema(description = "绋庢敹缂栫爜") - @Column(columnDefinition = "VARCHAR(80) comment '绋庢敹缂栫爜'") - private String taxCode; - - //鍚堝悓鏍囩殑鐗╀腑淇℃伅 - - @Schema(description = "鏍囩殑鐗╄鏍�/鍨嬪彿") - @Column(columnDefinition = "VARCHAR(200) comment '鏍囩殑鐗╄鏍�/鍨嬪彿'") - private String specification; - - @Schema(description = "璁￠噺鍗曚綅锛堜釜/鍙�/鍚�/椤�/濂楃瓑锛�") - @Column(columnDefinition = "VARCHAR(20) comment '璁￠噺鍗曚綅'") - private String unit; - - @Schema(description = "鍗曚环") - @Column(columnDefinition = "decimal(10,2) comment '鍗曚环'") - private BigDecimal unitPrice; +// +// @Schema(description = "鎬诲崟浠�") +// @Column(columnDefinition = "decimal(10,0) comment '鎬诲崟浠�'") +// private BigDecimal totalPrice; +// +// @Schema(description = "鎬荤◣棰�") +// @Column(columnDefinition = "decimal(10,0) comment '鎬荤◣棰�'") +// private BigDecimal totalTax; +// +// //浜у搧淇℃伅 +// +// @Schema(description = "浜у搧id") +// @Column(columnDefinition = "bigint comment '浜у搧id'") +// private Long productId; +// +// @Schema(description = "寮�绁ㄤ骇鍝佸悕绉�") +// @Column(columnDefinition = "VARCHAR(50) comment '寮�绁ㄤ骇鍝佸悕绉�'") +// private String invoiceName; +// +// @Schema(description = "绋庣巼锛堢櫨鍒嗘瘮锛屽13琛ㄧず13%锛�") +// @Column(columnDefinition = "double default 0.00 comment '绋庣巼'") +// private Double taxRate; +// +// @Schema(description = "绋庢敹鍒嗙被") +// @Column(columnDefinition = "VARCHAR(50) comment '绋庢敹鍒嗙被'") +// private String taxClass; +// +// @Schema(description = "绋庢敹缂栫爜") +// @Column(columnDefinition = "VARCHAR(80) comment '绋庢敹缂栫爜'") +// private String taxCode; +// +// //鍚堝悓鏍囩殑鐗╀腑淇℃伅 +// +// @Schema(description = "鏍囩殑鐗╄鏍�/鍨嬪彿") +// @Column(columnDefinition = "VARCHAR(200) comment '鏍囩殑鐗╄鏍�/鍨嬪彿'") +// private String specification; +// +// @Schema(description = "璁￠噺鍗曚綅锛堜釜/鍙�/鍚�/椤�/濂楃瓑锛�") +// @Column(columnDefinition = "VARCHAR(20) comment '璁￠噺鍗曚綅'") +// private String unit; +// +// @Schema(description = "鍗曚环") +// @Column(columnDefinition = "decimal(10,2) comment '鍗曚环'") +// private BigDecimal unitPrice; } -- Gitblit v1.9.1