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<Long> bomRowIds, HttpServletResponse response) throws IOException {
-        List<BomNewPbomWorkExcelVO> 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<Long> bomRowIds, HttpServletResponse response) throws IOException {
-        List<BomNewPbomWorkExcelVO> 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<Long> bomRowIds, HttpServletResponse response) throws IOException {
+//        List<BomNewPbomWorkExcelVO> 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<Long> bomRowIds, HttpServletResponse response) throws IOException {
+//        List<BomNewPbomWorkExcelVO> data = bomNewPbomParentService.exportExcel(bomRowIds);
+//        EecExcelUtil.export(response, data, BomNewPbomWorkExcelVO.class, "pbom已发布明细列表");
+//    }
+
     @GetMapping("getChild")
     @ApiOperation("获取子级")
     public ResultVO<List<BomNewPbomParentVO>> getChild(@RequestParam("bomRowId") Long bomRowId){