From e02812df9217d3e50a368a8234c07c60c64c0ff4 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 05 八月 2026 08:34:26 +0800
Subject: [PATCH] feat:新增石煤机 机械厂模版合同/客户数据主数据同步接口/合同履约进度新增质保结束操作/合同开票状态 修改为待开 可开 已开/出库逻辑完善
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 188 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 154 insertions(+), 34 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 5d792d9..642f2a7 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
@@ -67,8 +67,8 @@
private Integer contractType;
@Schema(description = "渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬")
- @Column(columnDefinition = "tinyint(2) default 0 comment '渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬'")
- private Integer supplyAttribute;
+ @Column(columnDefinition = "varchar(16) default 0 comment '渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬'")
+ private String supplyAttribute;
@Schema(description = "鍚堝悓鐘舵�侊紙0-鑽夌 1-宸茬敓鏁� 2-宸茬粓姝� 3-宸茶繃鏈燂級")
@Column(columnDefinition = "tinyint(2) default 0 comment '鍚堝悓鐘舵��'")
@@ -95,7 +95,7 @@
private Date effectiveDate;
@Schema(description = "浜や粯鍛ㄦ湡")
- @Column(columnDefinition = "int default 0 comment '浜や粯鍛ㄦ湡'")
+ @Column(columnDefinition = "int default 0 comment '浜や粯鍛ㄦ湡 /鏈烘鍘傞攢鍞悎鍚岋紙鏈堬級'")
private Integer deliveryCycle;
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -107,6 +107,14 @@
@Schema(description = "鍚堝悓闄勪欢URL")
@Column(columnDefinition = "VARCHAR(500) comment '鍚堝悓闄勪欢URL'")
private String attachmentUrl;
+
+ @Schema(description = "鍚堝悓闄勪欢鍚嶇О")
+ @Column(columnDefinition = "VARCHAR(100) comment '鍚堝悓闄勪欢鍚嶇О'")
+ private String attachmentName;
+
+ @Schema(description = "浜哄憳缂栧彿")
+ @Column(columnDefinition = "VARCHAR(100) comment '浜哄憳缂栧彿'")
+ private String nickName;
@Schema(description = "澶囨敞")
@Column(columnDefinition = "TEXT comment '澶囨敞'")
@@ -131,12 +139,16 @@
@Column(columnDefinition = "bigint comment '楠屾敹鑺傜偣ID'")
private Long acceptScheduleId;
+ @Schema(description = "璐ㄤ繚鑺傜偣ID")
+ @Column(columnDefinition = "bigint comment '璐ㄤ繚鑺傜偣ID'")
+ private Long warrantyScheduleId;
+
@Schema(description = "erp鎺ㄩ�佹爣璇�")
@Column(columnDefinition = "char comment 'erp鎺ㄩ�佹爣璇� 0 鏈帹 1 宸叉帹'")
private String erpPushFlag;
@Schema(description = "寮�绁ㄧ姸鎬�")
- @Column(columnDefinition = "char comment '寮�绁ㄧ姸鎬� 0 涓嶈兘寮�绁� 1 閮ㄥ垎鍙紑 2 寰呭紑 3 宸插紑'")
+ @Column(columnDefinition = "char comment '寮�绁ㄧ姸鎬� 1 寰呭紑 2 鍙紑 3 瀹屾垚'")
private String billingStatus;
@Schema(description = "宸插紑绁ㄩ噾棰�")
@@ -180,15 +192,15 @@
private String environment;
@Schema(description = "鏍囧噯")
- @Column(columnDefinition = "VARCHAR(128) comment '鏍囧噯 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'")
+ @Column(columnDefinition = "VARCHAR(128) comment '鏍囧噯 涓�鐓ゆ満閲囪喘鍚堝悓鐢�/鏈烘鍘傞攢鍞悎鍚�'")
private String standard;
@Schema(description = "璐ㄤ繚鏈� 浣跨敤鏈堟暟")
- @Column(columnDefinition = "decimal(10,0) comment '璐ㄤ繚鏈� 浣跨敤鏈堟暟 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'")
+ @Column(columnDefinition = "decimal(10,0) comment '璐ㄤ繚鏈� 浣跨敤鏈堟暟 涓�鐓ゆ満閲囪喘鍚堝悓鐢�/鏈烘鍘傞攢鍞悎鍚�'")
private BigDecimal useMonth;
@Schema(description = "璐ㄤ繚鏈� 鍙戣揣鍚庢湀鏁�")
- @Column(columnDefinition = "decimal(10,0) comment '璐ㄤ繚鏈� 鍙戣揣鍚庢湀鏁� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'")
+ @Column(columnDefinition = "decimal(10,0) comment '璐ㄤ繚鏈� 鍙戣揣鍚庢湀鏁� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�/鏈烘鍘傞攢鍞悎鍚�'")
private BigDecimal afterShipMonth;
@Schema(description = "璐ц繍鏂瑰紡")
@@ -196,7 +208,7 @@
private String shipMethod;
@Schema(description = "璐ц繍鍦板潃")
- @Column(columnDefinition = "VARCHAR(128) comment '璐ц繍鍦板潃 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'")
+ @Column(columnDefinition = "VARCHAR(128) comment '璐ц繍鍦板潃 涓�鐓ゆ満閲囪喘鍚堝悓鐢� /鏈烘鍘傞攢鍞悎鍚�'")
private String shipAddress;
@Schema(description = "鍖呰")
@@ -232,7 +244,7 @@
private String court;
@Schema(description = "鏈悎鍚岄檮浠跺寘鎷細")
- @Column(columnDefinition = "VARCHAR(128) comment '鏈悎鍚岄檮浠跺寘鎷細 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'")
+ @Column(columnDefinition = "VARCHAR(128) comment '鏈悎鍚岄檮浠跺寘鎷細 涓�鐓ゆ満閲囪喘鍚堝悓鐢�/鏈烘鍘傞攢鍞悎鍚�'")
private String contractAttchment;
@Schema(description = "鍚堝悓绛捐甯�")
@@ -244,35 +256,143 @@
private String region;
@Schema(description = "寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐�")
- @Column(columnDefinition = "decimal(10,0) comment '寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'")
+ @Column(columnDefinition = "decimal(10,0) comment '寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐� 涓�鐓ゆ満閲囪喘鍚堝悓鐢� /鏈烘鍘傞攢鍞悎鍚�'")
private BigDecimal invoiceNotice;
- /**
- * 涓存椂瀛楁 - 鐢ㄤ簬鎺ユ敹瀹℃壒浜哄悕绉扮瓑鍏宠仈鏌ヨ缁撴灉
- */
- @Transient
- @TableField(exist = false)
- private String approverName;
- /**
- * 鏍囩殑鐗�
- */
- @Transient
- @TableField(exist = false)
- private List<ContractSubjectMatter> contractSubjectMatterList;
+ @Schema(description = "鍚堝悓鎬讳环绋庣巼")
+ @Column(columnDefinition = "decimal(10,2) comment '寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'")
+ private BigDecimal contractTax;
+ @Schema(description = "缁忔祹浜嬮」 bip鎺ㄩ�佸簲鏀剁敤")
+ @Column(columnDefinition = "VARCHAR(32) comment '缁忔祹浜嬮」 bip鎺ㄩ�佸簲鏀剁敤'")
+ private String economicMatters;
- /**
- * 鏀舵闃舵
- */
- @Transient
- @TableField(exist = false)
- private List<ContractPaymentSchedule> contractPaymentScheduleList;
+ @Schema(description = "erp鍚堝悓缂栧彿")
+ @Column(columnDefinition = "VARCHAR(64) comment 'erp鍚堝悓缂栧彿'")
+ private String erpContractNo;
- /**
- * 涓存椂瀛楁 - 鍚堝悓鍓╀綑澶╂暟
- */
- @Transient
- @TableField(exist = false)
- private Long remainingDays;
+ @Schema(description = "鐭冲伐娉垫暟鎹甀D")
+ @Column(columnDefinition = "VARCHAR(128) comment '鐭冲伐娉垫暟鎹甀D'")
+ private String dataId;
+
+ @Schema(description = "琛屼笟")
+ @Column(columnDefinition = "VARCHAR(50) comment '琛屼笟'")
+ private String industryCode;
+
+ @Schema(description = "鍖哄煙")
+ @Column(columnDefinition = "VARCHAR(50) comment '鍖哄煙'")
+ private String areaCode;
+
+ @Schema(description = "闇�鏂瑰湪鎺ュ埌閫氱煡鍚� 鏃ュ唴杩涜妫�楠�")
+ @Column(columnDefinition = "decimal(10,0) comment '鏈烘鍘傞攢鍞悎鍚� 闇�鏂瑰湪鎺ュ埌閫氱煡鍚� 鏃ュ唴杩涜妫�楠�'")
+ private BigDecimal inspectDay;
+
+ @Schema(description = "鏀跺埌渚涙柟閫氱煡鍚� 鏃ュ唴娲句汉楠屾敹")
+ @Column(columnDefinition = "decimal(10,0) comment '鏈烘鍘傞攢鍞悎鍚� 鏀跺埌渚涙柟閫氱煡鍚� 鏃ュ唴娲句汉楠屾敹'")
+ private BigDecimal acceptDay;
+
+ @Schema(description = "寤堕獙鏀惰秴杩� 鏃�")
+ @Column(columnDefinition = "decimal(10,0) comment '鏈烘鍘傞攢鍞悎鍚� 寤堕獙鏀惰秴杩� 鏃�'")
+ private BigDecimal delayAcceptDay;
+
+ @Schema(description = "楠屾敹鍚堟牸鍚� 涓伐浣滄棩")
+ @Column(columnDefinition = "decimal(10,0) comment '鏈烘鍘傞攢鍞悎鍚� 楠屾敹鍚堟牸鍚� 涓伐浣滄棩'")
+ private BigDecimal acceptPassDay;
+
+ @Schema(description = "楠屾敹鍚堟牸鍚戜緵鏂硅冻棰濇敮浠樺悎鍚屾�讳环鐨�")
+ @Column(columnDefinition = "decimal(10,2) comment '鏈烘鍘傞攢鍞悎鍚� 楠屾敹鍚堟牸鍚戜緵鏂硅冻棰濇敮浠樺悎鍚屾�讳环鐨�'")
+ private BigDecimal acceptPassAmount;
+
+ @Schema(description = "鏃ュ唴寮�濮嬪彂璐�")
+ @Column(columnDefinition = "decimal(10,0) comment '鏈烘鍘傞攢鍞悎鍚� 鏃ュ唴寮�濮嬪彂璐�'")
+ private BigDecimal deliverDay;
+
+ @Schema(description = "鏃ュ唴鍙戝畬")
+ @Column(columnDefinition = "decimal(10,0) comment '鏈烘鍘傞攢鍞悎鍚� 鏃ュ唴鍙戝畬'")
+ private BigDecimal deliverCompleteDay;
+
+ @Schema(description = "渚涙柟浠ｇ悊")
+ @Column(columnDefinition = "VARCHAR(50) comment '渚涙柟浠ｇ悊'")
+ private String supplierAgent;
+
+ @Schema(description = "渚涙柟浠ｇ悊韬唤璇�")
+ @Column(name = "supplier_agent_id_card",columnDefinition = "VARCHAR(50) comment '渚涙柟浠ｇ悊韬唤璇�'")
+ private String supplierAgentIdCard;
+
+ @Schema(description = "闇�鏂逛唬鐞�")
+ @Column(columnDefinition = "VARCHAR(50) comment '闇�鏂逛唬鐞�'")
+ private String buyerAgent;
+
+ @Schema(description = "闇�鏂逛唬鐞嗚韩浠借瘉")
+ @Column(name = "buyer_agent_id_card",columnDefinition = "VARCHAR(50) comment '闇�鏂逛唬鐞嗚韩浠借瘉'")
+ private String buyerAgentIdCard;
+
+ @Schema(description = "浠ｇ悊鏉冮檺")
+ @Column(columnDefinition = "VARCHAR(250) comment '浠ｇ悊鏉冮檺'")
+ private String agentAuthority;
+
+ @Schema(description = "闇�鏂瑰悜渚涙柟瓒抽鏀粯棰勪粯娆�")
+ @Column(columnDefinition = "decimal(10,2) comment '鏈烘鍘傞攢鍞悎鍚� 闇�鏂瑰悜渚涙柟瓒抽鏀粯棰勪粯娆�'")
+ private BigDecimal advancePayment;
+
+ @Schema(description = "寤舵湡鏀粯棰勪粯娆�")
+ @Column(columnDefinition = "decimal(10,2) comment '鏈烘鍘傞攢鍞悎鍚� 寤舵湡鏀粯棰勪粯娆�'")
+ private BigDecimal delayPayAdvancePayment;
+
+ @Schema(description = "寤舵湡鏀粯杩涘害娆�")
+ @Column(columnDefinition = "decimal(10,2) comment '鏈烘鍘傞攢鍞悎鍚� 寤舵湡鏀粯杩涘害娆�'")
+ private BigDecimal delayPayProcessPayment;
+
+ @Schema(description = "鏀跺埌棰勪粯娆句箣鏃ヨ捣 涓湀鍐呮湭鐢熶骇瀹屾垚")
+ @Column(columnDefinition = "decimal(10,0) comment '鏈烘鍘傞攢鍞悎鍚� 鏀跺埌棰勪粯娆句箣鏃ヨ捣 涓湀鍐呮湭鐢熶骇瀹屾垚'")
+ private BigDecimal receiveAdvancePaymentMonth;
+
+ @Schema(description = "骞舵彁鍓� 鍚勫伐浣滄棩閫氱煡闇�鏂归獙鏀�")
+ @Column(columnDefinition = "decimal(10,0) comment '鏈烘鍘傞攢鍞悎鍚� 骞舵彁鍓� 鍚勫伐浣滄棩閫氱煡闇�鏂归獙鏀�'")
+ private BigDecimal noticeSupplierAcceptDay;
+
+ @Schema(description = "姣忛�炬湡 鏃�")
+ @Column(columnDefinition = "decimal(10,0) comment '鏈烘鍘傞攢鍞悎鍚� 姣忛�炬湡 鏃�'")
+ private BigDecimal overdueDay;
+
+ @Schema(description = "鎸夊悎鍚屾�讳环鐨� 鍋夸粯闇�鏂规崯澶�")
+ @Column(columnDefinition = "decimal(10,2) comment '鏈烘鍘傞攢鍞悎鍚� 鎸夊悎鍚屾�讳环鐨� 鍋夸粯闇�鏂规崯澶�'")
+ private BigDecimal lossAmount;
+
+ @Schema(description = "杩濈害閲戞渶楂樹笉瓒呰繃鍚堝悓鎬讳环鐨�")
+ @Column(columnDefinition = "decimal(10,2) comment '鏈烘鍘傞攢鍞悎鍚� 杩濈害閲戞渶楂樹笉瓒呰繃鍚堝悓鎬讳环鐨�'")
+ private BigDecimal liquidatedDamagesHighSupplier;
+
+ @Schema(description = "闇�鏂瑰閫炬湡浠樻姣忛�炬湡 鏃�")
+ @Column(columnDefinition = "decimal(10,0) comment '鏈烘鍘傞攢鍞悎鍚� 姣忛�炬湡 鏃�'")
+ private BigDecimal overdueDayXf;
+
+ @Schema(description = "闇�鏂瑰閫炬湡浠樻鎸夊悎鍚屾�讳环鐨� 鍋夸粯闇�鏂规崯澶�")
+ @Column(columnDefinition = "decimal(10,2) comment '鏈烘鍘傞攢鍞悎鍚� 鎸夊悎鍚屾�讳环鐨� 鍋夸粯闇�鏂规崯澶�'")
+ private BigDecimal lossAmountXf;
+
+ @Schema(description = "杩濈害閲戞渶楂樹笉瓒呰繃鍚堝悓鎬讳环鐨�")
+ @Column(columnDefinition = "decimal(10,2) comment '鏈烘鍘傞攢鍞悎鍚� 杩濈害閲戞渶楂樹笉瓒呰繃鍚堝悓鎬讳环鐨�'")
+ private BigDecimal liquidatedDamagesHighBuyer;
+
+ @Schema(description = "鏈悎鍚屼竴寮� 浠�")
+ @Column(columnDefinition = "decimal(10,0) comment '鏈烘鍘傞攢鍞悎鍚� 鏈悎鍚屼竴寮� 浠�'")
+ private BigDecimal totalParts;
+
+ @Schema(description = "渚涙柟鎵� 浠�")
+ @Column(columnDefinition = "decimal(10,0) comment '鏈烘鍘傞攢鍞悎鍚� 渚涙柟鎵� 浠�'")
+ private BigDecimal supplierPart;
+
+ @Schema(description = "闇�鏂规墽 浠�")
+ @Column(columnDefinition = "decimal(10,0) comment '鏈烘鍘傞攢鍞悎鍚� 闇�鏂规墽 浠�'")
+ private BigDecimal buyerPart;
+
+ @Schema(description = "浠樻鏂瑰紡")
+ @Column(columnDefinition = "VARCHAR(50) comment '浠樻鏂瑰紡'")
+ private String paymentMethod;
+
+ @Schema(description = "鍑哄簱閲戦")
+ @Column(columnDefinition = "decimal(10,2) comment '鍑哄簱閲戦'")
+ private BigDecimal outBoundAmout;
}
--
Gitblit v1.9.1