From 9f3a45da6d1dc9c71187f15131665eb9806f5588 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 28 十月 2025 15:58:03 +0800
Subject: [PATCH] yys 1.修改配置文件 2.增加模板
---
src/main/resources/application-zqhx.yml | 12 +++---
src/main/resources/application-zjyj.yml | 12 +++---
src/main/java/com/ruoyi/basic/controller/CustomerController.java | 7 +++
src/main/java/com/ruoyi/basic/pojo/SupplierManage.java | 12 +++++
src/main/resources/application-wdsy.yml | 12 +++---
src/main/java/com/ruoyi/basic/controller/SupplierManageController.java | 9 ++++
6 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerController.java b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
index 132e5bd..e89e203 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerController.java
@@ -53,6 +53,13 @@
util.exportExcel(response, list, "瀹㈡埛妗ｆ鏁版嵁");
}
+ @PostMapping("/downloadTemplate")
+ @Log(title = "瀹㈡埛妗ｆ-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
+ public void downloadTemplate(HttpServletResponse response) {
+ ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
+ util.importTemplateExcel(response, "瀹㈡埛妗ｆ妯℃澘");
+ }
+
/**
* 瀵煎叆瀹㈡埛妗ｆ
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index b50f88f..32cad29 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.SupplierManageDto;
+import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.basic.service.ISupplierService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -89,6 +91,13 @@
supplierService.supplierExport(response, supplierManageDto);
}
+ @PostMapping("/downloadTemplate")
+ @Log(title = "渚涘簲鍟�-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
+ public void downloadTemplate(HttpServletResponse response) {
+ ExcelUtil<SupplierManage> util = new ExcelUtil<SupplierManage>(SupplierManage.class);
+ util.importTemplateExcel(response, "渚涘簲鍟嗘。妗堟ā鏉�");
+ }
+
/**
* 渚涘簲鍟嗗鍏�
*/
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index 3855879..142a6f2 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,35 +17,44 @@
private Integer id;
@ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
-
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
@ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
+ @Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNum;
@ApiModelProperty(value = "鍏徃鍦板潃")
+ @Excel(name = "鍏徃鍦板潃")
private String companyAddress;
@ApiModelProperty(value = "鍏徃鐢佃瘽")
+ @Excel(name = "鍏徃鐢佃瘽")
private String companyPhone;
@ApiModelProperty(value = "寮�鎴疯")
+ @Excel(name = "寮�鎴疯")
private String bankAccountName;
@ApiModelProperty(value = "璐﹀彿")
+ @Excel(name = "璐﹀彿")
private String bankAccountNum;
@ApiModelProperty(value = "鑱旂郴浜�")
+ @Excel(name = "鑱旂郴浜�")
private String contactUserName;
@ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ @Excel(name = "鑱旂郴鐢佃瘽")
private String contactUserPhone;
@ApiModelProperty(value = "缁存姢浜篒D")
+ @Excel(name = "缁存姢浜�")
private Integer maintainUserId;
@ApiModelProperty(value = "缁存姢鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
+// @Excel(name = "缁存姢鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate maintainTime;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
diff --git a/src/main/resources/application-wdsy.yml b/src/main/resources/application-wdsy.yml
index 6ac3309..b55f3fb 100644
--- a/src/main/resources/application-wdsy.yml
+++ b/src/main/resources/application-wdsy.yml
@@ -134,15 +134,15 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
-# host: 172.17.0.1
+# host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
- port: 6379
+ port: 6380
# 鏁版嵁搴撶储寮�
- database: 3
+ database: 2
# 瀵嗙爜
- password: root2022!
-# password:
+# password: root2022!
+ password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
diff --git a/src/main/resources/application-zjyj.yml b/src/main/resources/application-zjyj.yml
index 4bafeb7..e6e4b6a 100644
--- a/src/main/resources/application-zjyj.yml
+++ b/src/main/resources/application-zjyj.yml
@@ -134,15 +134,15 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
-# host: 172.17.0.1
+# host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
- port: 6379
+ port: 6380
# 鏁版嵁搴撶储寮�
- database: 3
+ database: 0
# 瀵嗙爜
- password: root2022!
-# password:
+# password: root2022!
+ password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
diff --git a/src/main/resources/application-zqhx.yml b/src/main/resources/application-zqhx.yml
index a32d6fb..3a6cf4d 100644
--- a/src/main/resources/application-zqhx.yml
+++ b/src/main/resources/application-zqhx.yml
@@ -134,15 +134,15 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
-# host: 172.17.0.1
+# host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
- port: 6379
+ port: 6380
# 鏁版嵁搴撶储寮�
- database: 3
+ database: 1
# 瀵嗙爜
- password: root2022!
-# password:
+# password: root2022!
+ password:
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
--
Gitblit v1.9.3