From 04d33ab25cdd7eb33d58ace2c0411ba0d969dde2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 30 May 2024 11:44:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(pbom):=20pbom=E5=B7=A5=E4=BD=9C=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E8=83=BD=E6=9F=A5=E7=9C=8B=E6=9C=AC=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/mapper/master/BomNewPbomParentMapper.java | 4 +--- .../product/bomnew/pojo/entity/BomNewPbomParentEntity.java | 7 +++++++ .../product/bomnew/service/BomNewPbomParentService.java | 3 ++- .../resources/mapper/master/BomNewPbomParentMapper.xml | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) 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 c7424791..4196a283 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 @@ -10,9 +10,7 @@ import com.nflg.product.bomnew.pojo.vo.BomNewPbomWorkExcelVO; import org.apache.ibatis.annotations.Param; import java.util.Collection; -import java.util.Collections; import java.util.List; -import java.util.Set; /** * t_bom_new_pbom_parent 表数据库访问层 @@ -23,7 +21,7 @@ import java.util.Set; */ public interface BomNewPbomParentMapper extends BaseMapper { - Page workDetailsListByPage(Page page, @Param("query") BomNewPbomParentQuery query , @Param("userFac") String userFac); + Page workDetailsListByPage(Page page, @Param("query") BomNewPbomParentQuery query, @Param("userFac") String userFac, Long deptRowId); List workDetailsExcel(@Param("userFac") String userFac); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java index 0ee8f7a7..5d922c23 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewPbomParentEntity.java @@ -355,6 +355,13 @@ public class BomNewPbomParentEntity implements Serializable { @ApiModelProperty(value = "导入SAP时间") private LocalDateTime sapTime; + /** + * 创建人所属部门rowId + */ + @TableField(value = "dept_row_id") + @ApiModelProperty(value = "创建人所属部门rowId") + private Long deptRowId; + private static final long serialVersionUID = -31999878274445137L; } 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 99dbea1e..13d86df4 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 @@ -139,7 +139,8 @@ public class BomNewPbomParentService extends ServiceImpl(); } else { - Page result = this.getBaseMapper().workDetailsListByPage(new Page<>(query.getPage(), query.getPageSize()), query, userRoleService.getUserFactory()); + Page result = this.getBaseMapper().workDetailsListByPage(new Page<>(query.getPage() + , query.getPageSize()), query, userRoleService.getUserFactory(), SessionUtil.getDepartRowId()); materialMainService.intiMaterialInfo(result.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); return result; } 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 522c2425..bf33ac38 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 @@ -78,7 +78,7 @@