fix

songhuangfeng123

2022-08-17 b91f68eef297530ecd0b61e97949b7203c384ab8

fix

 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)表服务实现类
@@ -56,8 +61,11 @@

    @Resource
    private CommonService commonService;
	
    @Override

    @Autowired
    private TargetTypeRepository targetTypeRepository;

    @Override
    public ResultVO queryAll(PageQuery<TargetMngQueryCriteria> pageQuery) {
        Long pageIndex = pageQuery.getPageIndex();
        Long pageSize = pageQuery.getPageSize();
@@ -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);
        });
@@ -180,4 +205,4 @@
    }


}
}