admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

现场大屏的承包商项目修改bug

Browse Source
This commit is contained in:
guoshengxiong 2024-10-31 16:43:39 +08:00
parent 715f752d29
commit f92cbb857c
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectEnterpriseServiceImpl.java
View File

@ -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.IProjectEnterpriseService;
import com.zhgd.xmgl.modules.project.service.IProjectService; import com.zhgd.xmgl.modules.project.service.IProjectService;
import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo; 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.entity.UserEnterprise;
import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper; import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
import com.zhgd.xmgl.modules.worker.mapper.UserEnterpriseMapper; 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.modules.xz.entity.XzProjectOrg;
import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.entity.UserInfo;
import com.zhgd.xmgl.security.util.SecurityUtils; 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.collections.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -49,6 +52,9 @@ public class ProjectEnterpriseServiceImpl extends ServiceImpl<ProjectEnterpriseM
private EnterpriseInfoMapper enterpriseInfoMapper; private EnterpriseInfoMapper enterpriseInfoMapper;
@Autowired @Autowired
private IProjectService projectService; private IProjectService projectService;
@Lazy
@Autowired
private IProjectEnterpriseSupplierInfoService projectEnterpriseSupplierInfoService;
@Override @Override
public IPage<EnterpriseInfo> selectProjectEnterprisePage(Map<String, Object> map) { public IPage<EnterpriseInfo> selectProjectEnterprisePage(Map<String, Object> map) {
@ -70,6 +76,15 @@ public class ProjectEnterpriseServiceImpl extends ServiceImpl<ProjectEnterpriseM
map.put("enterpriseIds", enterpriseIds); map.put("enterpriseIds", enterpriseIds);
} }
List<EnterpriseInfo> list = projectEnterpriseMapper.selectProjectEnterprisePage(page, map); List<EnterpriseInfo> list = projectEnterpriseMapper.selectProjectEnterprisePage(page, map);
if (CollUtil.isNotEmpty(list)) {
List<ProjectEnterpriseSupplierInfo> supplierInfos = projectEnterpriseSupplierInfoService.list(new LambdaQueryWrapper<ProjectEnterpriseSupplierInfo>()
.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); return page.setRecords(list);
} }

2
src/main/java/com/zhgd/xmgl/modules/worker/entity/EnterpriseInfo.java
View File

@ -245,5 +245,7 @@ public class EnterpriseInfo implements Serializable {
private String ancestors; private String ancestors;
@TableField(exist = false) @TableField(exist = false)
private java.lang.Long parentProjectEnterpriseId; private java.lang.Long parentProjectEnterpriseId;
@TableField(exist = false)
private List<ProjectEnterpriseSupplierInfo> supplierInfos;
} }