From a0c9adb1e44f502c0473e9aafb7545981173b130 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 25 三月 2026 13:19:32 +0800
Subject: [PATCH] refactor(customer): 注释Excel导出相关字段及优化批量导入逻辑
---
src/main/java/com/ruoyi/basic/pojo/Customer.java | 18 +++++++++---------
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 7 ++++++-
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 101d72a..10da212 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -50,25 +50,25 @@
@TableField(exist = false)
private Date followUpTime;
- @Excel(name = "瀹㈡埛鍒嗙被")
+// @Excel(name = "瀹㈡埛鍒嗙被")
private String customerType;
/**
* 绾崇◣浜鸿瘑鍒彿
*/
- @Excel(name = "绾崇◣浜鸿瘑鍒彿")
+// @Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNumber;
/**
* 鍏徃鍦板潃
*/
- @Excel(name = "鍏徃鍦板潃")
+// @Excel(name = "鍏徃鍦板潃")
private String companyAddress;
/**
* 鍏徃鐢佃瘽
*/
- @Excel(name = "鍏徃鐢佃瘽")
+// @Excel(name = "鍏徃鐢佃瘽")
private String companyPhone;
/**
@@ -86,14 +86,14 @@
/**
* 缁存姢浜�
*/
- @Excel(name = "缁存姢浜�")
+// @Excel(name = "缁存姢浜�")
private String maintainer;
/**
* 缁存姢鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "缁存姢鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
+// @Excel(name = "缁存姢鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd")
private Date maintenanceTime;
@TableField(fill = FieldFill.INSERT)
@@ -106,14 +106,14 @@
private String addressPhone;
@ApiModelProperty(value = "閾惰鍩烘湰鎴�")
- @Excel(name = "閾惰鍩烘湰鎴�")
+// @Excel(name = "閾惰鍩烘湰鎴�")
private String basicBankAccount;
@ApiModelProperty(value = "閾惰璐﹀彿")
- @Excel(name = "閾惰璐﹀彿")
+// @Excel(name = "閾惰璐﹀彿")
private String bankAccount;
@ApiModelProperty(value = "寮�鎴疯鍙�")
- @Excel(name = "寮�鎴疯鍙�")
+// @Excel(name = "寮�鎴疯鍙�")
private String bankCode;
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index 0595e0b..3c8327a 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -29,6 +29,7 @@
import com.ruoyi.sales.pojo.SalesLedger;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.aop.framework.AopContext;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -256,7 +257,11 @@
if (CollectionUtils.isEmpty(userList)) {
return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
}
- this.saveOrUpdateBatch(userList);
+ ICustomerService proxy = (ICustomerService) AopContext.currentProxy();
+ for (Customer customer : userList) {
+ proxy.insertCustomer(customer);
+ }
+// this.saveOrUpdateBatch(userList);
return AjaxResult.success(true);
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.3