diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierController.java index aa76c990..de2ea90c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSupplierController.java @@ -13,9 +13,11 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.process.general.service.IProcessService; import com.ruoyi.system.domain.*; @@ -43,10 +45,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.IOException; import java.net.URLEncoder; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -204,11 +203,15 @@ public class SysSupplierController extends BaseController @Log(title = "供应商资料", businessType = BusinessType.EXPORT) @PostMapping("/export") @ResponseBody - public AjaxResult export(SysSupplier sysSupplier) + public AjaxResult export(SysSupplier sysSupplier,String ids) { - List list = sysSupplierService.exportSelectSupplierList(sysSupplier); + List list = new ArrayList<>(); + if(StringUtils.isEmpty(ids)){ + list = sysSupplierService.exportSelectSupplierList(sysSupplier); + }else{ + list = sysSupplierService.selectSysSupplierByCodes(Convert.toStrArray(ids)); + } ExcelUtil util = new ExcelUtil(SysSupplier.class); - return util.exportExcel(list, "供应商资料"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSupplierMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSupplierMapper.java index 5fafebd2..70effba0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSupplierMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSupplierMapper.java @@ -107,4 +107,6 @@ public interface SysSupplierMapper /** 根据供应商编号或名称查找供应商*/ SysSupplier getSelectSupplier(SysSupplier supplier); + + List selectSysSupplierByCodes(String[] ids); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java index 1a528b27..04b584b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSupplierServiceImpl.java @@ -475,4 +475,10 @@ public class SysSupplierServiceImpl implements ISysSupplierService{ public SysSupplier getSelectSupplier(SysSupplier supplier){ return sysSupplierMapper.getSelectSupplier(supplier); } + + /** 根据供应商编号集合查找供应商列表*/ + @Override + public List selectSysSupplierByCodes(String[] ids){ + return sysSupplierMapper.selectSysSupplierByCodes(ids); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml index ab85e459..3b6de1a8 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSupplierMapper.xml @@ -425,4 +425,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where supplier_code like concat(#{prefix}, '%') escape '\\' + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html b/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html index d5386e0b..bb5f6cad 100644 --- a/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html +++ b/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html @@ -60,7 +60,7 @@ 添加 - + 导出 @@ -314,6 +314,27 @@ }); } } + function exportExcel() { + var ids = $.table.selectColumns("supplierCode"); + var dataParam = $("#formId").serializeArray(); + + let tipMsg = "确定导出当前所有数据吗?"; + if ($.common.isNotEmpty(ids)) { + tipMsg = `确定导出选中的 ${ids.length} 条数据吗?`; + dataParam.push({ "name": "ids", "value": ids }); + } + $.modal.confirm(tipMsg, function () { + $.modal.loading("正在导出数据,请稍后..."); + $.post( prefix + "/export", dataParam, function (result) { + if (result.code === web_status.SUCCESS) { + window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true; + } else { + $.modal.alertError(result.msg); + } + $.modal.closeLoading(); + }); + }); + } \ No newline at end of file