From c4397c52164a2a3a553ed726ed31012d4ba7ce25 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 26 三月 2026 16:33:22 +0800
Subject: [PATCH] feat: 新增客户地区
---
src/main/java/com/ruoyi/basic/pojo/Customer.java | 8 ++++++--
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 8 ++++++++
src/main/java/com/ruoyi/basic/service/ICustomerService.java | 3 +++
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 11 +++++++++++
4 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index 94c4007..6801abf 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -9,6 +9,7 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -116,4 +117,11 @@
public List customerList(Customer customer) {
return customerService.customerList(customer);
}
+
+ @GetMapping("/regions")
+ @ApiOperation("鑾峰彇瀹㈡埛鍦板尯")
+ public AjaxResult getRegions() {
+ List<String> regionsList = customerService.regionsList();
+ return AjaxResult.success(regionsList);
+ }
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/Customer.java b/src/main/java/com/ruoyi/basic/pojo/Customer.java
index 101d72a..af85029 100644
--- a/src/main/java/com/ruoyi/basic/pojo/Customer.java
+++ b/src/main/java/com/ruoyi/basic/pojo/Customer.java
@@ -80,7 +80,7 @@
/**
* 鑱旂郴鐢佃瘽
*/
- @Excel(name = "鑱旂郴鐢佃瘽",cellType = Excel.ColumnType.STRING)
+ @Excel(name = "鑱旂郴鐢佃瘽", cellType = Excel.ColumnType.STRING)
private String contactPhone;
/**
@@ -93,7 +93,7 @@
* 缁存姢鏃堕棿
*/
@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)
@@ -116,4 +116,8 @@
@ApiModelProperty(value = "寮�鎴疯鍙�")
@Excel(name = "寮�鎴疯鍙�")
private String bankCode;
+
+ @ApiModelProperty("鍦板尯")
+ @Excel(name = "鍦板尯")
+ private String regions;
}
diff --git a/src/main/java/com/ruoyi/basic/service/ICustomerService.java b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
index 989e474..595407c 100644
--- a/src/main/java/com/ruoyi/basic/service/ICustomerService.java
+++ b/src/main/java/com/ruoyi/basic/service/ICustomerService.java
@@ -78,4 +78,7 @@
List<Customer> selectCustomerLists(Customer customer);
AjaxResult importData(MultipartFile file);
+
+ List<String> regionsList();
+
}
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 58810c9..8b6e26e 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -276,6 +276,17 @@
).collect(Collectors.toList());
}
+ @Override
+ public List<String> regionsList() {
+ return this.baseMapper.selectObjs(new QueryWrapper<Customer>()
+ .select("DISTINCT regions")
+ .isNotNull("regions")
+ .ne("regions", "")
+ ).stream()
+ .map(Object::toString)
+ .collect(Collectors.toList());
+ }
+
/**
* 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
*/
--
Gitblit v1.9.3