From 6770c183c4a8e2ff903ad825265598fe611fb12c Mon Sep 17 00:00:00 2001 From: jing's Date: Tue, 16 Jan 2024 21:50:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=A0=B4=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/api/user/OptionalEbomApi.java | 3 +- .../bomnew/api/user/OptionalMbomApi.java | 3 +- .../master/OptionalEbomConfigMapper.java | 2 +- .../bomnew/pojo/vo/OptionalEbomConfigVO.java | 11 ++++++ .../service/OptionalEbomConfigService.java | 8 ++--- .../master/OptionalEbomConfigMapper.xml | 34 +++++++++++-------- 6 files changed, 40 insertions(+), 21 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java index 11cad712..be5f5662 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.base.core.exception.NflgBusinessException; import com.nflg.product.bomnew.constant.OptionalBomConstant; @@ -262,7 +263,7 @@ public class OptionalEbomApi extends BaseApi { @PostMapping("getTmpListPage") @ApiOperation("暂存方案分页数据") - public ResultVO> getTmpListPage(@RequestBody OptionalEbomConfigListQuery query) { + public ResultVO> getTmpListPage(@RequestBody OptionalEbomConfigListQuery query) { query.setCreatedBy(SessionUtil.getUserCode()); return ResultVO.success(this.optionalEbomConfigService.getTmpListPage(query)); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java index f9e2d285..8ece6996 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalMbomApi.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.MD5; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.product.base.core.api.BaseApi; import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.base.core.exception.NflgBusinessException; @@ -60,7 +61,7 @@ public class OptionalMbomApi extends BaseApi { @PostMapping("getPublishListPage") @ApiOperation("已发布机型分页数据") - public ResultVO> getPublishListPage(@RequestBody OptionalEbomConfigListQuery query) { + public ResultVO> getPublishListPage(@RequestBody OptionalEbomConfigListQuery query) { query.setCreatedBy(SessionUtil.getUserCode()); return ResultVO.success(this.optionalEbomConfigService.getPublishListPage(query)); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomConfigMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomConfigMapper.java index 9a19cf7f..1ed9efd4 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomConfigMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/OptionalEbomConfigMapper.java @@ -30,7 +30,7 @@ import java.util.List; public interface OptionalEbomConfigMapper extends BaseMapper { - IPage getListPage(Page page, @Param("query") OptionalEbomConfigListQuery query); + Page getListPage(Page page, @Param("query") OptionalEbomConfigListQuery query); List getTmpOptionList(@Param("rowId") Long rowId); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomConfigVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomConfigVO.java index 1baf4c8f..279e0a5d 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomConfigVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/OptionalEbomConfigVO.java @@ -92,5 +92,16 @@ public class OptionalEbomConfigVO implements Serializable { @ApiModelProperty(value = "变更时间") private Date updatedTime; + @ApiModelProperty("物料编码") + private String materialNo; + + @ApiModelProperty("物料名称") + private String materialName; + + @ApiModelProperty("图号") + private String drawingNo; + @ApiModelProperty("物料描述") + private String materialDesc; + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java index fef75eab..9cdf3af1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java @@ -54,10 +54,10 @@ public class OptionalEbomConfigService extends ServiceImpl getTmpListPage(OptionalEbomConfigListQuery query) { + public Page getTmpListPage(OptionalEbomConfigListQuery query) { query.setEditStatus(0); Page page = new PageVO<>(query.getPage(), query.getPageSize()); - IPage list = this.baseMapper.getListPage(page, query); + Page list = this.baseMapper.getListPage(page, query); return list; } @@ -67,11 +67,11 @@ public class OptionalEbomConfigService extends ServiceImpl getPublishListPage(OptionalEbomConfigListQuery query) { + public Page getPublishListPage(OptionalEbomConfigListQuery query) { query.setEditStatus(1); Page page = new PageVO<>(query.getPage(), query.getPageSize()); - IPage list = this.baseMapper.getListPage(page, query); + Page list = this.baseMapper.getListPage(page, query); return list; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml index ce0b4cd0..c0a200c1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml @@ -20,36 +20,42 @@ row_id,config_no,parent_row_id,device_no,device_name,edit_status,upload_sap_status,remark,dept_name,real_name,created_by,created_time,updated_time - + + +