From 269f6b97918cfa6e9db7b06626224a88784eb6ea Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 17 Feb 2025 15:36:41 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E7=94=9F=E4=BA=A7=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=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E5=88=B6=E7=A8=8B?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81=E9=83=A8=E5=88=86=E8=A1=8C?= =?UTF-8?q?=E5=92=8C=E5=85=A8=E9=83=A8=E8=A1=8C=E5=AF=BC=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9B=B4=E5=A4=9A=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA=E6=89=80=E6=9C=89=E5=92=8C?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AF=BC=E5=87=BA=E5=90=8E=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E6=96=B0=E5=A2=9E=20=E5=AF=BC=E5=87=BA=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=AE=A1=E7=90=86=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E6=96=B9=E6=B3=95=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20=E6=A0=B9=E6=8D=AE=E5=88=B6=E7=A8=8B=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=8D=95=E5=8F=B7=E6=95=B0=E7=BB=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=B6=E7=A8=8B=E6=98=8E=E7=BB=86=E9=9B=86=E5=90=88=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysProcessCategoryController.java | 19 +++++- .../system/domain/SysProcessCategory.java | 1 + .../mapper/SysProcessCategoryMapper.java | 5 ++ .../service/ISysProcessCategoryService.java | 5 ++ .../impl/SysProcessCategoryServiceImpl.java | 9 +++ .../system/SysProcessCategoryMapper.xml | 11 +++- .../processCategory/processCategory.html | 61 ++++++++++++++++++- 7 files changed, 105 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java index 9b0b521e..c3de0a1b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProcessCategoryController.java @@ -56,15 +56,30 @@ public class SysProcessCategoryController extends BaseController */ @RequiresPermissions("system:processCategory:export") @Log(title = "制程类别明细", businessType = BusinessType.EXPORT) - @PostMapping("/export") + @PostMapping("/exportAll") @ResponseBody - public AjaxResult export(SysProcessCategory sysProcessCategory) + public AjaxResult exportAll(SysProcessCategory sysProcessCategory) { List list = sysProcessCategoryService.selectSysProcessCategoryList(sysProcessCategory); ExcelUtil util = new ExcelUtil(SysProcessCategory.class); return util.exportExcel(list, "制程类别明细数据"); } + /** + * 导出制程类别明细列表 + */ + @RequiresPermissions("system:processCategory:export") + @Log(title = "制程类别明细", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(@RequestBody String[] processCategoryIds) + { + List list = sysProcessCategoryService.selectSysProcessCategoryListByIds(processCategoryIds); + ExcelUtil util = new ExcelUtil(SysProcessCategory.class); + return util.exportExcel(list, "制程类别明细数据"); + } + + /** * 新增制程类别明细 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java index f0294113..d5421fb7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProcessCategory.java @@ -22,6 +22,7 @@ public class SysProcessCategory extends BaseEntity private String delFlag; /** 制程类别id */ + @Excel(name = "制程类别Id") private String processCategoryId; /** 制程类别编号 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java index 88180e32..eae77d5a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysProcessCategoryMapper.java @@ -58,4 +58,9 @@ public interface SysProcessCategoryMapper * @return 结果 */ public int deleteSysProcessCategoryByIds(String[] ids); + + /** + * 根据制程类别id集合查询制程类别集合 + * */ + List selectSysProcessCategoryListByIds(String[] processCategoryIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java index c0f8f18c..76e151c8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProcessCategoryService.java @@ -58,4 +58,9 @@ public interface ISysProcessCategoryService * @return 结果 */ public int deleteSysProcessCategoryById(Long processCategoryId); + + /** + * 根据制程类别明细ID集合查询制程类别明细 + * */ + List selectSysProcessCategoryListByIds(String[] processCategoryIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java index 2e1d80b6..37685267 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProcessCategoryServiceImpl.java @@ -51,6 +51,15 @@ public class SysProcessCategoryServiceImpl implements ISysProcessCategoryService return sysProcessCategoryMapper.selectSysProcessCategoryList(sysProcessCategory); } + + /** + * 根据制程类别明细ID集合查询制程类别明细 + * */ + @Override + public List selectSysProcessCategoryListByIds(String[] processCategoryIds) { + return sysProcessCategoryMapper.selectSysProcessCategoryListByIds(processCategoryIds); + } + /** * 新增制程类别明细 * diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml index 2b2ffdd4..c54f01d4 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysProcessCategoryMapper.xml @@ -37,7 +37,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + + + insert into sys_process_category diff --git a/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html index 7eb2051e..922bf618 100644 --- a/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html +++ b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html @@ -31,9 +31,9 @@ 添加 - - - + + 导出 +
@@ -83,6 +83,61 @@ }; $.table.init(options); }); + + // 导出 + function exportExcel(formId) { + // $.table.set(); + var processCategoryIdData = []; + 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