From f92cbb857c4c19997a51f76d74a48172d615f3e5 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 31 Oct 2024 16:43:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E5=A4=A7=E5=B1=8F=E7=9A=84?= =?UTF-8?q?=E6=89=BF=E5=8C=85=E5=95=86=E9=A1=B9=E7=9B=AE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectEnterpriseServiceImpl.java | 15 +++++++++++++++ .../modules/worker/entity/EnterpriseInfo.java | 2 ++ 2 files changed, 17 insertions(+) diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java index e27b3fe77..1ed76fc4e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java @@ -15,9 +15,11 @@ import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper; import com.zhgd.xmgl.modules.project.service.IProjectEnterpriseService; import com.zhgd.xmgl.modules.project.service.IProjectService; import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo; +import com.zhgd.xmgl.modules.worker.entity.ProjectEnterpriseSupplierInfo; import com.zhgd.xmgl.modules.worker.entity.UserEnterprise; import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper; import com.zhgd.xmgl.modules.worker.mapper.UserEnterpriseMapper; +import com.zhgd.xmgl.modules.worker.service.IProjectEnterpriseSupplierInfoService; import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; @@ -25,6 +27,7 @@ import com.zhgd.xmgl.util.MessageUtil; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -49,6 +52,9 @@ public class ProjectEnterpriseServiceImpl extends ServiceImpl selectProjectEnterprisePage(Map map) { @@ -70,6 +76,15 @@ public class ProjectEnterpriseServiceImpl extends ServiceImpl list = projectEnterpriseMapper.selectProjectEnterprisePage(page, map); + if (CollUtil.isNotEmpty(list)) { + List supplierInfos = projectEnterpriseSupplierInfoService.list(new LambdaQueryWrapper() + .eq(ProjectEnterpriseSupplierInfo::getProjectSn, projectSn) + .in(ProjectEnterpriseSupplierInfo::getEnterpriseId, list.stream().map(EnterpriseInfo::getId).collect(Collectors.toList())) + ); + for (EnterpriseInfo info : list) { + info.setSupplierInfos(supplierInfos.stream().filter(o -> Objects.equals(info.getId(), o.getEnterpriseId())).collect(Collectors.toList())); + } + } return page.setRecords(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java index 59c1a38e0..1321db169 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java @@ -245,5 +245,7 @@ public class EnterpriseInfo implements Serializable { private String ancestors; @TableField(exist = false) private java.lang.Long parentProjectEnterpriseId; + @TableField(exist = false) + private List supplierInfos; }