From dc09f666f10fd569fcb473cc5ce59eef03ea71b4 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 26 八月 2022 09:39:41 +0800
Subject: [PATCH] 4个线程保持连接
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java | 90 +++++++++++++++++++++++++++-----------------
1 files changed, 55 insertions(+), 35 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 33b9cd6..5d7f321 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
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -10,33 +9,24 @@
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
-import com.gkhy.safePlatform.targetDuty.entity.TargetDutyWorkApprove;
-import com.gkhy.safePlatform.targetDuty.entity.TargetExamine;
-import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
-import com.gkhy.safePlatform.targetDuty.entity.TargetType;
+import com.gkhy.safePlatform.targetDuty.entity.*;
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.req.TargetMngQueryCriteria;
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.TargetMngDto;
-import com.gkhy.safePlatform.targetDuty.repository.TargetDutyWorkApproveRepository;
-import com.gkhy.safePlatform.targetDuty.repository.TargetExamineRepository;
-import com.gkhy.safePlatform.targetDuty.repository.TargetMngRepository;
-import com.gkhy.safePlatform.targetDuty.repository.TargetTypeRepository;
+import com.gkhy.safePlatform.targetDuty.repository.*;
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.TargetDivideDetailService;
import com.gkhy.safePlatform.targetDuty.service.TargetMngService;
-import com.gkhy.safePlatform.targetDuty.utils.BeanToMapUtil;
import com.gkhy.safePlatform.targetDuty.utils.QueryHelpPlus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
-import java.beans.IntrospectionException;
import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -55,6 +45,9 @@
@Resource
private TargetDivideDetailService targetDivideDetailService;
+
+ @Autowired
+ private TargetDivideDetailRepository targetDivideDetailRepository;
@Resource
private TargetDutyWorkApproveRepository targetDutyWorkApproveRepository;
@@ -78,6 +71,9 @@
QueryHelpPlus.getPredicate(TargetMng.class, pageQuery.getSearchParams()));
List<TargetMngDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetMngDto.class);
respList.forEach(dto->{
+ // --------------------------- 获取部门信息-----------------------
+ dto.setMakerDepartmentName(commonService.getDepName(dto.getMakerDepartmentId()));
+
//查询关联分解信息
TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
criteria.setTargetId(dto.getId());
@@ -91,7 +87,7 @@
collectDepIdSet.add(f.getMakerDepartmentId());
});
//获取部门名集合
- Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
+ Map<Long, String> depNameMap = commonService.getDepName(collectDepIdSet);
respList1.forEach(f->{
f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
@@ -108,7 +104,7 @@
//获取目标分类名集合
if(!collectTypeSet.isEmpty()){
List<TargetType> typeList = targetTypeRepository.selectBatchIds(collectTypeSet); // TODO
- Map<Long,String> typeNameMap = typeList.stream()
+ Map<Long, String> typeNameMap = typeList.stream()
.collect(Collectors.toMap(TargetType::getId, TargetType::getTypeName,(k1, k2)->k1));
respList1.forEach(f->{
@@ -142,6 +138,8 @@
return null;
}
TargetMngDto targetMngDto = BeanCopyUtils.copyBean(targetMng, TargetMngDto.class);
+ // --------------------------- 获取部门信息-----------------------
+ targetMngDto.setMakerDepartmentName(commonService.getDepName(targetMngDto.getMakerDepartmentId()));
//查询关联分解信息
TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
@@ -156,7 +154,7 @@
collectDepIdSet.add(f.getMakerDepartmentId());
});
//获取部门名集合
- Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
+ Map<Long, String> depNameMap = commonService.getDepName(collectDepIdSet);
respList.forEach(f->{
f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
@@ -175,7 +173,7 @@
//获取核结果集合
if(!collectExamResultSet.isEmpty()){
List<TargetExamine> typeList = targetExamineRepository.selectList(new QueryWrapper<TargetExamine>().in("target_divide_detail_id",collectExamResultSet));
- Map<Long,TargetExamine> examResultMap = typeList.stream()
+ Map<Long, TargetExamine> examResultMap = typeList.stream()
.collect(Collectors.toMap(TargetExamine::getTargetDivideDetailId, Function.identity(),(k1, k2)->k1));
respList.forEach(f->{
@@ -235,29 +233,51 @@
@Override
public Object statistics(TargetMngQueryCriteria criteria) {
- Map<String,String> map = new HashMap<>();
+ Map<String, String> map = new HashMap<>();
// 查询总数
- Integer total = null;
- try {
- total = targetMngRepository.selectTotal(BeanToMapUtil.convertBean(criteria));
- //未完成数量
- Integer noComplete = targetMngRepository.selectNoComplete(BeanToMapUtil.convertBean(criteria));
+ Integer total = 0;
+ // 完成数量
+ Integer complete=0;
-
-
- if(noComplete == null){
- noComplete = 0;
+ // 查询目标已分解且事件类型对一个的目标
+ List<TargetMng> targetMngList = targetMngRepository.selectList(
+ new QueryWrapper<TargetMng>()
+ .eq("target_type",criteria.getTargetType())
+ .eq("divide_status",1)
+ );
+ if (!targetMngList.isEmpty()){
+ total = targetMngList.size();
+ // 查询目标下的所有分解项
+ for (TargetMng targetMng : targetMngList){
+ Boolean completeFlag = true;
+ List<TargetDivideDetail> targetDivideDetailList = targetDivideDetailRepository.selectList(
+ new QueryWrapper<TargetDivideDetail>()
+ .eq("target_id",targetMng.getId())
+ );
+ if (!targetDivideDetailList.isEmpty()){
+ // 查询分解项 是否已经审核通过
+ for (TargetDivideDetail targetDivideDetail :targetDivideDetailList){
+ List<TargetExamine> targetExamineList = targetExamineRepository.selectList(
+ new QueryWrapper<TargetExamine>()
+ .eq("target_divide_detail_id",targetDivideDetail.getId())
+ .eq("examine_result",1)
+ );
+ if (targetExamineList.isEmpty()){
+ completeFlag=false;
+ }
+ }
+ }
+ // 该目标中有未评价的或者不合格的
+ if (completeFlag){
+ complete++;
+ }
}
- //已完成数
- int complete = total-noComplete;
-
- map.put("total",total+"");
- map.put("noComplete",noComplete+"");
- map.put("complete",complete+"");
- return map;
- } catch (Exception e) {
-
}
+ //未完成数
+ int noComplete = total-complete;
+ map.put("total",total+"");
+ map.put("noComplete",noComplete+"");
+ map.put("complete",complete+"");
return map;
}
--
Gitblit v1.9.2