From d70a67e46f1aa414ffc09e0c7c57a3e19267df08 Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 14 Jul 2025 17:27:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/back/MaterialBackApplyInfo.java | 6 ++ .../back/MaterialBackApplyTotalInfo.java | 6 ++ .../domain/lease/LeaseApplyDetailsInfo.java | 6 ++ .../domain/lease/MaterialLeaseApplyInfo.java | 5 ++ .../vo/MaterialRetainedEquipmentInfo.java | 5 ++ .../clz/domain/vo/lease/LeaseTotalInfo.java | 6 ++ .../MaterialBackApplyInfoServiceImpl.java | 53 +++++++++++---- .../impl/MaterialLeaseInfoServiceImpl.java | 67 ++++++++++++++----- .../impl/MaterialMachineServiceImpl.java | 47 ++++++++++--- .../com/bonus/material/ma/domain/Machine.java | 5 ++ .../material/clz/MaterialBackInfoMapper.xml | 18 +++++ .../material/clz/MaterialLeaseInfoMapper.xml | 24 +++++++ .../material/clz/MaterialMachineMapper.xml | 24 +++++++ 13 files changed, 232 insertions(+), 40 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackApplyInfo.java index 9f799efd..14803d3f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackApplyInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackApplyInfo.java @@ -11,6 +11,7 @@ import javax.validation.constraints.Size; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 退料任务对象 back_apply_info @@ -190,4 +191,9 @@ public class MaterialBackApplyInfo implements Serializable { @ApiModelProperty(value = "实施单位id") private String impUnit; + + /** + * i8工程id集合 + */ + private List projectIdList; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackApplyTotalInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackApplyTotalInfo.java index 9133babe..2cf6971b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackApplyTotalInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackApplyTotalInfo.java @@ -10,6 +10,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 退料任务对象 back_apply_info @@ -156,4 +157,9 @@ public class MaterialBackApplyTotalInfo implements Serializable { @ApiModelProperty(value = "实施单位id") private String impUnit; + /** + * i8工程id集合 + */ + private List projectIdList; + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/LeaseApplyDetailsInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/LeaseApplyDetailsInfo.java index 668a5c28..2d0cf361 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/LeaseApplyDetailsInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/LeaseApplyDetailsInfo.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.ToString; import java.math.BigDecimal; +import java.util.List; /** * 领料任务详细对象 lease_apply_details @@ -158,4 +159,9 @@ public class LeaseApplyDetailsInfo extends BaseEntity { @ApiModelProperty(value = "实施单位id") private String impUnit; + + /** + * i8工程id集合 + */ + private List projectIdList; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyInfo.java index 5166da8b..2c1b4e96 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyInfo.java @@ -305,4 +305,9 @@ public class MaterialLeaseApplyInfo extends BaseEntity { * 班组长身份证号 */ private String teamLeaderIdCard; + + /** + * i8工程id集合 + */ + private List projectIdList; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java index 164e916e..78316a6c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java @@ -214,4 +214,9 @@ public class MaterialRetainedEquipmentInfo { @ApiModelProperty(value = "实施单位id") private String impUnit; + + /** + * i8工程id集合 + */ + private List projectIdList; } \ No newline at end of file diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/lease/LeaseTotalInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/lease/LeaseTotalInfo.java index 230da7af..740a6dc2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/lease/LeaseTotalInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/lease/LeaseTotalInfo.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.List; /** * 工器具领料记录详情 @@ -96,4 +97,9 @@ public class LeaseTotalInfo { @ApiModelProperty(value = "身份证号码") private String idCard; + + /** + * i8工程id集合 + */ + private List projectIdList; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java index 79128e28..91255e34 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java @@ -81,19 +81,28 @@ public class MaterialBackApplyInfoServiceImpl implements MaterialBackApplyInfoSe */ @Override public List selectBackApplyInfoList(MaterialBackApplyInfo backApplyInfo) { + String username = SecurityUtils.getLoginUser().getUsername(); + // 根据用户名判断用户是否为班组长 + BmTeam teamData = materialMachineMapper.getTeamData(username); + if (teamData == null) { + // 根据用户名查询项目部信息 + String departId = mapper.getDepartId(username); + // 根据项目部id查询工程信息 + List projectIdList = mapper.getProjectId(departId); + if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) { + backApplyInfo.setProjectIdList(projectIdList); + } + } List list = materialBackInfoMapper.selectBackApplyInfoList(backApplyInfo); // 如果列表为空，直接返回空列表 if (CollectionUtils.isEmpty(list)) { return new ArrayList<>(); } - String username = SecurityUtils.getLoginUser().getUsername(); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); if (!org.springframework.util.CollectionUtils.isEmpty(list) && deptId != null) { // 删除元素 list.removeIf(info -> !deptId.toString().equals(info.getImpUnit())); } - // 根据用户名判断用户是否为班组长 - BmTeam teamData = materialMachineMapper.getTeamData(username); if (!org.springframework.util.CollectionUtils.isEmpty(list)) { // 班组长权限 if (teamData != null) { @@ -101,10 +110,10 @@ public class MaterialBackApplyInfoServiceImpl implements MaterialBackApplyInfoSe list = list.stream() .filter(item -> StringUtils.isBlank(item.getIdCard()) || username.equals(item.getIdCard())) .collect(Collectors.toList()); - } else { + } /*else { // 材料员权限 list = filterList(list, username); - } + }*/ } if (!CollectionUtils.isEmpty(list)) { // 提取关键字 @@ -177,14 +186,23 @@ public class MaterialBackApplyInfoServiceImpl implements MaterialBackApplyInfoSe @Override public List getTotalList(MaterialBackApplyInfo backApplyInfo) { String username = SecurityUtils.getLoginUser().getUsername(); + // 根据用户名判断用户是否为班组长 + BmTeam teamData = materialMachineMapper.getTeamData(username); + if (teamData == null) { + // 根据用户名查询项目部信息 + String departId = mapper.getDepartId(username); + // 根据项目部id查询工程信息 + List projectIdList = mapper.getProjectId(departId); + if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) { + backApplyInfo.setProjectIdList(projectIdList); + } + } List list = materialBackInfoMapper.getTotalList(backApplyInfo); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); if (!org.springframework.util.CollectionUtils.isEmpty(list) && deptId != null) { // 删除元素 list.removeIf(info -> !deptId.toString().equals(info.getImpUnit())); } - // 根据用户名判断用户是否为班组长 - BmTeam teamData = materialMachineMapper.getTeamData(username); if (!org.springframework.util.CollectionUtils.isEmpty(list)) { // 班组长权限 if (teamData != null) { @@ -192,10 +210,10 @@ public class MaterialBackApplyInfoServiceImpl implements MaterialBackApplyInfoSe list = list.stream() .filter(item -> StringUtils.isBlank(item.getIdCard()) || username.equals(item.getIdCard())) .collect(Collectors.toList()); - } else { + } /*else { // 材料员权限 list = filterList(list, username); - } + }*/ } if (!CollectionUtils.isEmpty(list)) { // 如果关键字不为空，进行过滤 @@ -519,6 +537,17 @@ public class MaterialBackApplyInfoServiceImpl implements MaterialBackApplyInfoSe @Override public List getBackInfoDetails(MaterialBackApplyTotalInfo info) { String username = SecurityUtils.getLoginUser().getUsername(); + // 根据用户名判断用户是否为班组长 + BmTeam teamData = materialMachineMapper.getTeamData(username); + if (teamData == null) { + // 根据用户名查询项目部信息 + String departId = mapper.getDepartId(username); + // 根据项目部id查询工程信息 + List projectIdList = mapper.getProjectId(departId); + if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) { + info.setProjectIdList(projectIdList); + } + } BigDecimal backNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); List list = materialBackInfoMapper.getBackInfoDetails(info); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); @@ -526,8 +555,6 @@ public class MaterialBackApplyInfoServiceImpl implements MaterialBackApplyInfoSe // 删除元素 list.removeIf(m -> !deptId.toString().equals(m.getImpUnit())); } - // 根据用户名判断用户是否为班组长 - BmTeam teamData = materialMachineMapper.getTeamData(username); if (!org.springframework.util.CollectionUtils.isEmpty(list)) { // 班组长权限 if (teamData != null) { @@ -535,10 +562,10 @@ public class MaterialBackApplyInfoServiceImpl implements MaterialBackApplyInfoSe list = list.stream() .filter(item -> StringUtils.isBlank(item.getIdCard()) || username.equals(item.getIdCard())) .collect(Collectors.toList()); - } else { + } /*else { // 材料员权限 list = filterInfo(list, username); - } + }*/ } if (CollectionUtils.isNotEmpty(list)) { for (MaterialBackApplyTotalInfo backApplyTotalInfo : list) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java index b2d229c4..91728a21 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java @@ -100,6 +100,17 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { @Override public List selectLeaseApplyInfoList(MaterialLeaseApplyInfo leaseApplyInfo) { String username = SecurityUtils.getLoginUser().getUsername(); + // 根据用户名判断用户是否为班组长 + BmTeam teamData = materialMachineMapper.getTeamData(username); + if (teamData == null) { + // 根据用户名查询项目部信息 + String departId = mapper.getDepartId(username); + // 根据项目部id查询工程信息 + List projectIdList = mapper.getProjectId(departId); + if (!CollectionUtils.isEmpty(projectIdList)) { + leaseApplyInfo.setProjectIdList(projectIdList); + } + } List list = materialLeaseInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo); // 利用Stream API进行降序排序 List sortedList = list.stream() @@ -111,17 +122,15 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { // 删除元素 sortedList.removeIf(info -> !deptId.toString().equals(info.getImpUnit())); } - // 根据用户名判断用户是否为班组长 - BmTeam teamData = materialMachineMapper.getTeamData(username); if (!CollectionUtils.isEmpty(sortedList)) { if (teamData != null) { // 将sortedList中班组身份证号与username相同的元素过滤处理 sortedList = sortedList.stream() .filter(item -> StringUtils.isBlank(item.getTeamLeaderIdCard()) || username.equals(item.getTeamLeaderIdCard())) .collect(Collectors.toList()); - } else { + } /*else { sortedList = filterByDataPermission(sortedList); - } + }*/ } // 处理剩余数据 if (!CollectionUtils.isEmpty(sortedList)) { @@ -226,6 +235,17 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { @Override public List getTotalList(MaterialLeaseApplyInfo leaseApplyInfo) { String username = SecurityUtils.getLoginUser().getUsername(); + // 根据用户名判断用户是否为班组长 + BmTeam teamData = materialMachineMapper.getTeamData(username); + if (teamData == null) { + // 根据用户名查询项目部信息 + String departId = mapper.getDepartId(username); + // 根据项目部id查询工程信息 + List projectIdList = mapper.getProjectId(departId); + if (!CollectionUtils.isEmpty(projectIdList)) { + leaseApplyInfo.setProjectIdList(projectIdList); + } + } // 领料数据 List list = materialLeaseInfoMapper.getTotalList(leaseApplyInfo); // 查询领用数据 @@ -252,8 +272,6 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { // 删除元素 sortedList.removeIf(info -> !deptId.toString().equals(info.getImpUnit())); } - // 根据用户名判断用户是否为班组长 - BmTeam teamData = materialMachineMapper.getTeamData(username); if (!CollectionUtils.isEmpty(sortedList)) { // 班组数据权限 if (teamData != null) { @@ -261,9 +279,6 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { sortedList = sortedList.stream() .filter(item -> StringUtils.isBlank(item.getIdCard()) || username.equals(item.getIdCard())) .collect(Collectors.toList()); - } else { - // 材料员数据权限 - sortedList = filterByDataPermission(sortedList); } } if (!CollectionUtils.isEmpty(sortedList)) { @@ -691,6 +706,17 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { @Override public List getLeaseInfo(LeaseApplyDetailsInfo dto) { String username = SecurityUtils.getLoginUser().getUsername(); + // 根据用户名判断用户是否为班组长 + BmTeam teamData = materialMachineMapper.getTeamData(username); + if (teamData == null) { + // 根据用户名查询项目部信息 + String departId = mapper.getDepartId(username); + // 根据项目部id查询工程信息 + List projectIdList = mapper.getProjectId(departId); + if (!CollectionUtils.isEmpty(projectIdList)) { + dto.setProjectIdList(projectIdList); + } + } BigDecimal preNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); BigDecimal alNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); BigDecimal outNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); @@ -700,18 +726,16 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { // 删除元素 list.removeIf(info -> !deptId.toString().equals(info.getImpUnit())); } - // 根据用户名判断用户是否为班组长 - BmTeam teamData = materialMachineMapper.getTeamData(username); if (!CollectionUtils.isEmpty(list)) { if (teamData != null) { // 将list中班组身份证号与username相同的元素过滤处理 list = list.stream() .filter(item -> StringUtils.isBlank(item.getIdCard()) || username.equals(item.getIdCard())) .collect(Collectors.toList()); - } else { + } /*else { // 材料员权限 list = filterList(list, username); - } + }*/ } if (!CollectionUtils.isEmpty(list)) { String keyWord = dto.getKeyWord(); @@ -1105,6 +1129,17 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { @Override public List getLeaseInfoDetails(LeaseTotalInfo info) { String username = SecurityUtils.getLoginUser().getUsername(); + // 根据用户名判断用户是否为班组长 + BmTeam teamData = materialMachineMapper.getTeamData(username); + if (teamData == null) { + // 根据用户名查询项目部信息 + String departId = mapper.getDepartId(username); + // 根据项目部id查询工程信息 + List projectIdList = mapper.getProjectId(departId); + if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) { + info.setProjectIdList(projectIdList); + } + } BigDecimal preNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); BigDecimal outNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); BigDecimal pendingNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP); @@ -1114,8 +1149,6 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { // 删除元素 list.removeIf(m -> !deptId.toString().equals(m.getImpUnit())); } - // 根据用户名判断用户是否为班组长 - BmTeam teamData = materialMachineMapper.getTeamData(username); if (!CollectionUtils.isEmpty(list)) { // 班组长权限 if (teamData != null) { @@ -1123,10 +1156,10 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService { list = list.stream() .filter(item -> StringUtils.isBlank(item.getIdCard()) || username.equals(item.getIdCard())) .collect(Collectors.toList()); - } else { + } /*else { // 材料员权限 list = filterListInfo(list, username); - } + }*/ } // 处理数据并计算总和 if (!CollectionUtils.isEmpty(list)) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java index dc20c6d9..63f7ee6c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java @@ -53,6 +53,17 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { @Override public List getMachineInfo(Machine machine) { String username = SecurityUtils.getLoginUser().getUsername(); + // 根据用户名判断用户是否为班组长 + BmTeam teamData = materialMachineMapper.getTeamData(username); + if (teamData == null) { + // 根据用户名查询项目部信息 + String departId = mapper.getDepartId(username); + // 根据项目部id查询工程信息 + List projectIdList = mapper.getProjectId(departId); + if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) { + machine.setProjectIdList(projectIdList); + } + } // 查询slt_agreement_info数据 List primaryList = materialMachineMapper.getMachineInfo(machine); @@ -79,8 +90,6 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { // 删除元素 mergedList.removeIf(m -> !deptId.toString().equals(m.getImpUnit())); } - // 根据用户名判断用户是否为班组长 - BmTeam teamData = materialMachineMapper.getTeamData(username); if (!org.springframework.util.CollectionUtils.isEmpty(mergedList)) { // 班组权限 if (teamData != null) { @@ -141,7 +150,7 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { } List newList = new ArrayList<>(); for (Machine info : list) { - if (com.bonus.common.core.utils.StringUtils.isBlank(info.getExternalId())) { + if (StringUtils.isBlank(info.getExternalId())) { continue; } // 根据i8工程id查询项目部id @@ -311,23 +320,32 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { @Override public List getTeamUseNumList(MaterialRetainedEquipmentInfo bean) { String username = SecurityUtils.getLoginUser().getUsername(); + // 根据用户名判断用户是否为班组长 + BmTeam teamData = materialMachineMapper.getTeamData(username); + if (teamData == null) { + // 根据用户名查询项目部信息 + String departId = mapper.getDepartId(username); + // 根据项目部id查询工程信息 + List projectIdList = mapper.getProjectId(departId); + if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) { + bean.setProjectIdList(projectIdList); + } + } List list = materialMachineMapper.getTeamUseNumList(bean); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); if (!CollectionUtils.isEmpty(list) && deptId != null) { // 删除元素 list.removeIf(m -> !deptId.toString().equals(m.getImpUnit())); } - // 根据用户名判断用户是否为班组长 - BmTeam teamData = materialMachineMapper.getTeamData(username); if (!org.springframework.util.CollectionUtils.isEmpty(list)) { if (teamData != null) { // 将sortedList中班组身份证号与username相同的元素过滤处理 list = list.stream() .filter(item -> StringUtils.isBlank(item.getIdCard()) || username.equals(item.getIdCard())) .collect(Collectors.toList()); - } else { + } /*else { list = filterInfo(list, username); - } + }*/ } if (CollectionUtils.isNotEmpty(list)) { for (MaterialRetainedEquipmentInfo retainedEquipmentInfo : list) { @@ -510,12 +528,23 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { */ @Override public MaterialRetainedEquipmentInfo getToolsLedgerDetailsList(MaterialRetainedEquipmentInfo bean) { + String username = SecurityUtils.getLoginUser().getUsername(); try { + // 根据用户名判断用户是否为班组长 + BmTeam teamData = materialMachineMapper.getTeamData(username); + if (teamData == null) { + // 根据用户名查询项目部信息 + String departId = mapper.getDepartId(username); + // 根据项目部id查询工程信息 + List projectIdList = mapper.getProjectId(departId); + if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) { + bean.setProjectIdList(projectIdList); + } + } // 查询slt_agreement_info数据 List primaryList = materialMachineMapper.getToolsLedgerDetailsList(bean); // 查询clz_slt_agreement_info数据 List list = materialMachineMapper.getTeamUseNumDetailsList(bean); - String username = SecurityUtils.getLoginUser().getUsername(); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); if (!CollectionUtils.isEmpty(primaryList) && deptId != null) { // 删除元素 @@ -524,8 +553,6 @@ public class MaterialMachineServiceImpl implements MaterialMachineService { if (CollectionUtils.isEmpty(primaryList)) { return new MaterialRetainedEquipmentInfo(); } - // 根据用户名判断用户是否为班组长 - BmTeam teamData = materialMachineMapper.getTeamData(username); if (!org.springframework.util.CollectionUtils.isEmpty(list)) { if (teamData != null) { // 将sortedList中班组身份证号与username相同的元素过滤处理 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java index 2570c194..99039b82 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java @@ -258,4 +258,9 @@ public class Machine extends BaseEntity @ApiModelProperty(value = "i8工程id") private String externalId; + + /** + * i8工程id集合 + */ + private List projectIdList; } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml index e20d630f..69ee3592 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialBackInfoMapper.xml @@ -260,6 +260,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bt.bzz_idcard = #{idCard} + + and bp.external_id in + + #{item} + + GROUP BY bai.`code` ORDER BY bai.create_time desc @@ -321,6 +327,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and tt.task_status = #{status} + + and bp.external_id in + + #{item} + + GROUP BY bai.`code` ORDER BY bai.create_time desc @@ -581,6 +593,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + and bp.external_id in + + #{item} + + and ( mt2.type_name like concat('%', #{keyWord}, '%') or diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml index 55511e6e..1bfa555c 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml @@ -376,6 +376,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bt.bzz_idcard = #{idCard} + + and bp.external_id in + + #{item} + + GROUP BY lai.id ORDER BY tt.task_status,tt.create_time desc @@ -427,6 +433,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} + + and bp.external_id in + + #{item} + + @@ -666,6 +678,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + and bp.external_id in + + #{item} + + GROUP BY lai.`code`,mt.type_id @@ -743,6 +761,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + and bp.external_id in + + #{item} + + and ( mt2.type_name like concat('%', #{keyWord}, '%') or diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml index 406d3f4d..6a0d11a6 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml @@ -38,6 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mt.type_name like concat('%', #{maModel}, '%') + + and bp.external_id in + + #{item} + + GROUP BY mm.ma_id @@ -248,6 +254,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" OR bt.unit_name LIKE concat('%',#{keyWord},'%') ) + + and bp.external_id in + + #{item} + + GROUP BY bt.unit_name, mt2.type_name; @@ -441,6 +453,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND mm.ma_code like concat('%',#{maCode},'%') + + and bp.external_id in + + #{item} + + GROUP BY mt.type_name, mt1.type_name, @@ -578,6 +596,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mt.type_name like concat('%', #{maModel}, '%') + + and bp.external_id in + + #{item} + + GROUP BY mm.ma_id