From 8cd0754e0cf7e4e5b48fdd0d7fcc81c98d1d95bc Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Thu, 17 Oct 2024 09:07:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E9=85=8D=E7=BD=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86--=E5=A2=9E=E5=8A=A0SQL=E6=9F=A5=E8=AF=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ma/controller/MaTypeConfigController.java | 54 +------------------ .../mapper/material/ma/TypeRepairMapper.xml | 2 +- 2 files changed, 2 insertions(+), 54 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MaTypeConfigController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MaTypeConfigController.java index 58349225..93bd7014 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MaTypeConfigController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MaTypeConfigController.java @@ -102,7 +102,6 @@ public class MaTypeConfigController extends BaseController { // 4.循环所有物资类型,重型数据集合保障只循环一次，减少性能损失 for (MaTypeConfigVo typeConfigVo1 : list) { - // 1.外层 先对比维修班组 for (TypeRepair typeRepair : typeRepairList) { // 2.判断当前维修配置信息中的物资类型id是否等于当前物资类型配置信息中的物资类型id @@ -149,65 +148,14 @@ public class MaTypeConfigController extends BaseController { } } - - } + // -------------------- NEW ---------------------------- // TODO: 先暂时取消后续过滤流程 if (true) { return success(list); } - // -------------------- NEW ---------------------------- - - // 4.1 先循环维修配置信息 - for (TypeRepair typeRepair : typeRepairList) { - // 4.循环维修配置信息，把维修员信息设置到物资类型配置信息中 - for (MaTypeConfigVo maTypeConfigVo1 : list) { - // 5.判断当前维修配置信息中的物资类型id是否等于当前物资类型配置信息中的物资类型id - if (typeRepair.getTypeId().equals(maTypeConfigVo1.getTypeId())) { - // 6.如果相等，把维修员信息设置到物资类型配置信息中 - maTypeConfigVo1.setRepairUserId(typeRepair.getUserId()); - maTypeConfigVo1.setRepairUserName(typeRepair.getUserName()); - } - // 判断当前maTypeConfigVo1对象是否有子节点，如果有再继续循环 - if (maTypeConfigVo1.getChildren() != null) { - for (MaTypeConfigVo maTypeConfigVo2 : maTypeConfigVo1.getChildren()) { - // 5.判断当前维修配置信息中的物资类型id是否等于当前物资类型配置信息中的物资类型id - if (typeRepair.getTypeId().equals(maTypeConfigVo2.getTypeId())) { - // 6.如果相等，把维修员信息设置到物资类型配置信息中 - maTypeConfigVo2.setRepairUserId(typeRepair.getUserId()); - maTypeConfigVo2.setRepairUserName(typeRepair.getUserName()); - } - } - } - } - } - - // 4.2 再循环库管配置信息 - for (TypeKeeper typeKeeper : typeKeeperList) { - // 4.2循环库管配置信息，把库管员信息设置到物资类型配置信息中 - for (MaTypeConfigVo maTypeConfigVo1 : list) { - // 5.判断当前库管配置信息中的物资类型id是否等于当前物资类型配置信息中的物资类型id - if (typeKeeper.getTypeId().equals(maTypeConfigVo1.getTypeId())) { - // 6.如果相等，把库管员信息设置到物资类型配置信息中 - maTypeConfigVo1.setKeeperUserId(typeKeeper.getUserId()); - maTypeConfigVo1.setKeeperUserName(typeKeeper.getUserName()); - } - // 判断当前maTypeConfigVo1对象是否有子节点，如果有再继续循环 - if (maTypeConfigVo1.getChildren() != null) { - for (MaTypeConfigVo maTypeConfigVo2 : maTypeConfigVo1.getChildren()) { - // 5.判断当前库管配置信息中的物资类型id是否等于当前物资类型配置信息中的物资类型id - if (typeKeeper.getTypeId().equals(maTypeConfigVo2.getTypeId())) { - // 6.如果相等，把库管员信息设置到物资类型配置信息中 - maTypeConfigVo2.setKeeperUserId(typeKeeper.getUserId()); - maTypeConfigVo2.setKeeperUserName(typeKeeper.getUserName()); - } - } - } - } - } - // ------------------- 数据过滤开始 --------------------- if (maTypeConfigDto == null || maTypeConfigDto.getUserId() == null || maTypeConfigDto.getUserId() == 0L) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeRepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeRepairMapper.xml index d5f05ac0..926cbf2f 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeRepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeRepairMapper.xml @@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"