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/Contract.java | 98 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 73 insertions(+), 25 deletions(-) diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java index 533c01b..c4de463 100644 --- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java +++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java @@ -168,39 +168,87 @@ private String execFrequency; @Schema(description = "鎵ц娆℃暟") - @Column(columnDefinition = "int comment '鍚堝悓鍒嗙被 water_house 姘寸數鎴垮眿绉熻祦'") + @Column(columnDefinition = "int comment '鎵ц娆℃暟'") private Integer execTimes; @Schema(description = "鎵ц鏃ユ湡鍚庡灏戝ぉ鐢熸垚搴旀敹") @Column(columnDefinition = "int comment '鎵ц鏃ユ湡鍚庡灏戝ぉ鐢熸垚搴旀敹'") private Integer execDay; - /** - * 涓存椂瀛楁 - 鐢ㄤ簬鎺ユ敹瀹℃壒浜哄悕绉扮瓑鍏宠仈鏌ヨ缁撴灉 - */ - @Transient - @TableField(exist = false) - private String approverName; - /** - * 鏍囩殑鐗� - */ - @Transient - @TableField(exist = false) - private List<ContractSubjectMatter> contractSubjectMatterList; + @Schema(description = "鐜") + @Column(columnDefinition = "VARCHAR(128) comment '鐜 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private String environment; + @Schema(description = "鏍囧噯") + @Column(columnDefinition = "VARCHAR(128) comment '鏍囧噯 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private String standard; - /** - * 鏀舵闃舵 - */ - @Transient - @TableField(exist = false) - private List<ContractPaymentSchedule> contractPaymentScheduleList; + @Schema(description = "璐ㄤ繚鏈� 浣跨敤鏈堟暟") + @Column(columnDefinition = "decimal(10,0) comment '璐ㄤ繚鏈� 浣跨敤鏈堟暟 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private BigDecimal useMonth; - /** - * 涓存椂瀛楁 - 鍚堝悓鍓╀綑澶╂暟 - */ - @Transient - @TableField(exist = false) - private Long remainingDays; + @Schema(description = "璐ㄤ繚鏈� 鍙戣揣鍚庢湀鏁�") + @Column(columnDefinition = "decimal(10,0) comment '璐ㄤ繚鏈� 鍙戣揣鍚庢湀鏁� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private BigDecimal afterShipMonth; + + @Schema(description = "璐ц繍鏂瑰紡") + @Column(columnDefinition = "VARCHAR(128) comment '璐ц繍鏂瑰紡 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private String shipMethod; + + @Schema(description = "璐ц繍鍦板潃") + @Column(columnDefinition = "VARCHAR(128) comment '璐ц繍鍦板潃 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private String shipAddress; + + @Schema(description = "鍖呰") + @Column(columnDefinition = "VARCHAR(128) comment '鍖呰 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private String packaging; + + @Schema(description = "缁翠慨鎴栨崲璐ф湡闄�") + @Column(columnDefinition = "decimal(10,0) comment '缁翠慨鎴栨崲璐ф湡闄� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private BigDecimal repairPeriod; + + @Schema(description = "缁翠慨鎴栨崲璐� 杩濈害閲�") + @Column(columnDefinition = "decimal(10,2) comment '缁翠慨鎴栨崲璐� 杩濈害閲� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private BigDecimal repairBreachAmount; + + @Schema(description = "璐х墿鏁伴噺涓嶈冻 琛ヨ揣澶╂暟") + @Column(columnDefinition = "decimal(10,0) comment '璐х墿鏁伴噺涓嶈冻 琛ヨ揣澶╂暟 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private BigDecimal goodsShort; + + @Schema(description = "璐х墿鏁伴噺涓嶈冻 杩濈害閲�") + @Column(columnDefinition = "decimal(10,2) comment '璐х墿鏁伴噺涓嶈冻 琛ヨ揣澶╂暟 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private BigDecimal goodsShortBreachAmount; + + @Schema(description = "姣忛�炬湡涓�鏃ワ紝鎵挎媴鏈悎鍚屾�婚 杩濈害閲�") + @Column(columnDefinition = "decimal(10,2) comment '姣忛�炬湡涓�鏃ワ紝鎵挎媴鏈悎鍚屾�婚杩濈害閲� 琛ヨ揣澶╂暟 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private BigDecimal overdueBreachAmount; + + @Schema(description = "閫炬湡 鏃ヤ互涓婄殑锛岀敳鏂规湁鏉冭В闄ゅ悎鍚�") + @Column(columnDefinition = "decimal(10,0) comment '閫炬湡 鏃ヤ互涓婄殑锛岀敳鏂规湁鏉冭В闄ゅ悎鍚� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private BigDecimal terminateContract; + + @Schema(description = "鍙屾柟鍧囧彲鍚� 浜烘皯娉曢櫌") + @Column(columnDefinition = "VARCHAR(128) comment '鍙屾柟鍧囧彲鍚� 浜烘皯娉曢櫌 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private String court; + + @Schema(description = "鏈悎鍚岄檮浠跺寘鎷細") + @Column(columnDefinition = "VARCHAR(128) comment '鏈悎鍚岄檮浠跺寘鎷細 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private String contractAttchment; + + @Schema(description = "鍚堝悓绛捐甯�") + @Column(columnDefinition = "VARCHAR(128) comment '鍚堝悓绛捐甯� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private String city; + + @Schema(description = "鍚堝悓绛捐鍖�") + @Column(columnDefinition = "VARCHAR(128) comment '鍚堝悓绛捐鍖� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private String region; + + @Schema(description = "寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐�") + @Column(columnDefinition = "decimal(10,0) comment '寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private BigDecimal invoiceNotice; + + @Schema(description = "鍚堝悓鎬讳环绋庣巼") + @Column(columnDefinition = "decimal(10,2) comment '寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'") + private BigDecimal contractTax; } -- Gitblit v1.9.1