From 2b4afe24e1136e4eb25e37b7a76565603ddc1a85 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 18 八月 2022 15:37:44 +0800
Subject: [PATCH] 统计fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java | 130 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 127 insertions(+), 3 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
index 229bc6b..ad27486 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
@@ -1,12 +1,26 @@
package com.gkhy.safePlatform.targetDuty.service.impl;
import java.sql.Timestamp;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.safePlatform.account.rpc.apimodel.AccountDepartmentService;
+import com.gkhy.safePlatform.account.rpc.apimodel.model.resp.DepInfoRPCRespDTO;
+import com.gkhy.safePlatform.targetDuty.entity.ExamineItem;
+import com.gkhy.safePlatform.targetDuty.entity.TargetDutyWorkApprove;
+import com.gkhy.safePlatform.targetDuty.entity.TargetType;
+import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetCheckAndSubmitQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetDivideDetailQueryCriteria;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetCheckAndSubmitDto;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetDivideDetailDto;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.WorkApproveRelateDesc;
+import com.gkhy.safePlatform.targetDuty.repository.TargetDutyWorkApproveRepository;
import com.gkhy.safePlatform.targetDuty.repository.TargetMngRepository;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
+import com.gkhy.safePlatform.targetDuty.repository.TargetTypeRepository;
+import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.TargetDivideDetailService;
import com.gkhy.safePlatform.targetDuty.service.TargetMngService;
import org.springframework.stereotype.Service;
@@ -19,10 +33,13 @@
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetMngDto;
import com.gkhy.safePlatform.targetDuty.utils.QueryHelpPlus;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.io.Serializable;
-import java.util.List;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 目标指标(TargetMng)表服务实现类
@@ -39,8 +56,15 @@
@Resource
private TargetDivideDetailService targetDivideDetailService;
+ @Resource
+ private TargetDutyWorkApproveRepository targetDutyWorkApproveRepository;
+ @Resource
+ private CommonService commonService;
+ @Autowired
+ private TargetTypeRepository targetTypeRepository;
+
@Override
public ResultVO queryAll(PageQuery<TargetMngQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
@@ -50,6 +74,47 @@
page = baseMapper.selectPage(page,
QueryHelpPlus.getPredicate(TargetMng.class, pageQuery.getSearchParams()));
List<TargetMngDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetMngDto.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.getDutyDepartmentId()));
+ });
+ }
+
+ dto.setTargetDivideDetailList(respList1);
+ });
return new SearchResultVO<>(
true,
@@ -78,7 +143,66 @@
//查询关联分解信息
TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
criteria.setTargetId(targetMng.getId());
- targetMngDto.setTargetDivideDetailList(targetDivideDetailService.queryAll(criteria));
+ List<TargetDivideDetailDto> respList = BeanCopyUtils.copyBeanList(targetDivideDetailService.queryAll(criteria), TargetDivideDetailDto.class);
+
+ // --------------------------- 获取部门信息-----------------------
+ //收集所用到的部门ID
+ Set<Long> collectDepIdSet = new HashSet();
+ respList.forEach(f->{
+ collectDepIdSet.add(f.getDutyDepartmentId());
+ collectDepIdSet.add(f.getMakerDepartmentId());
+ });
+ //获取部门名集合
+ Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
+
+ respList.forEach(f->{
+ f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
+ f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId()));
+ });
+
+
+ targetMngDto.setTargetDivideDetailList(respList);
return targetMngDto;
}
-}
+
+ @Override
+ public ResultVO queryAll(Long uid, PageQuery<TargetCheckAndSubmitQueryCriteria> pageQuery) {
+ Long pageIndex = pageQuery.getPageIndex();
+ Long pageSize = pageQuery.getPageSize();
+ Page<TargetMng> page = new Page<>(pageIndex, pageSize);
+
+ page = baseMapper.selectPage(page,
+ QueryHelpPlus.getPredicate(TargetMng.class, pageQuery.getSearchParams()));
+ List<TargetCheckAndSubmitDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetCheckAndSubmitDto.class);
+
+ // 判断审批人
+ respList.forEach(dto->{
+ List<TargetDutyWorkApprove> list = targetDutyWorkApproveRepository.selectList(
+ new QueryWrapper<TargetDutyWorkApprove>().eq("del_flag",0)
+ .eq("relate_type",pageQuery.getSearchParams().getRelateType())
+ .eq("relate_id",dto.getId())
+ .orderByDesc("sort"));
+
+ if (!CollectionUtils.isEmpty(list)) {
+ dto.setApproveId(list.get(0).getId());
+ dto.setApproveStatus(list.get(0).getApproveStatus());
+ dto.setApprovePersonId(list.get(0).getApprovePersonId());
+ // 审批中 判断审批人是否人与当前登录人
+ if (dto.getApproveStatus()!=null && dto.getApproveStatus()==2){
+ dto.setCheckApprove(dto.getApprovePersonId().equals(uid));
+ }
+ }
+ });
+
+ return new SearchResultVO<>(
+ true,
+ pageIndex,
+ pageSize,page.getPages(),
+ page.getTotal(),
+ respList,
+ ResultCodes.OK
+ );
+ }
+
+
+}
\ No newline at end of file
--
Gitblit v1.9.2