From a7f86b6000033c135f233d9fbf4131532b1ff95c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 13 八月 2026 16:27:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierApplyDO.java | 4 ++++
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/TenderStatusEnum.java | 4 ++--
yudao-module-srm/src/main/resources/sql/srm_init.sql | 4 +++-
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyRespVO.java | 9 +++++++++
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java | 3 +++
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplySaveReqVO.java | 9 +++++++++
6 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyRespVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyRespVO.java
index 180780d..47f69b1 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyRespVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplyRespVO.java
@@ -40,6 +40,12 @@
@Schema(description = "鍏徃鍦板潃", example = "涓婃捣甯傛郸涓滄柊鍖篨X璺疿X鍙�")
private String address;
+ @Schema(description = "寮�鎴烽摱琛�", example = "涓浗宸ュ晢閾惰涓婃捣鍒嗚")
+ private String bankName;
+
+ @Schema(description = "閾惰璐﹀彿", example = "622202xxxxxxxxxxxx")
+ private String bankAccount;
+
@Schema(description = "鑱旂郴浜�", example = "寮犱笁")
private String contactName;
@@ -49,6 +55,9 @@
@Schema(description = "閭", example = "zhangsan@example.com")
private String contactEmail;
+ @Schema(description = "澶囨敞", example = "浼樺厛渚涜揣")
+ private String remark;
+
@Schema(description = "鐢宠浜篒D", example = "1")
private Long applyUserId;
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplySaveReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplySaveReqVO.java
index 3148832..4f63577 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplySaveReqVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/apply/vo/SrmSupplierApplySaveReqVO.java
@@ -36,6 +36,12 @@
@Schema(description = "鍏徃鍦板潃", example = "涓婃捣甯傛郸涓滄柊鍖篨X璺疿X鍙�")
private String address;
+ @Schema(description = "寮�鎴烽摱琛�", example = "涓浗宸ュ晢閾惰涓婃捣鍒嗚")
+ private String bankName;
+
+ @Schema(description = "閾惰璐﹀彿", example = "622202xxxxxxxxxxxx")
+ private String bankAccount;
+
@Schema(description = "鑱旂郴浜�", example = "寮犱笁")
private String contactName;
@@ -45,4 +51,7 @@
@Schema(description = "閭", example = "zhangsan@example.com")
private String contactEmail;
+ @Schema(description = "澶囨敞", example = "浼樺厛渚涜揣")
+ private String remark;
+
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierApplyDO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierApplyDO.java
index 0e8257b..8c0d57b 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierApplyDO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/dal/dataobject/SrmSupplierApplyDO.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.*;
import java.math.BigDecimal;
@@ -34,6 +35,8 @@
private String businessLicenseNo;
private String taxNo;
private String address;
+ private String bankName;
+ private String bankAccount;
private String contactName;
private String contactMobile;
private String contactEmail;
@@ -53,5 +56,6 @@
private Long financeReviewerId;
private LocalDateTime financeReviewTime;
private String financeReviewOpinion;
+ private String remark;
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/TenderStatusEnum.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/TenderStatusEnum.java
index 99bff78..5ab62d6 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/TenderStatusEnum.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/enums/TenderStatusEnum.java
@@ -44,9 +44,9 @@
return DRAFT.getCode().equals(status);
}
- /** PUBLISHED 鎴� BIDDING锛堝畬鏁寸増锛夛紝鎴� PRICE_COMPARING锛堢畝鏄撶増锛夊厑璁镐緵搴斿晢鎶曟爣 */
+ /** BIDDING锛堝畬鏁寸増锛夛紝鎴� PRICE_COMPARING锛堢畝鏄撶増锛夊厑璁镐緵搴斿晢鎶曟爣 */
public static boolean canCreateBid(Integer status) {
- return PUBLISHED.getCode().equals(status) || BIDDING.getCode().equals(status)
+ return BIDDING.getCode().equals(status)
|| PRICE_COMPARING.getCode().equals(status);
}
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java
index c7a6914..58988e0 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/service/apply/SrmSupplierApplyServiceImpl.java
@@ -159,9 +159,12 @@
supplier.setBusinessLicenseNo(apply.getBusinessLicenseNo());
supplier.setTaxNo(apply.getTaxNo());
supplier.setAddress(apply.getAddress());
+ supplier.setBankName(apply.getBankName());
+ supplier.setBankAccount(apply.getBankAccount());
supplier.setContactName(apply.getContactName());
supplier.setContactMobile(apply.getContactMobile());
supplier.setContactEmail(apply.getContactEmail());
+ supplier.setRemark(apply.getRemark());
supplier.setStatus(0);
supplierMapper.insert(supplier);
diff --git a/yudao-module-srm/src/main/resources/sql/srm_init.sql b/yudao-module-srm/src/main/resources/sql/srm_init.sql
index 2969d5a..faef6eb 100644
--- a/yudao-module-srm/src/main/resources/sql/srm_init.sql
+++ b/yudao-module-srm/src/main/resources/sql/srm_init.sql
@@ -95,6 +95,8 @@
business_license_no VARCHAR(100) DEFAULT NULL COMMENT '钀ヤ笟鎵х収缂栧彿',
tax_no VARCHAR(100) DEFAULT NULL COMMENT '绋庡彿',
address VARCHAR(500) DEFAULT NULL COMMENT '鍏徃鍦板潃',
+ bank_name VARCHAR(255) DEFAULT NULL COMMENT '寮�鎴烽摱琛�',
+ bank_account VARCHAR(100) DEFAULT NULL COMMENT '閾惰璐﹀彿',
contact_name VARCHAR(50) DEFAULT NULL COMMENT '鑱旂郴浜�',
contact_mobile VARCHAR(20) DEFAULT NULL COMMENT '鑱旂郴鐢佃瘽',
contact_email VARCHAR(100) DEFAULT NULL COMMENT '閭',
@@ -111,6 +113,7 @@
finance_reviewer_id BIGINT DEFAULT NULL COMMENT '璐㈠姟瀹℃牳浜篒D',
finance_review_time DATETIME DEFAULT NULL COMMENT '璐㈠姟瀹℃牳鏃堕棿',
finance_review_opinion VARCHAR(500) DEFAULT NULL COMMENT '璐㈠姟瀹℃牳鎰忚',
+ remark VARCHAR(500) DEFAULT NULL COMMENT '澶囨敞',
creator VARCHAR(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
updater VARCHAR(64) DEFAULT '' COMMENT '鏇存柊鑰�',
@@ -362,4 +365,3 @@
KEY idx_supplier_id (supplier_id),
KEY idx_purchase_order_id (purchase_order_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='瀹氭爣璁板綍琛�';
-
--
Gitblit v1.9.3