From e04e638f037156e2681d5b44959f55687fbd72fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 27 Mar 2024 14:44:22 +0800 Subject: [PATCH] =?UTF-8?q?feat(feature/DM/nflg-bom):=20=E5=8E=9F=E5=A7=8B?= =?UTF-8?q?bom=E6=98=8E=E7=BB=86=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=B7=BB=E5=8A=A0=E2=80=9C=E6=98=AF=E5=90=A6=E4=BB=85?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=87=AA=E5=B7=B1=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/pojo/query/OriginalBomQuery.java | 10 ++-------- .../service/BomNewOriginalParentService.java | 17 +++++++++-------- .../master/BomNewOriginalParentMapper.xml | 3 +++ 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OriginalBomQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OriginalBomQuery.java index 8e980530..36db3a8c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OriginalBomQuery.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OriginalBomQuery.java @@ -1,6 +1,5 @@ package com.nflg.product.bomnew.pojo.query; -import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,7 +7,6 @@ import lombok.Data; import lombok.experimental.Accessors; import java.util.Arrays; -import java.util.Date; import java.util.List; /** @@ -20,8 +18,6 @@ import java.util.List; @ApiModel(value = "com-nflg-product-bom-obom-pojo-query-BomOriginalParentEntityQuery") public class OriginalBomQuery extends BasePageQuery { - - @ApiModelProperty(value = "图号集合，英文逗号隔开") private String drawingNoList; @@ -45,12 +41,10 @@ public class OriginalBomQuery extends BasePageQuery { @ApiModelProperty(value = "状态：1=待转换、2=已转换") private Integer status; - - private String startDate; private String endDate; - - + @ApiModelProperty(value = "是否仅显示自己的数据：0=所有人的数据；1=仅自己的数据，默认为0") + private Integer showMySelfOnly = 0; } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java index 9daa48f4..2bf44b63 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentService.java @@ -145,11 +145,9 @@ public class BomNewOriginalParentService extends ServiceImpl result = new Page<>(); //物料编码搜索或图号搜索 if (CollUtil.isNotEmpty(query.getMaterialNos()) || CollUtil.isNotEmpty(query.getDrawingNos())) { - List queryDrawingNos = new ArrayList<>(); - queryDrawingNos.addAll(query.getDrawingNos()); - List drawingParentNos=new ArrayList<>(); + List queryDrawingNos = new ArrayList<>(query.getDrawingNos()); if (CollUtil.isNotEmpty(query.getMaterialNos())) { - drawingParentNos = this.getBaseMapper().getDrawingNoByMaterialNos(query.getMaterialNos()); + List drawingParentNos = this.getBaseMapper().getDrawingNoByMaterialNos(query.getMaterialNos()); if (CollUtil.isNotEmpty(drawingParentNos)) { queryDrawingNos.addAll(drawingParentNos); } @@ -160,7 +158,7 @@ public class BomNewOriginalParentService extends ServiceImpl parentDrawingNos = getParentDrawingNoByMaterialNo(queryDrawingNos).stream().collect(Collectors.toList()); + List parentDrawingNos = new ArrayList<>(getParentDrawingNoByMaterialNo(queryDrawingNos)); parentDrawingNos.addAll(queryDrawingNos); if (CollUtil.isNotEmpty(parentDrawingNos)) { List parents = this.getBaseMapper().getParentForDrawingNoSeach(parentDrawingNos, query.getStatus()); @@ -173,8 +171,11 @@ public class BomNewOriginalParentService extends ServiceImpl(query.getPage(), query.getPageSize()), query, SessionUtil.getUserCode()); + String userCode = null; + if (query.getShowMySelfOnly() == 1) { + userCode = SessionUtil.getUserCode(); + } + result = this.getBaseMapper().getOriginalBomListPage(new Page<>(query.getPage(), query.getPageSize()), query, userCode); materialMainService.intiMaterialInfo(result.getRecords()); } return result; @@ -201,7 +202,7 @@ public class BomNewOriginalParentService extends ServiceImpl delRowIds = bom.getBomList().stream().filter(u -> u.getRowId() > 0).map(u -> u.getRowId()).collect(Collectors.toList()); + List delRowIds = bom.getBomList().stream().map(BomOriginalListVO::getRowId).filter(rowId -> rowId > 0).collect(Collectors.toList()); originalChildService.getBaseMapper().delOriginalChildNotInRowIds(delRowIds, bom.getParentRowId()); originalChildService.saveOrUpdateBatch(childEntities); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml index 66ca1288..986de007 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml @@ -70,6 +70,9 @@ and created_time between #{query.startDate} and DATE_ADD(#{query.endDate}, INTERVAL 1 DAY) + + and created_by=#{userCode} +