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 | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 7ed78cb..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
@@ -10,13 +10,16 @@
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;
@@ -35,6 +38,8 @@
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 目标指标(TargetMng)表服务实现类
@@ -57,6 +62,9 @@
@Resource
private CommonService commonService;
+ @Autowired
+ private TargetTypeRepository targetTypeRepository;
+
@Override
public ResultVO queryAll(PageQuery<TargetMngQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
@@ -87,6 +95,23 @@
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);
});
@@ -154,7 +179,7 @@
respList.forEach(dto->{
List<TargetDutyWorkApprove> list = targetDutyWorkApproveRepository.selectList(
new QueryWrapper<TargetDutyWorkApprove>().eq("del_flag",0)
- .eq("relate_type",pageQuery.getSearchParams().getTargetType())
+ .eq("relate_type",pageQuery.getSearchParams().getRelateType())
.eq("relate_id",dto.getId())
.orderByDesc("sort"));
@@ -180,4 +205,4 @@
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.2