合并fix

songhuangfeng123

2022-08-03 81695c67562b55493a2e98263223c5440e28feed

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.TargetDivideDetailService;
@@ -38,9 +39,9 @@

    @Resource
    private TargetDivideDetailService targetDivideDetailService;



    
    
	
   @Override
    public ResultVO queryAll(PageQuery<TargetMngQueryCriteria> pageQuery) {
        Long pageIndex = pageQuery.getPageIndex();
@@ -78,7 +79,11 @@
        //查询关联分解信息
        TargetDivideDetailQueryCriteria criteria = new TargetDivideDetailQueryCriteria();
        criteria.setTargetId(targetMng.getId());
        targetMngDto.setTargetDivideDetailList(targetDivideDetailService.queryAll(criteria));
        List<TargetDivideDetailDto> respList = BeanCopyUtils.copyBeanList(targetDivideDetailService.queryAll(criteria), TargetDivideDetailDto.class);

        //循环获取部门信息 TODO

        targetMngDto.setTargetDivideDetailList(respList);
        return targetMngDto;
    }
}
}