rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert(feature/DM/nflg-bom): 部分导出和全部导出参数不一致，先还原，明天继续做

This commit is contained in:
曹鹏飞 2024-03-26 18:51:13 +08:00
parent 39023e438e
commit 46e4ad8590
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/PBomApi.java
View File

@ -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.BaseMaterialVO;
import com.nflg.product.bomnew.pojo.vo.BomCopyCheckResultVO; import com.nflg.product.bomnew.pojo.vo.BomCopyCheckResultVO;
import com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO; 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.service.*;
import com.nflg.product.bomnew.util.EecExcelUtil;
import com.nflg.product.bomnew.util.VUtils; import com.nflg.product.bomnew.util.VUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -79,20 +77,34 @@ public class PBomApi extends BaseApi {
@PostMapping("exportWorkDetailsListByPage") @PostMapping("exportWorkDetailsListByPage")
@ApiOperation("导出工作列表--导出") @ApiOperation("导出工作列表--导出")
@LogRecord(success = "PBom-导出工作列表,操作结果:{{#_ret}}", bizNo = "",type = "PBom-导出工作列表") @LogRecord(success = "PBom-导出工作列表,操作结果:{{#_ret}}", bizNo = "",type = "PBom-导出工作列表")
public void exportWorkDownLoad(@RequestBody List<Long> bomRowIds, HttpServletResponse response) throws IOException { public void exportWorkDownLoad(@RequestBody BomNewPbomParentQuery query ,HttpServletResponse response) throws IOException {
List<BomNewPbomWorkExcelVO> data = bomNewPbomParentService.exportExcel(bomRowIds); bomNewPbomParentService.workDetailsExcel(query,response);
//new Workbook().addSheet(new ListSheet<>(data)).writeTo(response.getOutputStream());
EecExcelUtil.export(response, data, BomNewPbomWorkExcelVO.class, "pbom明细列表");
} }
@PostMapping("releaseListDownLoad") @PostMapping("releaseListDownLoad")
@ApiOperation("PBom已发布工作列表--导出") @ApiOperation("PBom已发布工作列表--导出")
@LogRecord(success = "PBom-导出已发布工作列表,操作结果:{{#_ret}}", bizNo = "",type = "PBom-已发布工作列表") @LogRecord(success = "PBom-导出已发布工作列表,操作结果:{{#_ret}}", bizNo = "",type = "PBom-已发布工作列表")
public void releaseListDownLoad(@RequestBody List<Long> bomRowIds, HttpServletResponse response) throws IOException { public void releaseListDownLoad(@RequestBody BomNewPbomParentQuery query ,HttpServletResponse response) throws IOException {
List<BomNewPbomWorkExcelVO> data = bomNewPbomParentService.exportExcel(bomRowIds); bomNewPbomParentService.releaseListExcel(query,response);
EecExcelUtil.export(response, data, BomNewPbomWorkExcelVO.class, "pbom已发布明细列表");
} }
// @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") @GetMapping("getChild")
@ApiOperation("获取子级") @ApiOperation("获取子级")
public ResultVO<List<BomNewPbomParentVO>> getChild(@RequestParam("bomRowId") Long bomRowId){ public ResultVO<List<BomNewPbomParentVO>> getChild(@RequestParam("bomRowId") Long bomRowId){