diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSopController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSopController.java index d2326e76..85b2a13b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSopController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSopController.java @@ -71,15 +71,30 @@ public class SysSopController extends BaseController */ @RequiresPermissions("system:sop:export") @Log(title = "SOP", businessType = BusinessType.EXPORT) - @PostMapping("/export") + @PostMapping("/exportAll") @ResponseBody - public AjaxResult export(SysSop sysSop) + public AjaxResult exportAll(SysSop sysSop) { List list = sysSopService.selectSysSopList(sysSop); ExcelUtil util = new ExcelUtil(SysSop.class); return util.exportExcel(list, "SOP数据"); } + /** + * 导出SOP列表 + */ + @RequiresPermissions("system:sop:export") + @Log(title = "SOP", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(@RequestBody String[] sopIds) + { + List list = sysSopService.selectSysSopListByIds(sopIds); + ExcelUtil util = new ExcelUtil(SysSop.class); + return util.exportExcel(list, "SOP数据"); + } + + /** * 新增SOP */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSop.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSop.java index fc2dbcae..9434e0d1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSop.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSop.java @@ -22,15 +22,20 @@ public class SysSop extends BaseEntity private String delFlag; /** sopid */ + @Excel(name = "sopid") private String sopId; /** sop编号 */ + @Excel(name = "sop编号") private String sopNum; /** 品名 */ + @Excel(name = "品名") private String productName; /** 设备型号 */ + @Excel(name = "设备型号") private String equipModel; /** 描述 */ + @Excel(name = "描述") private String describe; /** 成品代码 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSopMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSopMapper.java index 9e0c4ffc..da3f77e3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSopMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysSopMapper.java @@ -59,4 +59,10 @@ public interface SysSopMapper * @return 结果 */ public int deleteSysSopByIds(String[] ids); + + /** + * 根据 sopIds 查询 sop集合 + * */ + List selectSysSopListByIds(String[] sopIds); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSopService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSopService.java index 382db430..5686860f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSopService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysSopService.java @@ -59,4 +59,9 @@ public interface ISysSopService * @return 结果 */ public int deleteSysSopById(Long sopId); + + /** + * 根据 sopIds 查询 sop集合 + * */ + List selectSysSopListByIds(String[] sopIds); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSopServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSopServiceImpl.java index d83402ee..e4d14025 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSopServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSopServiceImpl.java @@ -51,6 +51,16 @@ public class SysSopServiceImpl implements ISysSopService return sysSopMapper.selectSysSopList(sysSop); } + + /** + * 根据 sopIds 查询 sop集合 + * */ + @Override + public List selectSysSopListByIds(String[] sopIds) { + List list = sysSopMapper.selectSysSopListByIds(sopIds); + return list; + } + /** * 新增SOP * diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSopMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSopMapper.xml index a49aa12f..2941b49a 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSopMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSopMapper.xml @@ -58,7 +58,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + + + insert into sys_sop diff --git a/ruoyi-admin/src/main/resources/templates/system/sop/sop.html b/ruoyi-admin/src/main/resources/templates/system/sop/sop.html index aa8dd0e4..82f264ae 100644 --- a/ruoyi-admin/src/main/resources/templates/system/sop/sop.html +++ b/ruoyi-admin/src/main/resources/templates/system/sop/sop.html @@ -56,15 +56,9 @@ 添加 - - - - - - - - - + + 导出 +
@@ -253,6 +247,61 @@ window.location.href =prefix + "/downloadFile?filepath="+ filepath; } + + // 导出 + function exportExcel(formId) { + // $.table.set(); + var sopIdData = []; + var selections = $("#bootstrap-table").bootstrapTable("getSelections"); + if(selections.length === 0){ + $.modal.confirm("确定导出所有成品Sop吗?", 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("确定导出选中的所有成品Sop吗?", function () { + //·拼接单号 + for(let i=0;i \ No newline at end of file