From e068f7ec339ea610c28bcf17d34739f391e72498 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 08 五月 2025 11:58:50 +0800
Subject: [PATCH] 供应商功能开发
---
src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java | 18 ++++++
src/main/java/com/ruoyi/project/system/service/ISysUserService.java | 7 ++
src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java | 44 ++++++++++++++
src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | 11 +++
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 11 +++
src/main/resources/mapper/basic/SupplierManageMapper.xml | 33 ++++++++++
src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java | 4 +
src/main/java/com/ruoyi/basic/mapper/SupplierManageMapper.java | 5 +
src/main/java/com/ruoyi/basic/service/ISupplierService.java | 9 +++
src/main/java/com/ruoyi/basic/pojo/SupplierManage.java | 2
src/main/java/com/ruoyi/basic/controller/SupplierManageController.java | 12 ++++
11 files changed, 154 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index d399212..4a9635c 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -8,6 +8,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+
@RestController
@RequestMapping("/system/supplier")
public class SupplierManageController {
@@ -67,4 +69,14 @@
public AjaxResult supplierListPage(Page page, SupplierManageDto supplierManageDto) {
return AjaxResult.success(supplierService.supplierListPage(page, supplierManageDto));
}
+
+ /**
+ * 渚涘簲鍟嗗鍑�
+ * @param response
+ * @param supplierManageDto
+ */
+ @GetMapping("/export")
+ public void supplierExport(HttpServletResponse response, SupplierManageDto supplierManageDto) {
+ supplierService.supplierExport(response, supplierManageDto);
+ }
}
diff --git a/src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java b/src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java
index 3138433..30044ad 100644
--- a/src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java
@@ -1,8 +1,12 @@
package com.ruoyi.basic.dto;
import com.ruoyi.basic.pojo.SupplierManage;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class SupplierManageDto extends SupplierManage {
+
+ @ApiModelProperty(value = "缁存姢浜哄憳鍚嶇О")
+ private String maintainUserName;
}
diff --git a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
new file mode 100644
index 0000000..a37252e
--- /dev/null
+++ b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
@@ -0,0 +1,44 @@
+package com.ruoyi.basic.excel;
+
+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;
+
+import java.time.LocalDateTime;
+
+@Data
+public class SupplierManageExcelDto {
+
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ @Excel(name = "绾崇◣浜鸿瘑鍒彿")
+ private String taxpayerIdentificationNum;
+
+ @Excel(name = "鍏徃鍦板潃")
+ private String companyAddress;
+
+ @Excel(name = "鍏徃鐢佃瘽")
+ private String companyPhone;
+
+ @Excel(name = "寮�鎴疯")
+ private String bankAccountName;
+
+ @Excel(name = "璐﹀彿")
+ private String bankAccountNum;
+
+ @Excel(name = "鑱旂郴浜�")
+ private String contactUserName;
+
+ @Excel(name = "鑱旂郴鐢佃瘽")
+ private String contactUserPhone;
+
+ @Excel(name = "缁存姢浜篒D")
+ private Integer maintainUserId;
+
+ @Excel(name = "缁存姢鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime maintainTime;
+}
diff --git a/src/main/java/com/ruoyi/basic/mapper/SupplierManageMapper.java b/src/main/java/com/ruoyi/basic/mapper/SupplierManageMapper.java
index 0b94203..1ba05a6 100644
--- a/src/main/java/com/ruoyi/basic/mapper/SupplierManageMapper.java
+++ b/src/main/java/com/ruoyi/basic/mapper/SupplierManageMapper.java
@@ -4,12 +4,17 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.SupplierManageDto;
+import com.ruoyi.basic.excel.SupplierManageExcelDto;
import com.ruoyi.basic.pojo.SupplierManage;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
@Mapper
public interface SupplierManageMapper extends BaseMapper<SupplierManage> {
IPage<SupplierManage> supplierListPage(Page page, @Param("supplierManageDto") SupplierManageDto supplierManageDto);
+
+ List<SupplierManageExcelDto> supplierExportList(@Param("supplierManageDto") SupplierManageDto supplierManageDto);
}
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index b819cd5..c54aebc 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -1,6 +1,7 @@
package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -41,6 +42,7 @@
private Integer maintainUserId;
@ApiModelProperty(value = "缁存姢鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime maintainTime;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
diff --git a/src/main/java/com/ruoyi/basic/service/ISupplierService.java b/src/main/java/com/ruoyi/basic/service/ISupplierService.java
index 9244c52..4cc28b2 100644
--- a/src/main/java/com/ruoyi/basic/service/ISupplierService.java
+++ b/src/main/java/com/ruoyi/basic/service/ISupplierService.java
@@ -5,6 +5,8 @@
import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.basic.pojo.SupplierManage;
+import javax.servlet.http.HttpServletResponse;
+
public interface ISupplierService {
/**
@@ -42,4 +44,11 @@
* @return
*/
IPage<SupplierManage> supplierListPage(Page page, SupplierManageDto supplierManageDto);
+
+ /**
+ * 渚涘簲鍟嗗鍑�
+ * @param response
+ * @param supplierManageDto
+ */
+ void supplierExport(HttpServletResponse response, SupplierManageDto supplierManageDto);
}
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 b699e75..3fb77dd 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
@@ -4,11 +4,17 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.SupplierManageDto;
+import com.ruoyi.basic.excel.SupplierManageExcelDto;
import com.ruoyi.basic.mapper.SupplierManageMapper;
+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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
@Service
public class SupplierServiceImpl extends ServiceImpl<SupplierManageMapper,SupplierManage> implements ISupplierService {
@@ -66,4 +72,16 @@
public IPage<SupplierManage> supplierListPage(Page page, SupplierManageDto supplierManageDto) {
return supplierMapper.supplierListPage(page,supplierManageDto);
}
+
+ /**
+ * 渚涘簲鍟嗗鍑�
+ * @param response
+ * @param supplierManageDto
+ */
+ @Override
+ public void supplierExport(HttpServletResponse response, SupplierManageDto supplierManageDto) {
+ List<SupplierManageExcelDto> supplierManageList = supplierMapper.supplierExportList(supplierManageDto);
+ ExcelUtil<SupplierManageExcelDto> util = new ExcelUtil<SupplierManageExcelDto>(SupplierManageExcelDto.class);
+ util.exportExcel(response, supplierManageList, "渚涘簲鍟嗗鍑�");
+ }
}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index a3fc083..16794a3 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -253,4 +253,15 @@
{
return success(deptService.selectDeptTreeList(dept));
}
+
+ /**
+ * 涓嶅垎椤电敤鎴锋煡璇�
+ * @param user
+ * @return
+ */
+ @GetMapping("/userListNoPage")
+ public AjaxResult userListNoPage(SysUser user){
+ List<SysUser> sysUserList = userService.userListNoPage(user);
+ return AjaxResult.success(sysUserList);
+ }
}
diff --git a/src/main/java/com/ruoyi/project/system/service/ISysUserService.java b/src/main/java/com/ruoyi/project/system/service/ISysUserService.java
index b879948..300fe2d 100644
--- a/src/main/java/com/ruoyi/project/system/service/ISysUserService.java
+++ b/src/main/java/com/ruoyi/project/system/service/ISysUserService.java
@@ -203,4 +203,11 @@
* @return 缁撴灉
*/
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+ /**
+ * 涓嶅垎椤电敤鎴锋煡璇�
+ * @param user
+ * @return
+ */
+ List<SysUser> userListNoPage(SysUser user);
}
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
index fcb1784..fd9df5a 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.system.service.impl;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
@@ -547,4 +548,14 @@
}
return successMsg.toString();
}
+
+ /**
+ * 涓嶅垎椤电敤鎴锋煡璇�
+ * @param user
+ * @return
+ */
+ @Override
+ public List<SysUser> userListNoPage(SysUser user) {
+ return userMapper.selectUserList(user);
+ }
}
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 248b940..4795904 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -21,12 +21,41 @@
T1.create_user,
T1.update_time,
T1.update_user,
- T1.tenant_id
+ T1.tenant_id,
+ T2.user_name AS maintainUserName
FROM supplier_manage T1
LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
<where>
<if test="supplierManageDto.supplierName != null and supplierManageDto.supplierName != '' ">
- AND supplier_name = #{supplierManageDto.supplierName}
+ AND T1.supplier_name LIKE CONCAT('%',#{supplierManageDto.supplierName},'%')
+ </if>
+ </where>
+ </select>
+
+ <select id="supplierExportList" resultType="com.ruoyi.basic.excel.SupplierManageExcelDto">
+ SELECT
+ T1.id,
+ T1.supplier_name,
+ T1.taxpayer_identification_num,
+ T1.company_address,
+ T1.company_phone,
+ T1.bank_account_name,
+ T1.bank_account_num,
+ T1.contact_user_name,
+ T1.contact_user_phone,
+ T1.maintain_user_id,
+ T1.maintain_time,
+ T1.create_time,
+ T1.create_user,
+ T1.update_time,
+ T1.update_user,
+ T1.tenant_id,
+ T2.user_name AS maintainUserName
+ FROM supplier_manage T1
+ LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
+ <where>
+ <if test="supplierManageDto.supplierName != null and supplierManageDto.supplierName != '' ">
+ AND T1.supplier_name LIKE CONCAT('%',#{supplierManageDto.supplierName},'%')
</if>
</where>
</select>
--
Gitblit v1.9.3