From d887d1db33d88948c71c5af670033382079bb250 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 05 Aug 2022 10:36:39 +0800
Subject: [PATCH] 删除物资接口fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 f56b077..e57c93b 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
@@ -4,12 +4,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
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.model.dto.req.TargetDivideDetailQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetDivideDetailDto;
import com.gkhy.safePlatform.targetDuty.repository.TargetMngRepository;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
+import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.TargetDivideDetailService;
import com.gkhy.safePlatform.targetDuty.service.TargetMngService;
+import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -23,7 +27,7 @@
import javax.annotation.Resource;
import java.io.Serializable;
-import java.util.List;
+import java.util.*;
/**
* 目标指标(TargetMng)表服务实现类
@@ -39,8 +43,9 @@
@Resource
private TargetDivideDetailService targetDivideDetailService;
-
-
+
+ @Resource
+ private CommonService commonService;
@Override
public ResultVO queryAll(PageQuery<TargetMngQueryCriteria> pageQuery) {
@@ -81,9 +86,25 @@
criteria.setTargetId(targetMng.getId());
List<TargetDivideDetailDto> respList = BeanCopyUtils.copyBeanList(targetDivideDetailService.queryAll(criteria), TargetDivideDetailDto.class);
- //循环获取部门信息 TODO
+ // --------------------------- 获取部门信息-----------------------
+ //收集所用到的部门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;
}
+
+
}
\ No newline at end of file
--
Gitblit v1.9.2