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

修改人员信息

Browse Source
This commit is contained in:
YY
2025-07-24 08:25:38 +08:00
parent 40e8ae9d0b
commit 779d922515
22 changed files with 157 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTemplateServiceImpl.java
View File

@ -15,6 +15,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualre
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTemplateIndicatorService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTemplateService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AddCoscoAnnualreviewTemplateVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTemplateVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.vo.OrgDeptVo;
import org.springframework.beans.BeanUtils;
@ -41,6 +42,8 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
private IUserService userService;
@Autowired
private IOrgService orgService;
@Autowired
private ICoscoCategoryService coscoCategoryService;
/**
* 查询供应商年审_年审模板主
@ -55,6 +58,7 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
BeanUtils.copyProperties(coscoAnnualreviewTemplate, coscoAnnualreviewTemplateVo);
CoscoAnnualreviewTemplateIndicator coscoAnnualreviewTemplateIndicator = new CoscoAnnualreviewTemplateIndicator();
coscoAnnualreviewTemplateIndicator.setTemplateId(id);
coscoCategoryService.getCategoryNameById(coscoAnnualreviewTemplate.getCategoryId());
coscoAnnualreviewTemplateVo.setIndicatorList(coscoAnnualreviewTemplateIndicatorService.selectCoscoAnnualreviewTemplateIndicatorList(coscoAnnualreviewTemplateIndicator));
return coscoAnnualreviewTemplateVo;
}
@ -67,7 +71,12 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
*/
@Override
public List<CoscoAnnualreviewTemplate> selectCoscoAnnualreviewTemplateList(CoscoAnnualreviewTemplate coscoAnnualreviewTemplate) {
return coscoAnnualreviewTemplateMapper.selectCoscoAnnualreviewTemplateList(coscoAnnualreviewTemplate);
List<CoscoAnnualreviewTemplate> coscoAnnualreviewTemplates = coscoAnnualreviewTemplateMapper.selectCoscoAnnualreviewTemplateList(coscoAnnualreviewTemplate);
coscoAnnualreviewTemplates.forEach(vo -> {
coscoCategoryService.getCategoryNameById(vo.getCategoryId());
});
return coscoAnnualreviewTemplates;
}
/**
@ -148,6 +157,7 @@ public class CoscoAnnualreviewTemplateServiceImpl implements ICoscoAnnualreviewT
vo.setDeptName(orgDeptInfo.getDeptName());
vo.setTenantName(orgDeptInfo.getOrgName());
}
vo.setCategoryName(coscoCategoryService.getCategoryNameById(vo.getCategoryId()));
});
//根据creaters获取创建部门创建单位
//封装创建部门

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/controller/CoscoCategoryController.java
View File

@ -3,6 +3,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.mall.ebtp.common.base.controller.BaseController;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.entity.CoscoCategoryMaintenance;
import com.chinaunicom.mall.ebtp.common.base.entity.CoscoCategoryMaintenanceVO;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ErrorMessageConstant;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory;
@ -63,7 +64,7 @@ public class CoscoCategoryController extends BaseController {
* 获取品类库_品类详细信息
*/
@GetMapping(value = "/{id}")
public BaseResponse<CoscoCategory> getInfo(@PathVariable("id") String id) {
public BaseResponse<CoscoCategoryMaintenance> getInfo(@PathVariable("id") String id) {
return BaseResponse.success(coscoCategoryService.selectCoscoCategoryById(id));
}

3
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/ICoscoCategoryService.java
View File

@ -2,6 +2,7 @@ package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.common.base.entity.CoscoCategoryMaintenance;
import com.chinaunicom.mall.ebtp.common.base.entity.CoscoCategoryMaintenanceVO;
import com.chinaunicom.mall.ebtp.common.base.service.IBaseService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategory;
@ -23,7 +24,7 @@ public interface ICoscoCategoryService extends IBaseService<CoscoCategory> {
* @param id 品类库_品类主键
* @return 品类库_品类
*/
public CoscoCategory selectCoscoCategoryById(String id);
public CoscoCategoryMaintenance selectCoscoCategoryById(String id);
/**
* 查询品类库_品类列表

12
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryContainServiceImpl.java
View File

@ -1,10 +1,12 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.impl;
import com.chinaunicom.mall.ebtp.common.base.entity.CoscoCategoryMaintenance;
import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl;
import com.chinaunicom.mall.ebtp.common.base.util.TokenUtil;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.dao.CoscoCategoryLibraryContainMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.entity.CoscoCategoryLibraryContain;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryLibraryContainService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.AddCategoryIdVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CategoryContainListVo;
import org.springframework.beans.factory.annotation.Autowired;
@ -24,6 +26,8 @@ import java.util.List;
public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl<CoscoCategoryLibraryContainMapper, CoscoCategoryLibraryContain> implements ICoscoCategoryLibraryContainService {
@Autowired
private CoscoCategoryLibraryContainMapper coscoCategoryLibraryContainMapper;
@Autowired
private ICoscoCategoryService coscoCategoryService;
/**
* 查询品类库_品类库包含品类
@ -144,6 +148,14 @@ public class CoscoCategoryLibraryContainServiceImpl extends BaseServiceImpl<Cosc
@Override
public List<CategoryContainListVo> treeList(CoscoCategoryLibraryContain coscoCategoryLibraryContain) {
List<CategoryContainListVo> list =coscoCategoryLibraryContainMapper.selectTreeListByLibraryId(coscoCategoryLibraryContain.getCategoryLibraryId());
list.forEach(c ->{
CoscoCategoryMaintenance coscoCategoryMaintenance =
coscoCategoryService.selectCoscoCategoryById(c.getCategoryId());
c.setCategoryName(coscoCategoryMaintenance.getCategoryName());
if(coscoCategoryMaintenance.getParentId()!=null){
c.setParentId(coscoCategoryMaintenance.getParentId().toString());
}
});
// 从根节点 parentId == "0" 开始递归构建树
return buildTree("0", list);
}

12
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryLibraryServiceImpl.java
View File

@ -177,6 +177,18 @@ public class CoscoCategoryLibraryServiceImpl extends BaseServiceImpl<CoscoCatego
if(userById!=null){
coscoCategoryLibraryVo.setCreateName(userById.getName());
}
String categoryIds = coscoCategoryLibraryVo.getCategoryIds();
if (categoryIds != null && categoryIds.length() > 0) {
String[] split = categoryIds.split(",");
StringBuilder builder = new StringBuilder();
for (String s : split) {
String categoryNameById = coscoCategoryService.getCategoryNameById(s);
builder.append(categoryNameById);
}
coscoCategoryLibraryVo.setCategoryNames(builder.toString());
}
});
}

43
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/service/impl/CoscoCategoryServiceImpl.java
View File

@ -45,8 +45,12 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
* @return 品类库_品类
*/
@Override
public CoscoCategory selectCoscoCategoryById(String id) {
return coscoCategoryMapper.selectCoscoCategoryById(id);
public CoscoCategoryMaintenance selectCoscoCategoryById(String id) {
BaseResponse<CoscoCategoryMaintenance> info = categoryClient.getInfo(id);
if(info==null){
return new CoscoCategoryMaintenance();
}
return info.getData();
}
/**
@ -146,22 +150,22 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
/**
* 获取全部上级部门id
*/
// List<String> deptIds = new ArrayList<>();
// BaseCacheUser currentUser = TokenUtil.getCurrentUser();
// BaseResponse<SysOrg> orgInfo = systemClient.getOrgInfo(currentUser.getOrganizationId());
// if (orgInfo.isSuccess()) {
// SysOrg data = orgInfo.getData();
// String orgFullId = data.getOrgFullId();
// String[] split = orgFullId.split(",");
// List<String> split1 = new ArrayList<>();
// for (String s : split) {
// if (!currentUser.getOrganizationId().equals(s)) {
// split1.add(s);
// }
// }
// deptIds.addAll(split1);
// }
// coscoCategory.setDeptIds(deptIds);
List<String> deptIds = new ArrayList<>();
BaseCacheUser currentUser = TokenUtil.getCurrentUser();
BaseResponse<SysOrg> orgInfo = systemClient.getOrgInfo(currentUser.getOrganizationId());
if (orgInfo.isSuccess()) {
SysOrg data = orgInfo.getData();
String orgFullId = data.getOrgFullId();
String[] split = orgFullId.split(",");
List<String> split1 = new ArrayList<>();
for (String s : split) {
if (!currentUser.getOrganizationId().equals(s)) {
split1.add(s);
}
}
deptIds.addAll(split1);
}
//coscoCategory.setDeptIds(deptIds);
return selectCategoryTree(coscoCategory);
}
@ -174,13 +178,14 @@ public class CoscoCategoryServiceImpl extends BaseServiceImpl<CoscoCategoryMappe
@Override
public String getCategoryNameById(String id) {
BaseResponse<CoscoCategoryMaintenance> info = categoryClient.getInfo(id);
if (info.isSuccess()) {
if (info!=null && info.isSuccess()) {
CoscoCategoryMaintenance data = info.getData();
return data.getCategoryName();
}
return coscoCategoryMapper.selectCategoryNameById(id);
}
private List<CoscoCategoryVO> buildTree(List<CoscoCategoryVO> categories) {
// 获取所有顶级节点 (parentId = "0")
List<CoscoCategoryVO> rootNodes = categories.stream()

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/CoscoCategoryLibraryVo.java
View File

@ -89,4 +89,8 @@ public class CoscoCategoryLibraryVo implements Serializable {
private String applyDeptId;
private String orgId;
/**
* 品类库名称
*/
private String categoryIds;
}

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/entity/CoscoEvaluateTaskSupplier.java
View File

@ -94,6 +94,8 @@ public class CoscoEvaluateTaskSupplier extends BaseEntity {
@ExcelIgnore
private String deptName = "准入部门";
private String categoryId;
@ApiModelProperty(value = "分页对象信息")
@ExcelIgnore
private BasePageRequest basePageRequest;

7
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java
View File

@ -14,6 +14,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.MessageType;
import com.chinaunicom.zyhy.ebtp.supplier.common.aop.MessageLog;
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackSupplierVo;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskAssignDeptService;
@ -64,6 +65,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
private CoscoEvaluateTaskDeptWeightMapper coscoEvaluateTaskDeptWeightMapper;
@Autowired
private ICoscoEvaluateTaskAssignDeptService coscoEvaluateTaskAssignDeptService;
@Autowired
private ICoscoCategoryService coscoCategoryService;
/**
* 查询【供应商评价_评价任务主表】
@ -80,6 +83,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
coscoEvaluateTaskDeptWeight.setEvaluateTaskId(id);
addCoscoEvaluateTaskVo.setTaskDeptWeightList(coscoEvaluateTaskDeptWeightMapper.selectCoscoEvaluateTaskDeptWeightList(coscoEvaluateTaskDeptWeight));
addCoscoEvaluateTaskVo.setId(coscoEvaluateTask.getId());
addCoscoEvaluateTaskVo.setCategoryName(coscoCategoryService.getCategoryNameById(coscoEvaluateTask.getCategoryId()));
addCoscoEvaluateTaskVo.setEvaluateTheme(coscoEvaluateTask.getEvaluateTheme());
addCoscoEvaluateTaskVo.setDeptId(coscoEvaluateTask.getDeptId());
addCoscoEvaluateTaskVo.setEvaluateYear(coscoEvaluateTask.getEvaluateYear());
@ -297,10 +301,10 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
taskListVo.getBasePageRequest().getPageSize());
//获取分页数据
IPage<TaskPageVo> taskPageVoIPage = coscoEvaluateTaskMapper.selectTaskPage(p, taskListVo);
List<String> deptIds = new ArrayList<>();
taskPageVoIPage.getRecords().forEach(taskPageVo -> {
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(taskPageVo.getDeptId());
taskPageVo.setDeptName(orgDeptInfo.getDeptName());
taskPageVo.setCategoryName(coscoCategoryService.getCategoryNameById(taskPageVo.getCategoryId()));
});
// TODO 根据部门id查询发起单位
// TODO 给与部门信息赋值
@ -335,6 +339,7 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService {
//根据工作流id查询任务信息
CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectByWorkFlowId(vo.getWorkFlowId());
coscoEvaluateTask.setApproveStatus(vo.getApproveStatus());
coscoEvaluateTask.setCategoryName(coscoCategoryService.getCategoryNameById(coscoEvaluateTask.getCategoryId()));
//修改任务信息
coscoEvaluateTaskMapper.updateCoscoEvaluateTask(coscoEvaluateTask);
//消息信息赋值

12
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierServiceImpl.java
View File

@ -6,6 +6,7 @@ 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.coscoCategory.service.ICoscoCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskSupplierService;
@ -46,6 +47,8 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
private CoscoEvaluateTemplateIndicatorNdMapper coscoEvaluateTemplateIndicatorNdMapper;
@Autowired
private IUserService userService;
@Autowired
private ICoscoCategoryService coscoCategoryService;
/**
* 查询【供应商评价_评价任务关联供应商表】
@ -140,6 +143,7 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
}
OrgDeptVo orgDeptInfo = orgService.getOrgDeptInfo(item.getDeptId());
item.setDeptName(orgDeptInfo.getOrgName());
item.setCategoryName(coscoCategoryService.getCategoryNameById(item.getCategoryId()));
});
//根据部门id查询评价单位
return supplierDimensionVoIPage;
@ -153,6 +157,7 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
List<String> deptIds = new ArrayList<>();
page.getRecords().forEach(item -> {
deptIds.add(item.getDeptId());
item.setCategoryName(coscoCategoryService.getCategoryNameById(item.getCategoryId()));
});
//根据部门id查询发起单位
return page;
@ -165,7 +170,11 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
*/
@Override
public List<CoscoEvaluateTaskSupplier> export(CoscoEvaluateTaskSupplier taskListVo){
return coscoEvaluateTaskSupplierMapper.exportList(taskListVo);
List<CoscoEvaluateTaskSupplier> coscoEvaluateTaskSuppliers = coscoEvaluateTaskSupplierMapper.exportList(taskListVo);
coscoEvaluateTaskSuppliers.forEach(item -> {
item.setCategoryName(coscoCategoryService.getCategoryNameById(item.getCategoryId()));
});
return coscoEvaluateTaskSuppliers;
}
@ -176,6 +185,7 @@ public class CoscoEvaluateTaskSupplierServiceImpl implements ICoscoEvaluateTaskS
CoscoEvaluateTaskSupplier coscoEvaluateTaskSupplier = coscoEvaluateTaskSupplierMapper.selectCoscoEvaluateTaskSupplierById(id);
//获取评价任务信息
CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectCoscoEvaluateTaskById(coscoEvaluateTaskSupplier.getEvaluateTaskId());
coscoEvaluateTask.setCategoryName(coscoCategoryService.getCategoryNameById(coscoEvaluateTask.getCategoryId()));
//获取供应商名称和品类名称
BaseCategoryNameVo baseCategoryNameVo = coscoSupplierBaseMapper.selectNameAndCategoryName(coscoEvaluateTaskSupplier.getSupplierId());
//封装返回值信息

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskSupplierUserServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.impl;
import com.chinaunicom.zyhy.ebtp.supplier.base.constant.SupplierUserConstant;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateScoringMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTaskMapper;
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.dao.CoscoEvaluateTaskSupplierUserMapper;
@ -40,6 +41,8 @@ public class CoscoEvaluateTaskSupplierUserServiceImpl implements ICoscoEvaluateT
private CoscoEvaluateTemplateIndicatorStMapper coscoEvaluateTemplateIndicatorStMapper;
@Autowired
private CoscoEvaluateTaskMapper coscoEvaluateTaskMapper;
@Autowired
private ICoscoCategoryService coscoCategoryService;
/**
* 查询【供应商评价_评价任务供应商对应评审人表】
@ -115,6 +118,7 @@ public class CoscoEvaluateTaskSupplierUserServiceImpl implements ICoscoEvaluateT
CoscoEvaluateTaskSupplierUser coscoEvaluateTaskSupplierUser = coscoEvaluateTaskSupplierUserMapper.selectCoscoEvaluateTaskSupplierUserById(id);
//根据项目id获取项目信息
CoscoEvaluateTask coscoEvaluateTask = coscoEvaluateTaskMapper.selectCoscoEvaluateTaskById(coscoEvaluateTaskSupplierUser.getEvaluateTaskId());
coscoEvaluateTask.setCategoryName(coscoCategoryService.getCategoryNameById(coscoEvaluateTask.getCategoryId()));
//根据项目id获取供应商信息和分类信息
BaseCategoryNameVo baseCategoryNameVo = coscoSupplierBaseMapper.selectNameAndCategoryName(coscoEvaluateTaskSupplierUser.getSupplierId());
TaskIndicatorBaseVo taskIndicatorBaseVo = new TaskIndicatorBaseVo();

5
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTemplateServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.constant.ReviewTemplateConstant;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IOrgService;
import com.chinaunicom.zyhy.ebtp.supplier.base.service.IUserService;
import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.CoscoAnnualreviewTemplate;
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.service.ICoscoCategoryService;
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;
@ -43,6 +44,8 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
private IUserService userService;
@Autowired
private IOrgService orgService;
@Autowired
private ICoscoCategoryService coscoCategoryService;
/**
* 查询【供应商评价_评价表模板主表】
@ -56,6 +59,7 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
if (coscoEvaluateTemplate != null) {
try {
AddCoscoEvaluateTemplateVo vo = new AddCoscoEvaluateTemplateVo();
coscoEvaluateTemplate.setCategoryName(coscoCategoryService.getCategoryNameById(coscoEvaluateTemplate.getCategoryId()));
BeanUtils.copyProperties(vo, coscoEvaluateTemplate);
//获取评价项数据
vo.setIndicatorStList(coscoEvaluateTemplateIndicatorStService.selectByTemplateId(id));
@ -157,6 +161,7 @@ public class CoscoEvaluateTemplateServiceImpl implements ICoscoEvaluateTemplateS
vo.setDeptName(orgDeptInfo.getDeptName());
vo.setTenantName(orgDeptInfo.getOrgName());
}
vo.setCategoryName(coscoCategoryService.getCategoryNameById(vo.getCategoryId()));
});
return coscoEvaluateTemplateVoIPage;

2
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/SupplierDimensionVo.java
View File

@ -89,6 +89,8 @@ public class SupplierDimensionVo implements Serializable {
private String categoryName;
private String categoryId;
@ApiModelProperty(value = "分页对象信息")
private BasePageRequest basePageRequest;

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/vo/TaskPageVo.java
View File

@ -18,6 +18,10 @@ public class TaskPageVo implements Serializable {
* 评价主题
*/
private String evaluateTheme;
/**
* 品类id
*/
private String categoryId;
/**
* 品类添加
*/

27
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/service/impl/DataStatisticeServiceImpl.java
View File

@ -38,7 +38,19 @@ public class DataStatisticeServiceImpl implements DataStatisticeService {
public IPage<SupplierEvaluateStatisticsVo> getSupplierEvaluateStatistics(SupplierEvaluateStatisticsVo vo) {
IPage<CoscoEvaluateTaskListVo> p = new Page<>(vo.getBasePageRequest().getPageNo(),
vo.getBasePageRequest().getPageSize());
return coscoEvaluateTaskMapper.getSupplierEvaluateStatistics(p, vo);
IPage<SupplierEvaluateStatisticsVo> supplierEvaluateStatistics = coscoEvaluateTaskMapper.getSupplierEvaluateStatistics(p, vo);
supplierEvaluateStatistics.getRecords().forEach(item -> {
if (item.getCategoryIds() != null && item.getCategoryIds().length() > 0) {
String[] split = item.getCategoryIds().split(",");
StringBuilder builder = new StringBuilder();
for (String s : split) {
builder.append(coscoCategoryService.getCategoryNameById(s));
}
item.setCategoryName(builder.toString());
}
});
return supplierEvaluateStatistics;
}
@Override
@ -117,6 +129,17 @@ public class DataStatisticeServiceImpl implements DataStatisticeService {
@Override
public List<SupplierEvaluateStatisticsVo> getSupplierEvaluateStatisticsList(SupplierEvaluateStatisticsVo vo) {
return coscoEvaluateTaskMapper.getSupplierEvaluateStatisticsList(vo);
List<SupplierEvaluateStatisticsVo> supplierEvaluateStatisticsList = coscoEvaluateTaskMapper.getSupplierEvaluateStatisticsList(vo);
supplierEvaluateStatisticsList.forEach(item -> {
if (item.getCategoryIds() != null && item.getCategoryIds().length() > 0) {
String[] split = item.getCategoryIds().split(",");
StringBuilder builder = new StringBuilder();
for (String s : split) {
builder.append(coscoCategoryService.getCategoryNameById(s));
}
item.setCategoryName(builder.toString());
}
});
return supplierEvaluateStatisticsList;
}
}

4
src/main/java/com/chinaunicom/zyhy/ebtp/supplier/dataStatistics/vo/SupplierEvaluateStatisticsVo.java
View File

@ -47,6 +47,10 @@ public class SupplierEvaluateStatisticsVo {
*/
@ExcelProperty("评价结果")
private String evaluateResult;
/**
* 品类id
*/
private String categoryIds;
@ApiModelProperty(value = "分页对象信息")
private BasePageRequest basePageRequest;

3
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTemplateMapper.xml
View File

@ -31,7 +31,6 @@
cat.copy_template_id,
cat.category_limitation,
cat.category_id,
cc.category_name,
cat.status,
cat.del_flag,
cat.create_by,
@ -40,7 +39,7 @@
cat.update_time,
cat.last_update_time
from cosco_annualreview_template cat
left join cosco_category cc on cat.category_id= cc.id
</sql>
<select id="selectMyPage"

5
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml
View File

@ -93,11 +93,8 @@
resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.CategoryContainListVo">
select cclc.category_library_id categoryLibraryId,
cclc.category_id categoryId,
cclc.lock_type lockType,
cc.parent_id parentId,
cc.category_name categoryName
cclc.lock_type lockType
from cosco_category_library_contain cclc
join cosco_category cc on cclc.category_id = cc.id
where cclc.category_library_id = #{categoryLibraryId}
</select>

11
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
View File

@ -216,13 +216,14 @@
<result column="create_time" property="createTime"/>
<result column="create_by" property="createBy"/>
<result column="apply_dept_id" property="applyDeptId"/>
<result column="categoryIds" property="categoryIds"/>
</resultMap>
<select id="selectLibraryPage" parameterType="map"
resultMap="CoscoCategoryLibraryVoMap">
SELECT
ccl.id,
ccl.name,
GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
GROUP_CONCAT(DISTINCT cclc.category_id SEPARATOR ', ') AS categoryIds,
ccl.create_by,
ccl.apply_dept_id,
ccl.term_of_validity AS termOfValidity,
@ -246,8 +247,7 @@
cosco_category_library ccl
LEFT JOIN
cosco_category_library_contain cclc ON ccl.id = cclc.category_library_id
LEFT JOIN
cosco_category cc ON cc.id = cclc.category_id and cc.type=1
LEFT JOIN
cosco_category_library_supplier_apply cclsa ON cclsa.category_library_id = ccl.id AND cclsa.approve_status = 1
LEFT JOIN
@ -286,7 +286,7 @@
ccl.id,
ccl.name,
ccl.area AS area,
GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
GROUP_CONCAT(DISTINCT cclc.category_id SEPARATOR ', ') AS categoryIds,
ccl.term_of_validity AS termOfValidity,
ccl.approve_status AS approveStatus,
ccl.last_update_time as approveTime,
@ -298,8 +298,7 @@
left join cosco_category_library ccl on ccls.category_library_id = ccl.id
LEFT JOIN
cosco_category_library_contain cclc ON ccl.id = cclc.category_library_id
LEFT JOIN
cosco_category cc ON cc.id = cclc.category_id and cc.type=1
where cclsa.approve_status = 1 and ccls.supplier_id = #{vo.supplierId}
<if test="vo.name!=null and vo.name!=''">

10
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskMapper.xml
View File

@ -159,13 +159,12 @@
cet.update_by,
cet.update_time,
cete.template_name,
cec.category_name,
cet.approve_status,
cet.work_flow_id
cet.last_update_time
from cosco_evaluate_task cet
left join cosco_evaluate_template cete on cete.id = cet.template_id
left join cosco_category cec on cec.id = cet.category_id
where cet.work_flow_id = #{workFlowId}
</select>
<select id="selectCoscoEvaluateTaskById" parameterType="String"
@ -189,13 +188,12 @@
cet.update_by,
cet.update_time,
cete.template_name,
cec.category_name,
cet.approve_status,
cet.work_flow_id,
cet.last_update_time
from cosco_evaluate_task cet
left join cosco_evaluate_template cete on cete.id = cet.template_id
left join cosco_category cec on cec.id = cet.category_id
where cet.id = #{id}
</select>
@ -346,10 +344,10 @@
select cet.id,
cet.evaluate_theme as evaluateTheme,
'单位' as tenantName,
cec.category_name as categoryName,
cet.start_time as startTime,
cet.end_time as endTime,
cet.status,
cet.category_id as categoryId,
cet.dept_id as deptId,
cet.approve_status as approveStatus,
case
@ -362,9 +360,7 @@
when cet.status = 1 then '评价中'
when cet.status = 2 then '已结束' end as statusName
from cosco_evaluate_task cet
left join cosco_evaluate_task_supplier_user cetsu on cet.id=cetsu.evaluate_task_id
left join cosco_category cec on cet.category_id=cec.id
</sql>
<select id="selectTaskPage" parameterType="map"

31
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTaskSupplierMapper.xml
View File

@ -22,6 +22,9 @@
<result property="supplierName" column="supplier_name"/>
<result property="deptId" column="dept_id"/>
<result property="categoryName" column="category_name"/>
<result property="categoryId" column="category_id"/>
</resultMap>
<sql id="selectCoscoEvaluateTaskSupplierVo">
@ -41,7 +44,9 @@
from cosco_evaluate_task_supplier
</sql>
<select id="exportList" parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier" resultMap="CoscoEvaluateTaskSupplierResult">
<select id="exportList"
parameterType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.CoscoEvaluateTaskSupplier"
resultMap="CoscoEvaluateTaskSupplierResult">
select cets.id,
cets.evaluate_task_id,
cets.level_name,
@ -55,13 +60,12 @@
cets.create_time,
cets.update_by,
cets.update_time,
case when cc.category_name is null then '未指定' else cc.category_name end as category_name,
cet.category_id ,
cets.last_update_time,
csb.name as supplier_name
from cosco_evaluate_task_supplier cets
left join cosco_supplier_base csb on csb.id = cets.supplier_id
left join cosco_evaluate_task cet on cet.id = cets.evaluate_task_id
left join cosco_category cc on cc.id = cet.category_id
<where>
and cets.del_flag = 'normal'
<if test="evaluateTaskId != null and evaluateTaskId != ''">
@ -94,18 +98,16 @@
cets.review_score,
cets.review_result,
cets.del_flag,
cet.dept_id,
cet.category_id,
cets.create_by,
cets.create_time,
cets.update_by,
cets.update_time,
case when cc.category_name is null then '未指定' else cc.category_name end as category_name,
cets.last_update_time,
csb.name as supplier_name
from cosco_evaluate_task_supplier cets
left join cosco_supplier_base csb on csb.id = cets.supplier_id
left join cosco_evaluate_task cet on cet.id = cets.evaluate_task_id
left join cosco_category cc on cc.id = cet.category_id
<where>
and cets.del_flag = 'normal'
<if test="vo.evaluateTaskId != null and vo.evaluateTaskId != ''">
@ -286,8 +288,7 @@
cet.start_time startTime,
cet.end_time endTime,
cetsu.user_id as userId,
case when cc.category_name is null then '未指定'
else cc.category_name end as categoryName,
cet.category_id as categoryId,
cet.STATUS ,
cet.dept_id as deptId,
cetsu.review_status reviewStatus,
@ -308,7 +309,7 @@
LEFT JOIN cosco_evaluate_task cet ON cetsu.evaluate_task_id = cet.id
LEFT JOIN cosco_evaluate_task_supplier cets ON cets.evaluate_task_id = cet.id and cetsu.supplier_id=
cets.supplier_id and cets.del_flag='normal'
left join cosco_category cc on cc.id = cet.category_id
LEFT JOIN cosco_supplier_base csb ON cets.supplier_id = csb.id and csb.del_flag='normal'
<where>
and cetsu.del_flag = 'normal'
@ -344,11 +345,9 @@
when csb.supplier_type = 'ovs' then '境内'
else '境内' end as area ,
cets.id,
(select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
(select GROUP_CONCAT( DISTINCT casc.category_id SEPARATOR ', ' )
from cosco_access_supplier_category casc
join cosco_category cc
ON cc.id = casc.category_id
where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName,
where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryIds,
'准入单位' as accessUnit,
'准入部门' as accessDept,
cets.review_result evaluateResult,
@ -381,11 +380,9 @@
when csb.supplier_type = 'ovs' then '境内'
else '境内' end as area ,
csb.id,
(select GROUP_CONCAT( DISTINCT cc.category_name SEPARATOR ', ' )
(select GROUP_CONCAT( DISTINCT casc.category_id SEPARATOR ', ' )
from cosco_access_supplier_category casc
join cosco_category cc
ON cc.id = casc.category_id
where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryName,
where casc.del_flag = 'normal' and casc.supplier_id=csb.id) as categoryIds,
'准入单位' as accessUnit,
'准入部门' as accessDept,
cets.review_result evaluateResult,

7
src/main/resources/com/chinaunicom/zyhy/ebtp/coscoEvaluate.dao/mapper/CoscoEvaluateTemplateMapper.xml
View File

@ -52,7 +52,7 @@
<select id="selectMyPage" parameterType="map"
resultType="com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.CoscoEvaluateTemplateVo">
select cet.id,cet.template_name as templateName ,cc.category_name as categoryName,
select cet.id,cet.template_name as templateName ,cet.category_id as categoryId,
"单位" as tenantName,
"部门" as deptName,
cet.create_time as createTime,
@ -65,7 +65,7 @@
when 2 then '停用'
else '未知'
end as statusName
from cosco_evaluate_template cet left join cosco_category cc on cet.category_id = cc.id
from cosco_evaluate_template cet
<where>
and cet.del_flag = 'normal'
<if test="vo.templateName != null and vo.templateName != ''">
@ -129,10 +129,9 @@
cet.indicator_type_more,
cet.indicator_st_more,
cet.indicator_nd_more,
cc.category_name,
cet.last_update_time
from cosco_evaluate_template cet
left join cosco_category cc on cet.category_id=cc.id
left join cosco_evaluate_template cet2 on cet.copy_template_id=cet2.id
where cet.id = #{id}
</select>