From 6d0b2b2d93eab87b246c05a2a217ab16357e5f01 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 12 Aug 2022 14:33:52 +0800
Subject: [PATCH] 目标fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java
index 8b7c069..4088452 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java
@@ -1,5 +1,5 @@
package com.gkhy.safePlatform.targetDuty.controller;
-import java.util.Date;
+import java.util.*;
import java.sql.Timestamp;
@@ -8,12 +8,16 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.targetDuty.entity.ExamineItem;
import com.gkhy.safePlatform.targetDuty.entity.TargetExamine;
import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
import com.gkhy.safePlatform.targetDuty.model.dto.req.ExamineTemplateSaveOrUpdate;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetExamineSaveOrUpdate;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.ExamineTemplateDto;
+import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetExamineDivideDto;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetExamineDto;
+import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.TargetExamineService;
import com.gkhy.safePlatform.targetDuty.service.TargetMngService;
import com.google.common.collect.Lists;
@@ -25,11 +29,9 @@
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetExamineQueryCriteria;
-import java.util.Arrays;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import java.io.Serializable;
-import java.util.List;
/**
* (TargetExamine)表控制层
@@ -48,6 +50,9 @@
@Resource
private TargetMngService targetMngService;
+ @Resource
+ private CommonService commonService;
+
/**
* 通过主键查询单条数据
*
@@ -64,7 +69,26 @@
TargetExamineQueryCriteria criteria = new TargetExamineQueryCriteria();
criteria.setTargetId(targetId);
- dto.setExamineList(this.targetExamineService.queryAll(criteria));
+
+ List<TargetExamineDivideDto> respList = BeanCopyUtils.copyBeanList(this.targetExamineService.queryAll(criteria), TargetExamineDivideDto.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()));
+ });
+
+ dto.setExamineList(respList);
dto.setId(targetMng.getId());
dto.setIndexNum(targetMng.getIndexNum());
dto.setqName(targetMng.getqName());
--
Gitblit v1.9.2