修改部门

This commit is contained in:
YY
2025-07-16 11:53:41 +08:00
parent 981df09afa
commit fadc497256
16 changed files with 106 additions and 26 deletions

View File

@ -6,6 +6,7 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
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.AnnualreviewTaskConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
@ -18,6 +19,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.SupplierPeopleVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskUserVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -47,6 +49,8 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
private CoscoSupplierBaseMapper coscoSupplierBaseMapper;
@Autowired
private IUserService userService;
@Autowired
private IOrgService orgService;
/**
* 查询供应商年审_年审任务主
@ -270,7 +274,8 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS
//获取查询任务部门信息
List<String> deptIds = new ArrayList<>();
coscoAnnualreviewTaskListVoIPage.getRecords().forEach(ss -> {
deptIds.add(ss.getDeptId());
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(ss.getDeptId());
ss.setDeptName(orgDeptInfo.getOrgName());
});
//根据部门id查询发起单位
return coscoAnnualreviewTaskListVoIPage;

View File

@ -4,8 +4,11 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import cn.hutool.core.util.ObjectUtil;
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.service.IOrgService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTaskSupplierService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualreviewTaskSupplierListVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTemplateVo;
@ -24,6 +27,8 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualre
public class CoscoAnnualreviewTaskSupplierServiceImpl implements ICoscoAnnualreviewTaskSupplierService {
@Autowired
private CoscoAnnualreviewTaskSupplierMapper coscoAnnualreviewTaskSupplierMapper;
@Autowired
private IOrgService orgService;
/**
* 查询供应商评价_年审任务关联供应商
@ -105,11 +110,12 @@ public class CoscoAnnualreviewTaskSupplierServiceImpl implements ICoscoAnnualrev
IPage<AnnualreviewTaskSupplierListVo> annualreviewTaskSupplierListVoIPage =
coscoAnnualreviewTaskSupplierMapper.selectMyPage(p, supplierListVo);
//获取查询部门信息 TODO 待完善
List<String> deptIds=new ArrayList<>();
annualreviewTaskSupplierListVoIPage.getRecords().forEach(vo -> {
deptIds.add(vo.getDeptId());
SysOrg orgInfo = orgService.getOrgInfo(vo.getDeptId());
if(!ObjectUtil.isEmpty(orgInfo)){
vo.setDeptName(orgInfo.getOrgName());
}
});
//TODO 待完善 审查单位查询
return annualreviewTaskSupplierListVoIPage;
}
}

View File

@ -5,6 +5,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.AnnualreviewTaskConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewScoringMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.CoscoAnnualreviewTaskSupplierUserMapper;
@ -18,13 +22,12 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualreviewTaskS
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AnnualreviewTaskSupplierUserVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
* 供应商评价_年审任务供应商对应评审人Service业务层处理
@ -39,9 +42,13 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
@Autowired
private CoscoSupplierBaseMapper coscoSupplierBaseMapper;
@Autowired
private IUserService userService;
@Autowired
private CoscoAnnualreviewTaskMapper coscoAnnualreviewTaskMapper;
@Autowired
private CoscoAnnualreviewScoringMapper coscoAnnualreviewScoringMapper;
@Autowired
private IOrgService orgService;
/**
* 查询供应商评价_年审任务供应商对应评审人
@ -150,13 +157,20 @@ public class CoscoAnnualreviewTaskSupplierUserServiceImpl implements ICoscoAnnua
IPage<AnnualreviewTaskSupplierUserVo> p = new Page<>(userVo.getBasePageRequest().getPageNo(),
userVo.getBasePageRequest().getPageSize());
IPage<AnnualreviewTaskSupplierUserVo> annualreviewTaskSupplierUserVoIPage = coscoAnnualreviewTaskSupplierUserMapper.selectPage(p, userVo);
//TODO 待完善,部门名称
List<String> deptIds = new ArrayList<>();
annualreviewTaskSupplierUserVoIPage.getRecords().forEach(vo -> {
deptIds.add(vo.getDeptId());
List<UserVo> user = userService.getUser(new SelectUserVo());
Map<String,UserVo> userMap = new HashMap<>();
user.forEach(uso -> {
userMap.put(uso.getUserId(), uso);
});
annualreviewTaskSupplierUserVoIPage.getRecords().forEach(vo -> {
UserVo userVo1 = userMap.get(vo.getUserId());
if(userVo1!=null){
vo.setUserName(userVo1.getUserName());
vo.setDeptName(userVo1.getUserDept());
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(userVo1.getUserDeptId());
vo.setTenantName(orgDeptInfo.getOrgName());
}
});
//TODO 发起单位查询
//TODO 添加发起单位
return annualreviewTaskSupplierUserVoIPage;
}

View File

@ -25,6 +25,10 @@ public class AnnualreviewTaskSupplierUserVo implements Serializable {
* 部门名称
*/
private String deptName;
/**
* 单位名称
*/
private String tenantName;
/**
* 年审开始时间
*/

