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 bad3d185..3de8687e 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 @@ -61,7 +61,7 @@ public class PBomApi extends BaseApi { @PostMapping("releaseListByPage") @ApiOperation("PBom已发布工作列表") public ResultVO> releaseListByPage(@RequestBody BomNewPbomParentQuery query) { - return ResultVO.success(); + return ResultVO.success(bomNewPbomParentService.releaseListByPage(query)); } @GetMapping("getChild") diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java index 39085612..8a8a5c1c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java @@ -21,6 +21,12 @@ public interface BomNewPbomParentMapper extends BaseMapper workDetailsListByPage(Page page, @Param("query") BomNewPbomParentQuery query , @Param("userFac") String userFac); + /** + * 已发布列表 + * @author 大米 + * @date 2024/1/6 17:26 + */ + Page releaseListByPage(Page page, @Param("query") BomNewPbomParentQuery query); List getParentChild(@Param("parentRowId") Long parentRowId); void bomRelease(@Param("releaseUserName")String releaseUserName, @Param("rowIds") List rowIds ); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java index 20d1cf68..a7d0e3f1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java @@ -92,6 +92,17 @@ public class BomNewPbomParentService extends ServiceImpl releaseListByPage(BomNewPbomParentQuery query) { + Page result = this.getBaseMapper().releaseListByPage(new Page<>(query.getPage(), query.getPageSize()), query); + materialMainService.intiMaterialInfo(result.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); + return result; + } + public List getChild(Long rowId) { List parentChild = this.getBaseMapper().getParentChild(rowId); diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml index 9782380e..1de4dc07 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml @@ -74,7 +74,7 @@ + + +