From 4f6d90f81e1328baeb8c9f2c9c23e34b7b8f002a Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 12 五月 2025 10:52:56 +0800
Subject: [PATCH] 供应商前后端联调
---
src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java | 11 +++++++----
src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java | 4 ++--
src/main/resources/mapper/basic/SupplierManageMapper.xml | 4 ++--
src/main/java/com/ruoyi/basic/service/ISupplierService.java | 7 ++++---
src/main/java/com/ruoyi/basic/pojo/SupplierManage.java | 5 +++--
src/main/java/com/ruoyi/basic/controller/SupplierManageController.java | 20 +++++++++++++-------
src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java | 2 ++
7 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index 4a9635c..f75564e 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -6,9 +6,11 @@
import com.ruoyi.basic.service.ISupplierService;
import com.ruoyi.framework.web.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
@RestController
@RequestMapping("/system/supplier")
@@ -30,12 +32,15 @@
/**
* 渚涘簲鍟嗗垹闄�
- * @param id
+ * @param ids
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delSupplier(Integer id) {
- supplierService.delSupplier(id);
+ public AjaxResult delSupplier(@RequestBody List<Integer> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ supplierService.delSupplier(ids);
return AjaxResult.success();
}
@@ -44,8 +49,8 @@
* @param id
* @return
*/
- @GetMapping("/info")
- public AjaxResult supplierDetail(Integer id) {
+ @GetMapping("/{id}")
+ public AjaxResult supplierDetail(@PathVariable("id") Integer id) {
return AjaxResult.success(supplierService.supplierDetail(id));
}
@@ -56,6 +61,7 @@
*/
@PostMapping("/update")
public AjaxResult update(@RequestBody SupplierManage supplierManage) {
+ supplierService.supplierUpdate(supplierManage);
return AjaxResult.success();
}
@@ -75,8 +81,8 @@
* @param response
* @param supplierManageDto
*/
- @GetMapping("/export")
- public void supplierExport(HttpServletResponse response, SupplierManageDto supplierManageDto) {
+ @PostMapping("/export")
+ public void supplierExport(HttpServletResponse response,SupplierManageDto supplierManageDto) {
supplierService.supplierExport(response, supplierManageDto);
}
}
diff --git a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
index a37252e..c91592e 100644
--- a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
+++ b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
@@ -35,8 +35,8 @@
@Excel(name = "鑱旂郴鐢佃瘽")
private String contactUserPhone;
- @Excel(name = "缁存姢浜篒D")
- private Integer maintainUserId;
+ @Excel(name = "缁存姢浜�")
+ private String maintainUserName;
@Excel(name = "缁存姢鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index c54aebc..8a7054f 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
@@ -42,8 +43,8 @@
private Integer maintainUserId;
@ApiModelProperty(value = "缁存姢鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime maintainTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate maintainTime;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
diff --git a/src/main/java/com/ruoyi/basic/service/ISupplierService.java b/src/main/java/com/ruoyi/basic/service/ISupplierService.java
index 4cc28b2..5055a34 100644
--- a/src/main/java/com/ruoyi/basic/service/ISupplierService.java
+++ b/src/main/java/com/ruoyi/basic/service/ISupplierService.java
@@ -6,6 +6,7 @@
import com.ruoyi.basic.pojo.SupplierManage;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
public interface ISupplierService {
@@ -18,10 +19,10 @@
/**
* 渚涘簲鍟嗗垹闄�
- * @param id
+ * @param ids
* @return
*/
- int delSupplier(Integer id);
+ int delSupplier(List<Integer> ids);
/**
* 渚涘簲鍟嗚鎯�
@@ -35,7 +36,7 @@
* @param supplierManage
* @return
*/
- int supplierManage(SupplierManage supplierManage);
+ int supplierUpdate(SupplierManage supplierManage);
/**
* 渚涘簲鍟嗗垎椤垫煡璇�
diff --git a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
index 3fb77dd..a929dda 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.basic.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -34,12 +35,14 @@
/**
* 渚涘簲鍟嗗垹闄�
- * @param id
+ * @param ids
* @return
*/
@Override
- public int delSupplier(Integer id) {
- return supplierMapper.deleteById(id);
+ public int delSupplier(List<Integer> ids) {
+ LambdaQueryWrapper<SupplierManage> delWrapper = new LambdaQueryWrapper<>();
+ delWrapper.in(SupplierManage::getId, ids);
+ return supplierMapper.delete(delWrapper);
}
/**
@@ -58,7 +61,7 @@
* @return
*/
@Override
- public int supplierManage(SupplierManage supplierManage) {
+ public int supplierUpdate(SupplierManage supplierManage) {
return supplierMapper.updateById(supplierManage);
}
diff --git a/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java b/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
index ae5253d..116fec3 100644
--- a/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
+++ b/src/main/java/com/ruoyi/common/config/IgnoreTableConfig.java
@@ -23,6 +23,8 @@
IGNORE_TABLES.add("sys_menu");
IGNORE_TABLES.add("sys_role_dept");
IGNORE_TABLES.add("sys_logininfor");
+ IGNORE_TABLES.add("sys_post");
+ IGNORE_TABLES.add("sys_user_post");
}
}
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 4795904..9e65903 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -22,7 +22,7 @@
T1.update_time,
T1.update_user,
T1.tenant_id,
- T2.user_name AS maintainUserName
+ T2.nick_name AS maintainUserName
FROM supplier_manage T1
LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
<where>
@@ -50,7 +50,7 @@
T1.update_time,
T1.update_user,
T1.tenant_id,
- T2.user_name AS maintainUserName
+ T2.nick_name AS maintainUserName
FROM supplier_manage T1
LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
<where>
--
Gitblit v1.9.3