From bda495414cf13cd98725c25c9b38e68afce114db Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Sun, 16 Feb 2025 14:44: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=E5=BC=80=E7=A5=A8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=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 --- .../controller/SysInvoiceController.java | 27 +++++--- .../ruoyi/system/mapper/SysInvoiceMapper.java | 5 ++ .../system/service/ISysInvoiceService.java | 5 ++ .../service/impl/SysInvoiceServiceImpl.java | 8 +++ .../mapper/system/SysInvoiceMapper.xml | 7 +++ .../templates/system/invoice/invoice.html | 63 ++++++++++++++++++- .../shippingaddress/shippingaddress.html | 2 +- 7 files changed, 108 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysInvoiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysInvoiceController.java index 05ba4a26..43f66ca8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysInvoiceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysInvoiceController.java @@ -7,11 +7,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.domain.SysInvoice; @@ -61,15 +57,32 @@ public class SysInvoiceController extends BaseController */ @RequiresPermissions("system:invoice:export") @Log(title = "其他开票信息", businessType = BusinessType.EXPORT) - @PostMapping("/export") + @PostMapping("/exportAll") @ResponseBody - public AjaxResult export(SysInvoice sysInvoice) + public AjaxResult exportAll(SysInvoice sysInvoice) { List list = sysInvoiceService.selectSysInvoiceList(sysInvoice); ExcelUtil util = new ExcelUtil(SysInvoice.class); return util.exportExcel(list, "其他开票信息数据"); } + + /** + * 导出其他开票信息列表 + */ + @RequiresPermissions("system:invoice:export") + @Log(title = "其他开票信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(@RequestBody Long[] ids) + { + List list = sysInvoiceService.selectSysInvoiceListByIds(ids); + ExcelUtil util = new ExcelUtil(SysInvoice.class); + return util.exportExcel(list, "其他开票信息数据"); + } + + + /** * 新增其他开票信息 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysInvoiceMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysInvoiceMapper.java index b68a3b73..437ef190 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysInvoiceMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysInvoiceMapper.java @@ -89,4 +89,9 @@ public interface SysInvoiceMapper * @return 结果 */ SysInvoice selectSysInvoiceByName(String invoiceCompanyName); + + /** + * 根据id集合查询客户信息 + * */ + List selectSysInvoiceListByIds(Long[] ids); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysInvoiceService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysInvoiceService.java index d2526bdc..4ff54db3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysInvoiceService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysInvoiceService.java @@ -82,4 +82,9 @@ public interface ISysInvoiceService int restoreSysInvoiceById(Long id); public String getId(); + + /** + * 根据id集合查询其他开票信息 + * */ + List selectSysInvoiceListByIds(Long[] ids); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysInvoiceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysInvoiceServiceImpl.java index e5bfc865..17407ca8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysInvoiceServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysInvoiceServiceImpl.java @@ -56,6 +56,14 @@ public class SysInvoiceServiceImpl implements ISysInvoiceService return sysInvoiceMapper.selectSysInvoiceByCode(enterpriseCode); } + /** + * 根据ID查询其他开票信息 + * */ + @Override + public List selectSysInvoiceListByIds(Long[] ids) { + return sysInvoiceMapper.selectSysInvoiceListByIds(ids); + } + /** * 新增其他开票信息 * diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysInvoiceMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysInvoiceMapper.xml index 34a4c681..d7fc7b8e 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysInvoiceMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysInvoiceMapper.xml @@ -48,6 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where invoice_company_name = #{invoiceCompanyName} + insert into sys_invoice diff --git a/ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html b/ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html index 90af3f30..0535a41f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html +++ b/ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html @@ -28,9 +28,13 @@
@@ -120,6 +124,63 @@ }; $.table.init(options); }); + + // 导出 + function exportExcel(formId) { + // $.table.set(); + var idData = []; + 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 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 98becac3..245c49b8 100644 --- a/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html +++ b/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html @@ -41,7 +41,7 @@ 添加 - + 导出