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/ContractSubjectMatter.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java
index 472b9e5..9e6e16d 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java
@@ -28,21 +28,13 @@
@EqualsAndHashCode(callSuper = true)
public class ContractSubjectMatter extends BaseModel<ContractSubjectMatter> {
- @Schema(description = "鎺掍骇璁″垝ID")
- @Column(columnDefinition = "bigint comment '鎺掍骇璁″垝ID'")
- private Long productionPlanId;
-
- @Schema(description = "鎺掍骇璁″垝鍚嶇О")
- @Column(columnDefinition = "VARCHAR(200) comment '鎺掍骇璁″垝鍚嶇О'")
- private String productionPlanName;
-
@Schema(description = "鍏宠仈鍚堝悓ID")
@Column(columnDefinition = "bigint comment '鍏宠仈鍚堝悓ID'")
private Long contractId;
- @Schema(description = "鍚堝悓鍚嶇О")
- @Column(columnDefinition = "VARCHAR(200) comment '鍚堝悓鍚嶇О'")
- private String contractName;
+ @Schema(description = "鏍囩殑鐗╄鍙�")
+ @Column(columnDefinition = "VARCHAR(10) comment '鏍囩殑鐗╄鍙�'")
+ private String lineNo;
@Schema(description = "鏍囩殑鐗╁悕绉�")
@Column(columnDefinition = "VARCHAR(200) comment '鏍囩殑鐗╁悕绉�'")
@@ -106,11 +98,11 @@
@Column(columnDefinition = "date comment '璁″垝浜や粯鏃ユ湡'")
private Date plannedDeliveryDate;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "瀹為檯浜や粯鏃ユ湡")
- @Column(columnDefinition = "VARCHAR(64) comment '瀹為檯浜や粯鏃ユ湡'")
- private String actualDeliveryDate;
+ @Column(columnDefinition = "date comment '瀹為檯浜や粯鏃ユ湡'")
+ private Date actualDeliveryDate;
@Schema(description = "浜や粯鐘舵�侊紙0-鏈氦浠� 1-閮ㄥ垎浜や粯 2-宸蹭氦浠橈級")
@Column(columnDefinition = "tinyint(2) default 0 comment '浜や粯鐘舵��'")
--
Gitblit v1.9.1