From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 10:10:14 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java | 95 -----------------------------------------------
1 files changed, 0 insertions(+), 95 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java
index 9031014..613745b 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java
@@ -56,105 +56,10 @@
@Autowired
private TargetTypeRepository targetTypeRepository;
- @Override
- public ResultVO queryAll(PageQuery<TargetExamineQueryCriteria> pageQuery) {
- Long pageIndex = pageQuery.getPageIndex();
- Long pageSize = pageQuery.getPageSize();
- IPage<TargetMng> page = new Page<>(pageIndex, pageSize);
-
- page = targetMngRepository.selectPage(page,
- QueryHelpPlus.getPredicate(TargetMng.class, pageQuery.getSearchParams()));
- List<TargetExamineDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetExamineDto.class);
- respList.forEach(dto->{
- //查询关联分解信息
- TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
- criteria.setTargetId(dto.getId());
- List<TargetDivideDetailDto> respList1 = BeanCopyUtils.copyBeanList(targetDivideDetailService.queryAll(criteria), TargetDivideDetailDto.class);
-
- // --------------------------- 获取部门信息-----------------------
- //收集所用到的部门ID
- Set<Long> collectDepIdSet = new HashSet();
- respList1.forEach(f->{
- collectDepIdSet.add(f.getDutyDepartmentId());
- collectDepIdSet.add(f.getMakerDepartmentId());
- });
- //获取部门名集合
- Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
-
- respList1.forEach(f->{
- f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
- f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId()));
- });
-
-
- // --------------------------- 获取目标分类名称-----------------------
- //收集所用到的目标分类ID
- Set<Long> collectTypeSet = new HashSet();
- respList1.forEach(f->{
- collectTypeSet.add(f.getTargetTypeId());
- });
- //获取目标分类名集合
- if(!collectTypeSet.isEmpty()){
- List<TargetType> typeList = targetTypeRepository.selectBatchIds(collectTypeSet); // TODO
- Map<Long,String> typeNameMap = typeList.stream()
- .collect(Collectors.toMap(TargetType::getId, TargetType::getTypeName,(k1, k2)->k1));
-
- respList1.forEach(f->{
- f.setTargetTypeName(typeNameMap.get(f.getTargetTypeId()));
- });
- }
-
-
- // --------------------------- 获取考核结果-----------------------
- //收集所用到的分解详情ID
- Set<Long> collectExamResultSet = new HashSet();
- respList1.forEach(f->{
- collectExamResultSet.add(f.getId());
- });
- //获取核结果集合
- if(!collectTypeSet.isEmpty()){
- List<TargetExamine> typeList = targetExamineRepository.selectBatchIds(collectTypeSet);
- Map<Long,Integer> examResultMap = typeList.stream()
- .collect(Collectors.toMap(TargetExamine::getId, TargetExamine::getExamineResult,(k1, k2)->k1));
-
- respList1.forEach(f->{
- f.setExamineResult(examResultMap.get(f.getId()));
- });
- }
-
-
- dto.setTargetDivideDetailList(respList1);
- });
-
- return new SearchResultVO<>(
- true,
- pageIndex,
- pageSize,page.getPages(),
- page.getTotal(),
- respList,
- ResultCodes.OK
- );
- }
-
@Override
public List<TargetExamine> queryAll(TargetExamineQueryCriteria criteria) {
return baseMapper.selectList(QueryHelpPlus.getPredicate(TargetExamine.class, criteria));
}
-// @Override
-// public void addOrUpdate(TargetExamineSaveOrUpdate infoDto) {
-//
-//
-// if(StringUtils.hasText(infoDto.getDelIds())) {
-// List<Long> idList = Arrays.stream(infoDto.getDelIds().split(",")).map(s-> Long.parseLong(s.trim()))
-// .collect(Collectors.toList());
-// this.removeByIds(idList);
-// }
-//
-// infoDto.getExamineList().forEach(f->{
-// f.setTargetId(infoDto.getId());
-// });
-// this.saveOrUpdateBatch(infoDto.getExamineList());
-// }
}
\ No newline at end of file
--
Gitblit v1.9.2