liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: liuc:55ed660a0f1e0d56e3ba8ba6b13560d51a510b17
Branches Tags
liuc:dev
...
compare: liuc:e562e2ea0d6830370a34042dd84dda00b97ab549
Branches Tags
liuc:dev

2 Commits
55ed660a0f ... e562e2ea0d

Author SHA1 Message Date
TL
e562e2ea0d Merge remote-tracking branch '99/dev' into 99dev 2025-07-30 16:56:46 +08:00
TL
386af83be3 修改部门 2025-07-30 16:55:47 +08:00
8 changed files with 358 additions and 175 deletions
Expand all files Collapse all files

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/controller/OrgController.java
View File

@ -37,7 +37,7 @@ public class OrgController {
@ApiOperation("查询机构列表")
@GetMapping("/list")
public BaseResponse<List<SysOrg>> getOrglist(@ApiParam(value = "查询对象数据", required = false) @SpringQueryMap SysOrg param){
public BaseResponse<List<SysOrg>> getOrglist(@ApiParam(value = "查询对象数据", required = false) @SpringQueryMap SysOrgVO param){
// 如果上级机构ID和机构ID都为空，则以根节点为起点查下级
if(StringUtils.isEmpty(param.getOrgId()) && StringUtils.isEmpty(param.getUpOrgId())) {
param.setUpOrgId(Constants.ROOT_NODE);

21
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/IOrgService.java
View File

@ -5,6 +5,7 @@ import com.chinaunicom.mall.ebtp.common.base.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
import java.util.List;
import java.util.Map;
/**
* 部门接口
@ -26,7 +27,7 @@ public interface IOrgService {
* @return
*/
SysOrg getOrgInfo(String id);
OrgDeptVo getOrgDeptInfo(String id);
Map<String, SysOrg> getOrgDeptInfo(String orgIds);
@ -36,7 +37,7 @@ public interface IOrgService {
* @param param
* @return
*/
BaseResponse<List<SysOrg>> getOrglist(SysOrg param);
BaseResponse<List<SysOrg>> getOrglist(SysOrgVO param);
/**
* 查询所有数据（树形结构）
@ -52,22 +53,6 @@ public interface IOrgService {
BaseResponse<List<SysOrgVO>> queryUserOrgAll();
/**
* 获取当前登录人的本级及下级部门id
* @return
*/
List<String> levelAndBelowOrgIdList();
/**
* 获取当前登录人的本级及上级部门id
* @return
*/
List<String> levelAndAboveOrgIdList();
/**
* 获取当前登录人的本级及下级及上级部门id
* @return
*/
List<String> orgDeptIdList(BaseCacheUser user);

88
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/base/service/impl/OrgServiceImpl.java
View File

@ -41,23 +41,20 @@ public class OrgServiceImpl implements IOrgService {
if(!ObjectUtils.isEmpty(orgInfo)){
return orgInfo.getData();
}
return null;
return new SysOrg();
}
@Override
public OrgDeptVo getOrgDeptInfo(String id) {
OrgDeptVo orgDeptVo = new OrgDeptVo();
SysOrg dept = getOrgInfo(id);
if(!ObjectUtils.isEmpty(dept)){
SysOrg org = systemClient.getOrgInfo(dept.getCuCompanyNumber()).getData();
if(!ObjectUtils.isEmpty(org)){
orgDeptVo.setOrgId(org.getOrgId());
orgDeptVo.setOrgName(org.getOrgName());
}
orgDeptVo.setDeptId(dept.getOrgId());
orgDeptVo.setDeptName(dept.getOrgName());
}
return orgDeptVo;
public Map<String, SysOrg> getOrgDeptInfo(String orgIds) {
//查询这些部门的信息
SysOrgVO orgVO = new SysOrgVO();
orgVO.setAllDepartmentId(orgIds);
List<SysOrg> orgList = systemClient.getOrglist(orgVO).getData();
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgList.stream()
.collect(Collectors.toMap(SysOrg::getOrgId, org -> org));
return orgMap;
}
/**
@ -66,7 +63,7 @@ public class OrgServiceImpl implements IOrgService {
* @return
*/
@Override
public BaseResponse<List<SysOrg>> getOrglist(SysOrg param) {
public BaseResponse<List<SysOrg>> getOrglist(SysOrgVO param) {
return systemClient.getOrglist(param);
}
@ -106,67 +103,6 @@ public class OrgServiceImpl implements IOrgService {
}
}
/**
* 获取当前登录人本级及下级部门id
* @return
*/
@Override
public List<String> levelAndBelowOrgIdList() {
// 获取当前用户
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
SysOrg sysOrg = new SysOrg();
sysOrg.setOrgId(currentUser.getOrganizationId());
BaseResponse<List<SysOrg>> baseResponse = systemClient.getOrgWithChildren(sysOrg);
List<SysOrg> sysOrgList = baseResponse.getData();
// 提取 orgId 到 List<String>
List<String> orgIdList = Optional.ofNullable(sysOrgList)
.orElse(Collections.emptyList())
.stream()
.map(SysOrg::getOrgId)
.filter(Objects::nonNull) // 过滤掉 null 值
.collect(Collectors.toList());
return orgIdList;
}
/**
* 获取当前登录人本级及上级部门id
* @return
*/
@Override
public List<String> levelAndAboveOrgIdList() {
// 获取当前用户（判空）
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
SysOrg sysOrg = systemClient.getOrgInfo(currentUser.getOrganizationId()).getData();
String orgFullId = sysOrg.getOrgFullId();
List<String> orgIdList = orgFullId == null || orgFullId.isEmpty()
? Collections.emptyList()
: Arrays.asList(orgFullId.split(","));
return orgIdList;
}
/**
* 查询当前登录人的所在单位下的所有部门id数据
* @return
*/
@Override
public List<String> orgDeptIdList(BaseCacheUser user) {
//获取当前登录人所属部门信息
BaseResponse<SysOrg> baseResponse = systemClient.getOrgInfo(user.getOrganizationId());
List<String> orgIdList = new ArrayList<>();
if(!ObjectUtils.isEmpty(baseResponse)){
//查询当前部门的所属单位下的 所有部门
SysOrg sysOrgAll = new SysOrg();
sysOrgAll.setOrgId(baseResponse.getData().getUpOrgId());
List<SysOrg> sysOrgVOList = systemClient.getOrglist(sysOrgAll).getData();
// 提取 orgId 到 List<String>
orgIdList = Optional.ofNullable(sysOrgVOList)
.orElse(Collections.emptyList())
.stream()
.map(SysOrg::getOrgId)
.filter(Objects::nonNull) // 过滤掉 null 值
.collect(Collectors.toList());
}
return orgIdList;
}
}

56
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessSupplierServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.SysOrg;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
@ -12,13 +13,15 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoAccessUs
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.ICoscoAccessSupplierService;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.CoscoSupplierBaseVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 供应商准入_关联供应商Service业务层处理
@ -53,10 +56,28 @@ public class CoscoAccessSupplierServiceImpl implements ICoscoAccessSupplierServi
public IPage<CoscoAccessSupplier> selectCoscoAccessSupplierAndWorkPageList(CoscoAccessSupplier coscoAccessSupplier) {
IPage<CoscoAccessSupplier> accessSupplierIPage = new Page<>(coscoAccessSupplier.getPageNo(), coscoAccessSupplier.getPageSize());
IPage<CoscoAccessSupplier> pageData = coscoAccessSupplierMapper.selectCoscoAccessSupplierAndWorkPageList(accessSupplierIPage,coscoAccessSupplier);
for(CoscoAccessSupplier accessSupplier : pageData.getRecords()){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(accessSupplier.getDeptId());
accessSupplier.setOrgName(orgDeptVo.getOrgName());
accessSupplier.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = pageData.getRecords().stream()
.map(CoscoAccessSupplier::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (CoscoAccessSupplier accessSupplier : pageData.getRecords()) {
String deptId = accessSupplier.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
accessSupplier.setDeptName(org.getOrgName()); // 设置部门名称
accessSupplier.setOrgName(org.getCuCompanyName());// 设置单位名称
}
}
}
return pageData;
}
@ -64,10 +85,27 @@ public class CoscoAccessSupplierServiceImpl implements ICoscoAccessSupplierServi
@Override
public List<CoscoAccessSupplier> selectCoscoAccessSupplierAndWorkExecList(CoscoAccessSupplier coscoAccessSupplier) {
List<CoscoAccessSupplier> coscoAccessSupplierList = coscoAccessSupplierMapper.selectCoscoAccessSupplierAndWorkExecList(coscoAccessSupplier);
for(CoscoAccessSupplier accessSupplier : coscoAccessSupplierList){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(accessSupplier.getDeptId());
accessSupplier.setOrgName(orgDeptVo.getOrgName());
accessSupplier.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = coscoAccessSupplierList.stream()
.map(CoscoAccessSupplier::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (CoscoAccessSupplier accessSupplier : coscoAccessSupplierList) {
String deptId = accessSupplier.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
accessSupplier.setDeptName(org.getOrgName()); // 设置部门名称
accessSupplier.setOrgName(org.getCuCompanyName());// 设置单位名称
}
}
}
return coscoAccessSupplierList;
}

38
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java
View File

@ -3,6 +3,8 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.entity.SysOrg;
import com.chinaunicom.mall.ebtp.common.base.entity.SysOrgVO;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
@ -23,10 +25,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
* 供应商准入_准入申请工作主Service业务层处理
@ -64,10 +66,28 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
IPage<CoscoAccessWork> page = new Page<>(data.getPageNo(), data.getPageSize());
data.setApplyType(CoscoType.APPLY_TYPE_PLZR);
IPage<CoscoAccessWork> pageData = coscoAccessWorkMapper.selectPageList(page, data);
for(CoscoAccessWork coscoAccessWork : pageData.getRecords()){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId());
coscoAccessWork.setOrgName(orgDeptVo.getOrgName());
coscoAccessWork.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = pageData.getRecords().stream()
.map(CoscoAccessWork::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (CoscoAccessWork coscoAccessWork : pageData.getRecords()) {
String deptId = coscoAccessWork.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
coscoAccessWork.setDeptName(org.getOrgName()); // 设置部门名称
coscoAccessWork.setOrgName(org.getCuCompanyName());// 设置单位名称
}
}
}
return pageData;
}
@ -133,8 +153,8 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg
//准入基础信息
CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id);
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId());
coscoAccessWork.setDeptName(orgDeptVo.getDeptName());
SysOrg org = orgService.getOrgInfo(coscoAccessWork.getDeptId());
coscoAccessWork.setDeptName(org.getOrgName());
vo.setCoscoAccessWork(coscoAccessWork);
//供应商信息

106
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java
View File

@ -2,8 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.entity.SysUser;
import com.chinaunicom.mall.ebtp.common.base.entity.*;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IDtService;
@ -25,9 +24,8 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
/**
* 供应商准入_准入申请工作主Service业务层处理
@ -79,10 +77,27 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
//只查询供应商准入
data.setApplyType(CoscoType.APPLY_TYPE_GYSZR);
IPage<CoscoAccessWork> pageData = coscoAccessWorkMapper.selectPageList(page, data);
for(CoscoAccessWork coscoAccessWork : pageData.getRecords()){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId());
coscoAccessWork.setOrgName(orgDeptVo.getOrgName());
coscoAccessWork.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = pageData.getRecords().stream()
.map(CoscoAccessWork::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (CoscoAccessWork coscoAccessWork : pageData.getRecords()) {
String deptId = coscoAccessWork.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
coscoAccessWork.setDeptName(org.getOrgName()); // 设置部门名称
coscoAccessWork.setOrgName(org.getCuCompanyName());// 设置单位名称
}
}
}
return pageData;
}
@ -93,10 +108,27 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
//只查询供应商准入
data.setApplyType(CoscoType.APPLY_TYPE_GYSZR);
IPage<CoscoAccessWork> pageData = coscoAccessWorkMapper.selectCoscoAccessWorkUserReviewPage(page, data);
for(CoscoAccessWork coscoAccessWork : pageData.getRecords()){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId());
coscoAccessWork.setOrgName(orgDeptVo.getOrgName());
coscoAccessWork.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = pageData.getRecords().stream()
.map(CoscoAccessWork::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (CoscoAccessWork coscoAccessWork : pageData.getRecords()) {
String deptId = coscoAccessWork.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
coscoAccessWork.setDeptName(org.getOrgName()); // 设置部门名称
coscoAccessWork.setOrgName(org.getCuCompanyName());// 设置单位名称
}
}
}
return pageData;
}
@ -107,10 +139,26 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
IPage<CoscoAccessWork> page = new Page<>(data.getPageNo(), data.getPageSize());
data.setApplyType(CoscoType.APPLY_TYPE_GYSZR);
IPage<CoscoAccessWork> pageData = coscoAccessWorkMapper.selectPageList(page, data);
for(CoscoAccessWork coscoAccessWork : pageData.getRecords()){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId());
coscoAccessWork.setOrgName(orgDeptVo.getOrgName());
coscoAccessWork.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = pageData.getRecords().stream()
.map(CoscoAccessWork::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (CoscoAccessWork coscoAccessWork : pageData.getRecords()) {
String deptId = coscoAccessWork.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
coscoAccessWork.setDeptName(org.getOrgName()); // 设置部门名称
coscoAccessWork.setOrgName(org.getCuCompanyName());// 设置单位名称
}
}
}
return pageData;
}
@ -127,7 +175,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
//准入基础信息
CoscoAccessWork coscoAccessWork = coscoAccessWorkMapper.selectCoscoAccessWorkById(id);
OrgDeptVo dept = orgService.getOrgDeptInfo(coscoAccessWork.getDeptId());
SysOrg dept = orgService.getOrgInfo(coscoAccessWork.getDeptId());
coscoAccessWork.setDeptName(dept.getOrgName());//准入部门
vo.setCoscoAccessWork(coscoAccessWork);
@ -146,9 +194,26 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
CoscoAccessUser coscoAccessUser = new CoscoAccessUser();
coscoAccessUser.setAccessWorkId(id);
List<CoscoAccessUser> coscoAccessUserList = coscoAccessUserMapper.selectCoscoAccessUserList(coscoAccessUser);
//提取所有人员 deptId，并用逗号拼接成字符串
String deptIds = coscoAccessUserList.stream()
.map(CoscoAccessUser::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
for(CoscoAccessUser accessUser : coscoAccessUserList){
OrgDeptVo userDept = orgService.getOrgDeptInfo(accessUser.getDeptId());
accessUser.setDeptName(userDept.getOrgName());
String deptId = accessUser.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
accessUser.setDeptName(org.getOrgName());
}
SysUser sysUser = userService.getUserInfo(accessUser.getUserId());
accessUser.setUserName(sysUser.getName());
}
@ -531,7 +596,6 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService {
/**
* 修改评审项关联评审人员表，并新增修改或者删除附件
* @param v
*/
private void addCoscoAccessUserItemAndUp(CoscoAccessUserItemVo vo) {
//如果附件有值可能是新增，也可能是修改

134
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierBaseServiceImpl.java
View File

@ -21,7 +21,6 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrary
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.SupplierPageVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@ -30,9 +29,11 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
/**
* 中远海运_供应商_基本信息Service业务层处理
@ -150,10 +151,26 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
public IPage<CoscoSupplierBase> getPageAgent(CoscoSupplierBase coscoSupplierBase) {
IPage<CoscoSupplierBase> page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize());
IPage<CoscoSupplierBase> pageData = coscoSupplierBaseMapper.selectPageList(page, coscoSupplierBase);
for(CoscoSupplierBase supplierBase : pageData.getRecords()){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(supplierBase.getDeptId());
supplierBase.setOrgName(orgDeptVo.getOrgName());
supplierBase.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = pageData.getRecords().stream()
.map(CoscoSupplierBase::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (CoscoSupplierBase supplierBase : pageData.getRecords()) {
String deptId = supplierBase.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
supplierBase.setDeptName(org.getOrgName()); // 设置部门名称
supplierBase.setOrgName(org.getCuCompanyName());// 设置单位名称
}
}
}
return pageData;
}
@ -167,14 +184,31 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
public IPage<CoscoSupplierBase> getHgSupplierBasePage(CoscoSupplierBase coscoSupplierBase) {
IPage<CoscoSupplierBase> page = new Page<>(coscoSupplierBase.getPageNo(), coscoSupplierBase.getPageSize());
IPage<CoscoSupplierBase> pageData = coscoSupplierBaseMapper.getHeSupplierBasePage(page, coscoSupplierBase);
for(CoscoSupplierBase supplierBase : pageData.getRecords()){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(supplierBase.getDeptId());
supplierBase.setOrgName(orgDeptVo.getOrgName());
supplierBase.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = pageData.getRecords().stream()
.map(CoscoSupplierBase::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (CoscoSupplierBase supplierBase : pageData.getRecords()) {
String deptId = supplierBase.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
supplierBase.setDeptName(org.getOrgName()); // 设置部门名称
supplierBase.setOrgName(org.getCuCompanyName());// 设置单位名称
}
if(!ObjectUtils.isEmpty(supplierBase.getCreateBy())){
supplierBase.setCreateName(userService.getUserInfo(supplierBase.getCreateBy()).getName());
}
}
}
return pageData;
}
@ -195,10 +229,28 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
public IPage<CoscoAccessSupplierCategory> getZrCategoryPage(CoscoAccessSupplierCategory vo) {
IPage<CoscoAccessSupplierCategory> page = new Page<>(vo.getPageNo(), vo.getPageSize());
IPage<CoscoAccessSupplierCategory> pageData = coscoAccessSupplierCategoryMapper.selectPageList(page, vo);
for(CoscoAccessSupplierCategory category : pageData.getRecords()){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(category.getDeptId());
category.setOrgName(orgDeptVo.getOrgName());
category.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = pageData.getRecords().stream()
.map(CoscoAccessSupplierCategory::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (CoscoAccessSupplierCategory category : pageData.getRecords()) {
String deptId = category.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
category.setDeptName(org.getOrgName()); // 设置部门名称
category.setOrgName(org.getCuCompanyName());// 设置单位名称
}
}
}
return pageData;
}
@ -216,15 +268,35 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
@Override
public List<CoscoSupplierBase> getHeSupplierBaseExecList(CoscoSupplierBase coscoSupplierBase) {
List<CoscoSupplierBase> list = coscoSupplierBaseMapper.getHeSupplierBaseExecList(coscoSupplierBase);
for(CoscoSupplierBase supplierBase : list){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(supplierBase.getDeptId());
supplierBase.setOrgName(orgDeptVo.getOrgName());
supplierBase.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = list.stream()
.map(CoscoSupplierBase::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (CoscoSupplierBase supplierBase : list) {
String deptId = supplierBase.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
supplierBase.setDeptName(org.getOrgName()); // 设置部门名称
supplierBase.setOrgName(org.getCuCompanyName());// 设置单位名称
}
if(!CoscoType.SUPPLIER_TYPE_PE.equals(supplierBase.getSupplierType())){
supplierBase.setEnterpriseTypeCn(dictService.getDictName(supplierBase.getEnterpriseType(),CoscoType.ENTERPRISE_TYPE));
}
if(!ObjectUtils.isEmpty(supplierBase.getCreateBy())){
supplierBase.setCreateName(userService.getUserInfo(supplierBase.getCreateBy()).getName());
}
}
}
return list;
}
@ -527,13 +599,29 @@ public class CoscoSupplierBaseServiceImpl extends BaseServiceImpl<CoscoSupplierB
}
IPage<CoscoSupplierBase> page = new Page<>(supplierPageVo.getBasePageRequest().getPageNo(), supplierPageVo.getBasePageRequest().getPageSize());
IPage<SupplierPageVo> supplierPage = coscoSupplierBaseMapper.getSupplierPage(page, supplierPageVo);
supplierPage.getRecords().forEach(vo -> {
if(vo.getDeptId()!=null){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(vo.getDeptId());
vo.setOrgName(orgDeptVo.getOrgName());
vo.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = supplierPage.getRecords().stream()
.map(SupplierPageVo::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (SupplierPageVo vo : supplierPage.getRecords()) {
String deptId = vo.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
vo.setDeptName(org.getOrgName()); // 设置部门名称
vo.setOrgName(org.getCuCompanyName());// 设置单位名称
}
});
}
}
return supplierPage;
}

78
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.entity.SysOrg;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.mall.ebtp.common.util.PropertyUtils;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.CoscoType;
@ -19,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.*;
import java.util.stream.Collectors;
@ -57,10 +59,27 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
public IPage<CoscoSupplierexit> getPage(CoscoSupplierexit data) {
IPage<CoscoSupplierexit> page = new Page<>(data.getPageNo(), data.getPageSize());
IPage<CoscoSupplierexit> pageData = coscoSupplierexitMapper.selectPageList(page, data);
for(CoscoSupplierexit coscoSupplierexit : pageData.getRecords()){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoSupplierexit.getDeptId());
coscoSupplierexit.setOrgName(orgDeptVo.getOrgName());
coscoSupplierexit.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = pageData.getRecords().stream()
.map(CoscoSupplierexit::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (CoscoSupplierexit coscoSupplierexit : pageData.getRecords()) {
String deptId = coscoSupplierexit.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
coscoSupplierexit.setDeptName(org.getOrgName()); // 设置部门名称
coscoSupplierexit.setOrgName(org.getCuCompanyName());// 设置单位名称
}
}
}
return pageData;
}
@ -75,9 +94,26 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
// 创建分页对象（当前页，每页大小）
IPage<CoscoAccessSupplierCategory> page = new Page<>(data.getPageNo(), data.getPageSize());
IPage<CoscoAccessSupplierCategory> pageData = coscoAccessSupplierCategoryMapper.selectExitCategoryList(page, data);
for(CoscoAccessSupplierCategory category : pageData.getRecords()){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(category.getDeptId());
category.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = pageData.getRecords().stream()
.map(CoscoAccessSupplierCategory::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (CoscoAccessSupplierCategory category : pageData.getRecords()) {
String deptId = category.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
category.setDeptName(org.getOrgName()); // 设置部门名称
}
}
}
return pageData;
}
@ -87,10 +123,26 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
// 创建分页对象（当前页，每页大小）
IPage<CoscoSupplierexitSupplierCategory> page = new Page<>(data.getPageNo(), data.getPageSize());
IPage<CoscoSupplierexitSupplierCategory> pageData = coscoSupplierexitSupplierCategoryMapper.selectPageList(page, data);
for(CoscoSupplierexitSupplierCategory category : pageData.getRecords()){
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(category.getDeptId());
category.setOrgName(orgDeptVo.getOrgName());
category.setDeptName(orgDeptVo.getDeptName());
//提取所有 deptId，并用逗号拼接成字符串
String deptIds = pageData.getRecords().stream()
.map(CoscoSupplierexitSupplierCategory::getDeptId)
.filter(Objects::nonNull)
.map(Object::toString)
.collect(Collectors.joining(","));
if(!StringUtils.isEmpty(deptIds)){
//构建 deptId -> SysOrg 的映射，方便后续查找
Map<String, SysOrg> orgMap = orgService.getOrgDeptInfo(deptIds);
//遍历 pageData.getRecords()，设置部门名称和所属单位名称
for (CoscoSupplierexitSupplierCategory category : pageData.getRecords()) {
String deptId = category.getDeptId();
if (deptId != null && orgMap.containsKey(deptId)) {
SysOrg org = orgMap.get(deptId);
category.setDeptName(org.getOrgName()); // 设置部门名称
category.setOrgName(org.getCuCompanyName());// 设置单位名称
}
}
}
return pageData;
}
@ -105,8 +157,8 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService {
public CoscoSupplierexitVo selectCoscoSupplierexitById(String id) {
CoscoSupplierexitVo vo = new CoscoSupplierexitVo();
CoscoSupplierexit coscoSupplierexit = coscoSupplierexitMapper.selectCoscoSupplierexitById(id);
OrgDeptVo orgDeptVo = orgService.getOrgDeptInfo(coscoSupplierexit.getDeptId());
coscoSupplierexit.setDeptName(orgDeptVo.getDeptName());
SysOrg org = orgService.getOrgInfo(coscoSupplierexit.getDeptId());
coscoSupplierexit.setDeptName(org.getOrgName());
CoscoSupplierexitSupplierCategory category = new CoscoSupplierexitSupplierCategory();
category.setSupplierexitId(id);