View File

@ -7,6 +7,8 @@ import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
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.CoscoCategoryConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarAttachmentsMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibraryMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper;
@ -16,6 +18,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLi
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibrarySupplierApplyService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -44,6 +47,10 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
private CoscoCategoryLibrarAttachmentsMapper coscoCategoryLibrarAttachmentsMapper;
@Autowired
private CoscoCategoryMapper coscoCategoryMapper;
@Autowired
private IUserService userService;
@Autowired
private IOrgService orgService;
/**
* 查询品类库_品类库
@ -144,7 +151,12 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
public IPage<CoscoCategoryLibraryVo> getPageList(CoscoCategoryLibraryVo coscoCategoryLibrary) {
IPage<CoscoCategoryLibraryVo> p = new Page<>(coscoCategoryLibrary.getBasePageRequest().getPageNo(),
coscoCategoryLibrary.getBasePageRequest().getPageSize());
return coscoCategoryLibraryMapper.selectLibraryPage(p, coscoCategoryLibrary);
IPage<CoscoCategoryLibraryVo> coscoCategoryLibraryVoIPage = coscoCategoryLibraryMapper.selectLibraryPage(p, coscoCategoryLibrary);
coscoCategoryLibraryVoIPage.getRecords().forEach(coscoCategoryLibraryVo -> {
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(coscoCategoryLibraryVo.getDeptId());
coscoCategoryLibraryVo.setDeptName(orgDeptInfo.getOrgName());
});
return coscoCategoryLibraryVoIPage;
}

View File

@ -6,6 +6,8 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
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;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibrarySupplierApplyMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibrarySupplierApply;
@ -15,6 +17,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLi
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.AddCoscoCategoryLibrarySupplierApplyVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CoscoCategoryLibrarySupplierVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.ListCoscoCategoryLibrarySupplierApplyVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -38,6 +41,10 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp
private ICoscoCategoryLibraryContainService coscoCategoryLibraryContainService;
@Autowired
private CoscoCategoryMapper coscoCategoryMapper;
@Autowired
private IOrgService orgService;
@Autowired
private IUserService userService;
/**
* 查询品类库_品类库入库供应商申请单
@ -160,8 +167,12 @@ public class CoscoCategoryLibrarySupplierApplyServiceImpl extends BaseServiceImp
public IPage<ListCoscoCategoryLibrarySupplierApplyVo> getPageList(ListCoscoCategoryLibrarySupplierApplyVo coscoCategory) {
IPage<ListCoscoCategoryLibrarySupplierApplyVo> p = new Page<>(coscoCategory.getBasePageRequest().getPageNo(),
coscoCategory.getBasePageRequest().getPageSize());
return coscoCategoryLibrarySupplierApplyMapper.selectPageList(p, coscoCategory);
IPage<ListCoscoCategoryLibrarySupplierApplyVo> listCoscoCategoryLibrarySupplierApplyVoIPage = coscoCategoryLibrarySupplierApplyMapper.selectPageList(p, coscoCategory);
listCoscoCategoryLibrarySupplierApplyVoIPage.getRecords().forEach(vo -> {
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(vo.getDeptId());
vo.setDeptName(orgDeptInfo.getOrgName());
});
return listCoscoCategoryLibrarySupplierApplyVoIPage;
}
/**

View File

@ -25,6 +25,10 @@ public class CoscoCategoryLibraryVo implements Serializable {
* 区域
*/
private String area;
/**
* 部门id
*/
private String deptId;
/**
* 创建单位
*/

