From 909270d0f53cc42989b23042d684e8e822aae73b Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 01 六月 2026 09:12:18 +0800
Subject: [PATCH] fix:部分表字段注释及非空 新增获取水印时间接口
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 2 +-
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java | 12 ++++++++++++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/TestController.java | 11 +++++++++++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractOutBound.java | 6 +++---
4 files changed, 27 insertions(+), 4 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..de8b7a5 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,7 +168,7 @@
private String execFrequency;
@Schema(description = "鎵ц娆℃暟")
- @Column(columnDefinition = "int comment '鍚堝悓鍒嗙被 water_house 姘寸數鎴垮眿绉熻祦'")
+ @Column(columnDefinition = "int comment '鎵ц娆℃暟'")
private Integer execTimes;
@Schema(description = "鎵ц鏃ユ湡鍚庡灏戝ぉ鐢熸垚搴旀敹")
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 2d6769d..b61a18a 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
@@ -22,7 +22,7 @@
public class ContractOutBound extends BaseModel<ContractOutBound> {
@Schema(description = "Erp鍑哄簱Id")
- @Column(columnDefinition = "bigint not null comment 'Erp鍑哄簱Id'")
+ @Column(columnDefinition = "bigint comment 'Erp鍑哄簱Id'")
private Long OutBoundId;
@Schema(description = "鍏宠仈鍚堝悓ID")
@@ -91,7 +91,7 @@
private Integer invoiceSatus;
@Schema(description = "鎬诲崟浠�")
- @Column(columnDefinition = "decimal(10,0) comment '鍑哄簱鏁伴噺'")
+ @Column(columnDefinition = "decimal(10,0) comment '鎬诲崟浠�'")
private BigDecimal totalPrice;
@Schema(description = "鎬荤◣棰�")
@@ -101,7 +101,7 @@
//浜у搧淇℃伅
@Schema(description = "浜у搧id")
- @Column(columnDefinition = "bigint not null comment '浜у搧id'")
+ @Column(columnDefinition = "bigint comment '浜у搧id'")
private Long productId;
@Schema(description = "绋庣巼锛堢櫨鍒嗘瘮锛屽13琛ㄧず13%锛�")
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
index c2df2ee..702f73f 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
@@ -77,6 +77,18 @@
@Schema(description = "鍚堝悓鍒嗙被")
private String contractCategory;
+ @Schema(description = "绛捐鍦扮偣")
+ private String signPlace;
+
+ @Schema(description = "鎵ц鍛ㄦ湡 1/鍛� 2/鏈� 3/瀛ｅ害 4/鍗婂勾 5/骞�")
+ private String execFrequency;
+
+ @Schema(description = "鎵ц娆℃暟")
+ private Integer execTimes;
+
+ @Schema(description = "鎵ц鏃ユ湡鍚庡灏戝ぉ鐢熸垚搴旀敹")
+ private Integer execDay;
+
private List<ContractPaymentSchedule> contractPaymentSchedule;
private List<ContractSubjectMatter> contractSubjectMatter;
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/TestController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/TestController.java
index 4394b23..2a844a0 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/TestController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/TestController.java
@@ -1,5 +1,6 @@
package com.by4cloud.platformx.business.controller;
+import cn.hutool.core.date.DateUtil;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.security.annotation.Inner;
import org.springframework.web.bind.annotation.GetMapping;
@@ -16,4 +17,14 @@
return R.ok();
}
+ /**
+ * 瀹氭椂鐢熸垚搴旀敹閫炬湡
+ * @return R
+ */
+ @GetMapping("/getToday" )
+ @Inner(value = false)
+ public R genCurrentOverdue() {
+ return R.ok(DateUtil.today());
+ }
+
}
--
Gitblit v1.9.1