From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 10:10:14 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java | 142 +++++++++++++++++++++++++++--------------------
1 files changed, 81 insertions(+), 61 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..8fbcb26 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;
@@ -77,7 +70,10 @@
page = baseMapper.selectPage(page,
QueryHelpPlus.getPredicate(TargetMng.class, pageQuery.getSearchParams()));
List<TargetMngDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetMngDto.class);
- respList.forEach(dto->{
+ respList.forEach(dto -> {
+ // --------------------------- 获取部门信息-----------------------
+ dto.setMakerDepartmentName(commonService.getDepName(dto.getMakerDepartmentId()));
+
//查询关联分解信息
TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
criteria.setTargetId(dto.getId());
@@ -86,14 +82,14 @@
// --------------------------- 获取部门信息-----------------------
//收集所用到的部门ID
Set<Long> collectDepIdSet = new HashSet();
- respList1.forEach(f->{
+ respList1.forEach(f -> {
collectDepIdSet.add(f.getDutyDepartmentId());
collectDepIdSet.add(f.getMakerDepartmentId());
});
//获取部门名集合
- Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
+ Map<Long, String> depNameMap = commonService.getDepName(collectDepIdSet);
- respList1.forEach(f->{
+ respList1.forEach(f -> {
f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId()));
});
@@ -102,16 +98,16 @@
// --------------------------- 获取目标分类名称-----------------------
//收集所用到的目标分类ID
Set<Long> collectTypeSet = new HashSet();
- respList1.forEach(f->{
+ respList1.forEach(f -> {
collectTypeSet.add(f.getTargetTypeId());
});
//获取目标分类名集合
- if(!collectTypeSet.isEmpty()){
+ 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));
+ Map<Long, String> typeNameMap = typeList.stream()
+ .collect(Collectors.toMap(TargetType::getId, TargetType::getTypeName, (k1, k2) -> k1));
- respList1.forEach(f->{
+ respList1.forEach(f -> {
f.setTargetTypeName(typeNameMap.get(f.getDutyDepartmentId()));
});
}
@@ -122,7 +118,7 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,page.getPages(),
+ pageSize, page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -138,10 +134,12 @@
@Override
public Object selectOne(Serializable id) {
TargetMng targetMng = baseMapper.selectById(id);
- if(targetMng == null){
+ if (targetMng == null) {
return null;
}
TargetMngDto targetMngDto = BeanCopyUtils.copyBean(targetMng, TargetMngDto.class);
+ // --------------------------- 获取部门信息-----------------------
+ targetMngDto.setMakerDepartmentName(commonService.getDepName(targetMngDto.getMakerDepartmentId()));
//查询关联分解信息
TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
@@ -151,36 +149,34 @@
// --------------------------- 获取部门信息-----------------------
//收集所用到的部门ID
Set<Long> collectDepIdSet = new HashSet();
- respList.forEach(f->{
+ respList.forEach(f -> {
collectDepIdSet.add(f.getDutyDepartmentId());
collectDepIdSet.add(f.getMakerDepartmentId());
});
//获取部门名集合
- Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
+ Map<Long, String> depNameMap = commonService.getDepName(collectDepIdSet);
- respList.forEach(f->{
+ respList.forEach(f -> {
f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId()));
});
-
-
// --------------------------- 获取考核结果-----------------------
//收集所用到的分解详情ID
Set<Long> collectExamResultSet = new HashSet();
- respList.forEach(f->{
+ respList.forEach(f -> {
collectExamResultSet.add(f.getId());
});
//获取核结果集合
- if(!collectExamResultSet.isEmpty()){
- List<TargetExamine> typeList = targetExamineRepository.selectList(new QueryWrapper<TargetExamine>().in("target_divide_detail_id",collectExamResultSet));
- Map<Long,TargetExamine> examResultMap = typeList.stream()
- .collect(Collectors.toMap(TargetExamine::getTargetDivideDetailId, Function.identity(),(k1, k2)->k1));
+ if (!collectExamResultSet.isEmpty()) {
+ List<TargetExamine> typeList = targetExamineRepository.selectList(new QueryWrapper<TargetExamine>().in("target_divide_detail_id", collectExamResultSet));
+ Map<Long, TargetExamine> examResultMap = typeList.stream()
+ .collect(Collectors.toMap(TargetExamine::getTargetDivideDetailId, Function.identity(), (k1, k2) -> k1));
- respList.forEach(f->{
+ respList.forEach(f -> {
TargetExamine targetExamine = examResultMap.get(f.getId());
- if(targetExamine != null){
+ if (targetExamine != null) {
f.setExamineResult(targetExamine.getExamineResult());
f.setExamineDate(targetExamine.getExamineDate());
f.setExaminePersonId(targetExamine.getExaminePersonId());
@@ -205,11 +201,11 @@
List<TargetCheckAndSubmitDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetCheckAndSubmitDto.class);
// 判断审批人
- respList.forEach(dto->{
+ 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())
+ new QueryWrapper<TargetDutyWorkApprove>().eq("del_flag", 0)
+ .eq("relate_type", pageQuery.getSearchParams().getRelateType())
+ .eq("relate_id", dto.getId())
.orderByDesc("sort"));
if (!CollectionUtils.isEmpty(list)) {
@@ -217,7 +213,7 @@
dto.setApproveStatus(list.get(0).getApproveStatus());
dto.setApprovePersonId(list.get(0).getApprovePersonId());
// 审批中 判断审批人是否人与当前登录人
- if (dto.getApproveStatus()!=null && dto.getApproveStatus()==2){
+ if (dto.getApproveStatus() != null && dto.getApproveStatus() == 2) {
dto.setCheckApprove(dto.getApprovePersonId().equals(uid));
}
}
@@ -226,7 +222,7 @@
return new SearchResultVO<>(
true,
pageIndex,
- pageSize,page.getPages(),
+ pageSize, page.getPages(),
page.getTotal(),
respList,
ResultCodes.OK
@@ -235,32 +231,56 @@
@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("del_flag", 0)
+ .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("del_flag", 0)
+ .eq("target_id", targetMng.getId())
+ );
+ if (!targetDivideDetailList.isEmpty()) {
+ // 查询分解项 是否已经审核通过
+ for (TargetDivideDetail targetDivideDetail : targetDivideDetailList) {
+ List<TargetExamine> targetExamineList = targetExamineRepository.selectList(
+ new QueryWrapper<TargetExamine>()
+ .eq("del_flag", 0)
+ .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