From 46e4ad859061b6838c82a2a821076d6c99142d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 26 Mar 2024 18:51:13 +0800 Subject: [PATCH] =?UTF-8?q?revert(feature/DM/nflg-bom):=20=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AF=BC=E5=87=BA=E5=92=8C=E5=85=A8=E9=83=A8=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8F=82=E6=95=B0=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C?= =?UTF-8?q?=E5=85=88=E8=BF=98=E5=8E=9F=EF=BC=8C=E6=98=8E=E5=A4=A9=E7=BB=A7?= =?UTF-8?q?=E7=BB=AD=E5=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/api/user/PBomApi.java | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java index 6069687b..2f097f7f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java @@ -16,9 +16,7 @@ import com.nflg.product.bomnew.pojo.query.BomNewPbomParentQuery; import com.nflg.product.bomnew.pojo.vo.BaseMaterialVO; import com.nflg.product.bomnew.pojo.vo.BomCopyCheckResultVO; import com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO; -import com.nflg.product.bomnew.pojo.vo.BomNewPbomWorkExcelVO; import com.nflg.product.bomnew.service.*; -import com.nflg.product.bomnew.util.EecExcelUtil; import com.nflg.product.bomnew.util.VUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -79,20 +77,34 @@ public class PBomApi extends BaseApi { @PostMapping("exportWorkDetailsListByPage") @ApiOperation("导出工作列表--导出") @LogRecord(success = "PBom-导出工作列表,操作结果:{{#_ret}}", bizNo = "",type = "PBom-导出工作列表") - public void exportWorkDownLoad(@RequestBody List bomRowIds, HttpServletResponse response) throws IOException { - List data = bomNewPbomParentService.exportExcel(bomRowIds); - //new Workbook().addSheet(new ListSheet<>(data)).writeTo(response.getOutputStream()); - EecExcelUtil.export(response, data, BomNewPbomWorkExcelVO.class, "pbom明细列表"); + public void exportWorkDownLoad(@RequestBody BomNewPbomParentQuery query ,HttpServletResponse response) throws IOException { + bomNewPbomParentService.workDetailsExcel(query,response); } @PostMapping("releaseListDownLoad") @ApiOperation("PBom已发布工作列表--导出") @LogRecord(success = "PBom-导出已发布工作列表,操作结果:{{#_ret}}", bizNo = "",type = "PBom-已发布工作列表") - public void releaseListDownLoad(@RequestBody List bomRowIds, HttpServletResponse response) throws IOException { - List data = bomNewPbomParentService.exportExcel(bomRowIds); - EecExcelUtil.export(response, data, BomNewPbomWorkExcelVO.class, "pbom已发布明细列表"); + public void releaseListDownLoad(@RequestBody BomNewPbomParentQuery query ,HttpServletResponse response) throws IOException { + bomNewPbomParentService.releaseListExcel(query,response); } +// @PostMapping("exportWorkDetailsListByPage") +// @ApiOperation("导出工作列表--导出") +// @LogRecord(success = "PBom-导出工作列表,操作结果:{{#_ret}}", bizNo = "",type = "PBom-导出工作列表") +// public void exportWorkDownLoad(@RequestBody List bomRowIds, HttpServletResponse response) throws IOException { +// List data = bomNewPbomParentService.exportExcel(bomRowIds); +// //new Workbook().addSheet(new ListSheet<>(data)).writeTo(response.getOutputStream()); +// EecExcelUtil.export(response, data, BomNewPbomWorkExcelVO.class, "pbom明细列表"); +// } +// +// @PostMapping("releaseListDownLoad") +// @ApiOperation("PBom已发布工作列表--导出") +// @LogRecord(success = "PBom-导出已发布工作列表,操作结果:{{#_ret}}", bizNo = "",type = "PBom-已发布工作列表") +// public void releaseListDownLoad(@RequestBody List bomRowIds, HttpServletResponse response) throws IOException { +// List data = bomNewPbomParentService.exportExcel(bomRowIds); +// EecExcelUtil.export(response, data, BomNewPbomWorkExcelVO.class, "pbom已发布明细列表"); +// } + @GetMapping("getChild") @ApiOperation("获取子级") public ResultVO> getChild(@RequestParam("bomRowId") Long bomRowId){