From 7806d188740639bec45e4c5d3aae878600d7a985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 14 Jun 2024 13:33:12 +0800 Subject: [PATCH] =?UTF-8?q?fix(ebom):=20=E4=BF=AE=E5=A4=8D=E7=B2=BE?= =?UTF-8?q?=E7=A1=AE=E6=90=9C=E7=B4=A2=E4=B8=8D=E8=83=BD=E8=B7=A8=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/master/BomNewEbomParentMapper.java | 2 +- .../service/BomNewEbomParentService.java | 5 +- .../mapper/master/BomNewEbomParentMapper.xml | 49 +++++++++++-------- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java index 5eb5d82c..c48134bb 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java @@ -82,7 +82,7 @@ public interface BomNewEbomParentMapper extends BaseMapper getEBomParentByMaterialNos(@Param("job") Integer job, @Param("createdBy")String createdBy, @Param("materialNos") List materialNos); - Page workDetailsListByPageNew(Page objectPage, BomNewEbomParentQuery query, Integer userJob, String userCode, Long deptRowId); + Page workDetailsListByPageNew(Page objectPage, BomNewEbomParentQuery query, Integer userJob, String userCode, Long deptRowId, boolean fuzzySearch); List getChildren(Long bomRowId, int type); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 6339216f..103eba98 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -2221,14 +2221,13 @@ public class BomNewEbomParentService extends ServiceImpl result; if (StrUtil.isBlank(query.getMaterialNo()) && StrUtil.isBlank(query.getDrawingNo())) { result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage() - , query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId()); + , query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId(), true); //列表搜索 materialMainService.intiMaterialInfo(result.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT); return result; } - query.setShowMySelfOnly(0); result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage() - , query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId()); + , query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId(), false); //根据编号或图号搜索 //从顶级开始查找 List roots = result.getRecords().stream() diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml index 1e8ed57f..9fceb804 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml @@ -408,28 +408,34 @@ SELECT *,row_id as bomRowId FROM t_bom_new_ebom_parent - - AND created_by = #{userCode} + + + AND created_by = #{userCode} + + + AND dept_row_id = #{deptRowId} + + + AND status IN (1,3) AND (root_is=1 OR user_root_is=1 OR root_is_for_wait_review=1) AND + created_by=#{userCode} + + + AND ((root_is=1 OR user_root_is=1) AND status=2) OR (status IN (1,3) AND (root_is=1 OR + user_root_is=1 OR + root_is_for_wait_review=1) AND created_by=#{userCode}) + + + AND devise_name LIKE concat('%', #{query.deviseName}, '%') + + + AND created_time BETWEEN #{query.startDate} AND DATE_ADD(#{query.endDate}, INTERVAL 1 DAY) + + + AND notice_nums LIKE concat('%', #{query.noticeNo}, '%') + - - AND dept_row_id = #{deptRowId} - - - AND status IN (1,3) AND (root_is=1 OR user_root_is=1 OR root_is_for_wait_review=1) AND - created_by=#{userCode} - - - AND ((root_is=1 OR user_root_is=1) AND status=2) OR (status IN (1,3) AND (root_is=1 OR user_root_is=1 OR - root_is_for_wait_review=1) AND created_by=#{userCode}) - - - AND devise_name LIKE concat('%', #{query.deviseName}, '%') - - - AND created_time BETWEEN #{query.startDate} AND DATE_ADD(#{query.endDate}, INTERVAL 1 DAY) - - - AND notice_nums LIKE concat('%', #{query.noticeNo}, '%') + + status < 4 AND (root_is=1 OR user_root_is=1 OR root_is_for_wait_review=1) order by row_id desc @@ -445,6 +451,7 @@ , IFNULL(a.last_version_is, 1) last_version_is , IFNULL(a.user_root_is, 0) user_root_is , IFNULL(a.row_id, 0) AS bomRowId + , a.status , b.* FROM t_bom_new_ebom_child b LEFT JOIN t_bom_new_ebom_parent a ON a.material_no = b.material_no