diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java index 8a823179b..05ad207cd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.util.List; +import java.util.Map; /** * @description @@ -57,11 +58,8 @@ public class ProjectStatusBoardController { @ApiOperation(value="项目状态进度", notes="项目状态进度") @GetMapping(value = "/scheduleInfoList") public Result scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) { - iProjectStatusBoardService.scheduleInfoList(projectLibraryBase, req); - if("result"==null) { - return Result.error("未找到对应数据"); - } - return Result.OK("result"); + List> mapList = iProjectStatusBoardService.scheduleInfoList(projectLibraryBase, req); + return Result.OK(mapList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java index 0cd115688..3f0725187 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java @@ -5,6 +5,7 @@ import com.jero.modules.project.vo.TimeNodeVO; import javax.servlet.http.HttpServletRequest; import java.util.List; +import java.util.Map; /** * @description @@ -26,5 +27,5 @@ public interface IProjectStatusBoardService { * @param projectLibraryBase * @param req */ - void scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req); + List> scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index f1e636c3a..d09a58124 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -74,12 +74,12 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService * @param req */ @Override - public void scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) { + public List> scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap()); - //项目库信息 List projectLibraryBaseList = projectLibraryBaseService.list(queryWrapper); + List> result = new ArrayList<>(); if(projectLibraryBaseList.size() != 0){ List LibraryBaseIdList = projectLibraryBaseList.stream().map(ProjectLibraryBase::getId).collect(Collectors.toList()); @@ -98,7 +98,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService projectTaskInventoryEOList = projectTaskInventoryEOService.list(lambdaQueryWrapper); } - List> result = new ArrayList<>(); + for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { //(1)每个项目下的法规清单 @@ -284,6 +284,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService result.add(map); } } + return result; }