From 4c45c18aed755b4960660a57e594a8d53838f95a Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Sun, 16 Feb 2025 14:23:57 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=A6=81=E6=B1=82?= =?UTF-8?q?=EF=BC=8C=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=B5=84=E6=96=99=E5=85=B6=E4=BB=96=E6=94=B6=E8=B4=A7=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E9=83=A8=E5=88=86=E8=A1=8C=E5=92=8C?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=A1=8C=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=9B=B4=E5=A4=9A=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysShippingAddressController.java | 20 +++++- .../mapper/SysShippingAddressMapper.java | 3 + .../service/ISysShippingAddressService.java | 5 ++ .../impl/SysShippingAddressServiceImpl.java | 10 ++- .../mapper/system/SysContactsMapper.xml | 2 +- .../system/SysShippingAddressMapper.xml | 8 +++ .../templates/system/contacts/contacts.html | 2 +- .../shippingaddress/shippingaddress.html | 63 +++++++++++++++++-- 8 files changed, 104 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysShippingAddressController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysShippingAddressController.java index 11bd0c9b..97e195df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysShippingAddressController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysShippingAddressController.java @@ -57,15 +57,31 @@ public class SysShippingAddressController extends BaseController */ @RequiresPermissions("system:shippingaddress:export") @Log(title = "送货地址", businessType = BusinessType.EXPORT) - @PostMapping("/export") + @PostMapping("/exportAll") @ResponseBody - public AjaxResult export(SysShippingAddress sysShippingAddress) + public AjaxResult exportAll(SysShippingAddress sysShippingAddress) { List list = sysShippingAddressService.selectSysShippingAddressList(sysShippingAddress); ExcelUtil util = new ExcelUtil(SysShippingAddress.class); return util.exportExcel(list, "送货地址数据"); } + /** + * 导出送货地址列表 + */ + @RequiresPermissions("system:shippingaddress:export") + @Log(title = "送货地址", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(@RequestBody Long[] deliveryIds) + { + List list = sysShippingAddressService.selectSysShippingAddressListByDeliveryIds(deliveryIds); + ExcelUtil util = new ExcelUtil(SysShippingAddress.class); + return util.exportExcel(list, "送货地址数据"); + } + + + /** * 新增送货地址 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysShippingAddressMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysShippingAddressMapper.java index 4671b743..c2d396e1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysShippingAddressMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysShippingAddressMapper.java @@ -61,4 +61,7 @@ public interface SysShippingAddressMapper public int deleteSysShippingAddressByIds(String[] deliveryIds); public List selectSysShippingAddressByenterpriseCode(String enterpriseCode); + + + List selectSysShippingAddressListByDeliveryIds(Long[] deliveryIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysShippingAddressService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysShippingAddressService.java index d500b0b7..83903c1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysShippingAddressService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysShippingAddressService.java @@ -61,4 +61,9 @@ public interface ISysShippingAddressService public int deleteSysShippingAddressById(Long deliveryId); public List selectSysShippingAddressByenterpriseCode(String enterpriseCode); + + /** + * 根据deliveryId集合查询送货地址 + * */ + List selectSysShippingAddressListByDeliveryIds(Long[] deliveryIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysShippingAddressServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysShippingAddressServiceImpl.java index ad42ea62..f3b81cbe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysShippingAddressServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysShippingAddressServiceImpl.java @@ -19,7 +19,7 @@ import java.util.List; * @date 2022-11-16 */ @Service -public class SysShippingAddressServiceImpl implements ISysShippingAddressService +public class SysShippingAddressServiceImpl implements ISysShippingAddressService { @Autowired private SysShippingAddressMapper sysShippingAddressMapper; @@ -48,6 +48,14 @@ public class SysShippingAddressServiceImpl implements ISysShippingAddressService return sysShippingAddressMapper.selectSysShippingAddressList(sysShippingAddress); } + /** + * 根据deliveryId集合查询送货地址 + * */ + @Override + public List selectSysShippingAddressListByDeliveryIds(Long[] deliveryIds) { + return sysShippingAddressMapper.selectSysShippingAddressListByDeliveryIds(deliveryIds); + } + /** * 新增送货地址 * diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml index a4bc3f69..e35ef67e 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where enterprise_code = #{enterpriseCode} - where contactid in diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml index fd04ecf5..ca52484f 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysShippingAddressMapper.xml @@ -45,6 +45,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where enterprise_code = #{enterpriseCode} + + insert into sys_shipping_address diff --git a/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html b/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html index c0e53988..ed20de7b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html +++ b/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html @@ -39,7 +39,7 @@ 添加 - + 导出 diff --git a/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html b/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html index 26171e8c..98becac3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html +++ b/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html @@ -41,10 +41,9 @@ 添加 - - - - + + 导出 +
@@ -100,6 +99,62 @@ }; $.table.init(options); }); + + + // 导出 + function exportExcel(formId) { + // $.table.set(); + var deliveryIdData = []; + var selections = $("#bootstrap-table").bootstrapTable("getSelections"); + if(selections.length === 0){ + $.modal.confirm("确定导出所有其他收货地址吗？", function() { + var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; + var params = $("#bootstrap-table").bootstrapTable('getOptions'); + var dataParam = $("#" + currentId).serializeArray(); + dataParam.push({ "name": "orderByColumn", "value": params.sortName }); + dataParam.push({ "name": "isAsc", "value": params.sortOrder }); + $.modal.loading("正在导出数据，请稍后..."); + $.post(prefix + '/exportAll', dataParam, function(result) { + if (result.code == web_status.SUCCESS) { + window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; + } else if (result.code == web_status.WARNING) { + $.modal.alertWarning(result.msg) + } else { + $.modal.alertError(result.msg); + } + $.modal.closeLoading(); + }); + }); + }else { + $.modal.confirm("确定导出选中的所有其他收货地址吗？", function () { + //·拼接单号 + for(let i=0;i \ No newline at end of file