From 518fea59e286ce07ad201b607f68934d240ff040 Mon Sep 17 00:00:00 2001
From: cuida <xiaocuijustsoso@163.com>
Date: 星期四, 30 四月 2026 15:17:37 +0800
Subject: [PATCH] fix:实体中包替换

---
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java                |   42 +++++++++++++++-----
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java   |   25 ++++++------
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java  |   11 +++++
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java |   11 +++--
 4 files changed, 60 insertions(+), 29 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 3b77c3a..d0f4acb 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
@@ -2,26 +2,29 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import lombok.Data;
-import org.hibernate.annotations.Table;
-
-import javax.persistence.Transient;
-import java.math.BigDecimal;
-
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.List;
 
 /**
  * @author cd
- * @description
+ * @description 鍚堝悓绠＄悊
  * @date 2026/4/29 10:51
  **/
 @Data
 @Entity
-@Table(appliesTo = "contract", comment = "鍚堝悓绠＄悊")
+@Table(name = "contract")
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 public class Contract extends BaseModel<Contract> {
 
 
@@ -42,8 +45,8 @@
     private String partyA;
 
     @Schema(description = "涔欐柟id")
-    @Column(columnDefinition = "VARCHAR(100) comment '涔欐柟id'")
-    private String partyBId;
+    @Column(columnDefinition = "bigint comment '涔欐柟id'")
+    private Long partyBId;
 
     @Schema(description = "涔欐柟鍚嶇О")
     @Column(columnDefinition = "VARCHAR(100) comment '涔欐柟鍚嶇О'")
@@ -60,6 +63,10 @@
     @Schema(description = "鍚堝悓绫诲瀷锛�0-鐢熸垚寮� 1-澶囨寮忥級")
     @Column(columnDefinition = "tinyint(2) default 0 comment '鍚堝悓绫诲瀷'")
     private Integer contractType;
+
+    @Schema(description = "渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬")
+    @Column(columnDefinition = "tinyint(2) default 0 comment '渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬'")
+    private Integer supplyAttribute;
 
     @Schema(description = "鍚堝悓鐘舵�侊紙0-鑽夌 1-宸茬敓鏁� 2-宸茬粓姝� 3-宸茶繃鏈燂級")
     @Column(columnDefinition = "tinyint(2) default 0 comment '鍚堝悓鐘舵��'")
@@ -112,12 +119,25 @@
     @Transient
     @TableField(exist = false)
     private String approverName;
+    /**
+     * 鏍囩殑鐗�
+     */
+    @Transient
+    @TableField(exist = false)
+    private List<ContractSubjectMatter> contractSubjectMatterList;
+
+
+    /**
+     * 鏀舵闃舵
+     */
+    @Transient
+    @TableField(exist = false)
+    private List<ContractPaymentSchedule> contractPaymentScheduleList;
 
     /**
      * 涓存椂瀛楁 - 鍚堝悓鍓╀綑澶╂暟
      */
     @Transient
     @TableField(exist = false)
-    @Schema(description = "鍚堝悓鍓╀綑澶╂暟锛堜复鏃跺瓧娈碉級")
     private Long remainingDays;
 }
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java
index 04ff428..614592d 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java
@@ -6,13 +6,12 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
 import lombok.Data;
-import org.hibernate.annotations.Table;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 鍚堝悓鏀舵璁″垝/灞ョ害鑺傜偣瀹炰綋绫�
@@ -23,7 +22,9 @@
  */
 @Data
 @Entity
-@Table(appliesTo = "contract_payment_schedule", comment = "鍚堝悓鏀舵璁″垝/灞ョ害鑺傜偣琛�")
+@Table(name = "contract_payment_schedule")
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 public class ContractPaymentSchedule extends BaseModel<ContractPaymentSchedule> {
 
     // ==================== 鍏宠仈淇℃伅 ====================
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 a9ef21c..4e8a4b1 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
@@ -6,13 +6,12 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
 import lombok.Data;
-import org.hibernate.annotations.Table;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 鍚堝悓鏍囩殑鐗╂槑缁嗗疄浣撶被
@@ -21,7 +20,9 @@
  */
 @Data
 @Entity
-@Table(appliesTo = "contract_subject_matter", comment = "鍚堝悓鏍囩殑鐗╂槑缁嗚〃")
+@Table(name = "contract_subject_matter")
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 public class ContractSubjectMatter extends BaseModel<ContractSubjectMatter> {
 
     @Schema(description = "鍏宠仈鍚堝悓ID")
@@ -91,14 +92,14 @@
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "璁″垝浜や粯鏃ユ湡")
-    @Column(columnDefinition = "datetime comment '璁″垝浜や粯鏃ユ湡'")
-    private Date plannedDeliveryDate;
+    @Column(columnDefinition = "VARCHAR(64) comment '璁″垝浜や粯鏃ユ湡'")
+    private String plannedDeliveryDate;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "瀹為檯浜や粯鏃ユ湡")
-    @Column(columnDefinition = "datetime comment '瀹為檯浜や粯鏃ユ湡'")
-    private Date actualDeliveryDate;
+    @Column(columnDefinition = "VARCHAR(64) comment '瀹為檯浜や粯鏃ユ湡'")
+    private String actualDeliveryDate;
 
     @Schema(description = "浜や粯鐘舵�侊紙0-鏈氦浠� 1-閮ㄥ垎浜や粯 2-宸蹭氦浠� 3-閫炬湡锛�")
     @Column(columnDefinition = "tinyint(2) default 0 comment '浜や粯鐘舵��'")
@@ -127,8 +128,8 @@
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @Schema(description = "楠屾敹鏃堕棿")
-    @Column(columnDefinition = "datetime comment '楠屾敹鏃堕棿'")
-    private Date acceptTime;
+    @Column(columnDefinition = "VARCHAR(64) comment '楠屾敹鏃堕棿'")
+    private String acceptTime;
 
 
     /**
@@ -137,5 +138,5 @@
     @Transient
     @TableField(exist = false)
     @Schema(description = "宸蹭氦浠樻暟閲忥紙涓存椂瀛楁锛�")
-    private BigDecimal deliveredQuantity;
+    private Double deliveredQuantity;
 }
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
index ecef49e..5910bc1 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
@@ -7,8 +7,11 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.by4cloud.platformx.business.entity.Contract;
 import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
 import com.by4cloud.platformx.common.log.annotation.SysLog;
 import com.by4cloud.platformx.business.service.ContractService;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -48,7 +51,10 @@
     @PreAuthorize("@pms.hasPermission('business_contract_view')" )
     public R getContractPage(@ParameterObject Page page, @ParameterObject Contract contract) {
         LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery();
-        return R.ok(contractService.page(page, wrapper));
+        wrapper.like(StringUtils.isNotBlank(contract.getContractName()),Contract::getContractName,contract.getContractName());
+        wrapper.like(StringUtils.isNotBlank(contract.getPartyA()),Contract::getPartyA,contract.getPartyA());
+        wrapper.orderByDesc(BaseModel::getCreateTime);
+        return R.ok(contractService.pageByScope(page, wrapper));
     }
 
 
@@ -74,6 +80,9 @@
     @PostMapping
     @PreAuthorize("@pms.hasPermission('business_contract_add')" )
     public R save(@RequestBody Contract contract) {
+        Long compId = SecurityUtils.getUser().getCompId();
+        contract.setPartyBId(contract.getCompId());
+        contract.setPartyB(contract.getCompName());
         return R.ok(contractService.save(contract));
     }
 

--
Gitblit v1.9.1