View File

@ -21,6 +21,10 @@ public class ListCoscoCategoryLibrarySupplierApplyVo implements Serializable {
* 部门名称
*/
private String deptName="部门";
/**
* 部门id
*/
private String deptId;
/**
* 品类名称
*/

View File

@ -7,6 +7,7 @@ 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.CoscoCategoryConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
@ -20,6 +21,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTa
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorNdService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -41,6 +43,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
@Autowired
private IUserService userService;
@Autowired
private IOrgService orgService;
@Autowired
private ICoscoEvaluateTemplateIndicatorNdService coscoEvaluateTemplateIndicatorNdService;
@Autowired
private CoscoEvaluateTaskSupplierMapper coscoEvaluateTaskSupplierMapper;
@ -271,6 +275,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
Map<String, String> map = vos.stream().collect(Collectors.toMap(DivisionVo::getTaskId, DivisionVo::getDivision));
//根据分工参数赋值
coscoEvaluateTaskListVoIPage.getRecords().forEach(task -> {
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(task.getDeptId());
task.setTenantName(orgDeptInfo.getOrgName());
if(task.getDeptId()!=null){
task.setIsEditor(task.getDeptId().equals(taskListVo.getDeptId()) ? "1" : "0"); //1表示可修改 0不可修改
}
@ -293,7 +299,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
IPage<TaskPageVo> taskPageVoIPage = coscoEvaluateTaskMapper.selectTaskPage(p, taskListVo);
List<String> deptIds = new ArrayList<>();
taskPageVoIPage.getRecords().forEach(taskPageVo -> {
deptIds.add(taskPageVo.getDeptId());
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(taskPageVo.getDeptId());
taskPageVo.setDeptName(orgDeptInfo.getDeptName());
});
// TODO 根据部门id查询发起单位
// TODO 给与部门信息赋值

View File

@ -2,6 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo;
import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
@ -14,6 +15,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskIndicatorVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.TaskSubIndicatorVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.BaseCategoryNameVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -33,6 +35,8 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
@Autowired
private CoscoEvaluateTaskMapper coscoEvaluateTaskMapper;
@Autowired
private IOrgService orgService;
@Autowired
private CoscoSupplierBaseMapper coscoSupplierBaseMapper;
@Autowired
private CoscoEvaluateTemplateIndicatorStMapper coscoEvaluateTemplateIndicatorStMapper;
@ -133,8 +137,9 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
UserVo userVo = map.get(item.getUserId());
if(userVo!=null){
item.setUserName(userVo.getUserName());
item.setDeptName(userVo.getUserDept());
}
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(item.getDeptId());
item.setDeptName(orgDeptInfo.getOrgName());
});
//根据部门id查询评价单位
return supplierDimensionVoIPage;

View File

@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser;
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;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTemplateMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTemplate;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorStService;
@ -33,6 +35,10 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
private CoscoEvaluateTemplateMapper coscoEvaluateTemplateMapper;
@Autowired
private ICoscoEvaluateTemplateIndicatorStService coscoEvaluateTemplateIndicatorStService;
@Autowired
private IUserService userService;
@Autowired
private IOrgService orgService;
/**
* 查询【供应商评价_评价表模板主表】
@ -139,12 +145,9 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
template.getBasePageRequest().getPageSize());
IPage<CoscoEvaluateTemplateVo> coscoEvaluateTemplateVoIPage = coscoEvaluateTemplateMapper.selectMyPage(p, template);
//TODO 人员添加
List<String> creaters = new ArrayList<>();
coscoEvaluateTemplateVoIPage.getRecords().forEach(vo -> {
creaters.add(vo.getCreateBy());
});
//根据creaters获取创建部门创建单位
});
return coscoEvaluateTemplateVoIPage;
}