From dadb953d5f131f6570b682261bfa14565abe2fb8 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 16 May 2022 16:11:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/controller/ProjectStatusBoardController.java  | 8 +++-----
 .../project/service/IProjectStatusBoardService.java       | 3 ++-
 .../service/impl/ProjectStatusBoardServiceImpl.java       | 7 ++++---
 3 files changed, 9 insertions(+), 9 deletions(-)

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<Map<String, Object>> 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<Map<String,Object>> 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<Map<String,Object>> scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) {
         QueryWrapper<ProjectLibraryBase> queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap());
-
         //项目库信息
         List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.list(queryWrapper);
 
+        List<Map<String,Object>> result = new ArrayList<>();
         if(projectLibraryBaseList.size() != 0){
             List<String> LibraryBaseIdList = projectLibraryBaseList.stream().map(ProjectLibraryBase::getId).collect(Collectors.toList());
 
@@ -98,7 +98,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 projectTaskInventoryEOList = projectTaskInventoryEOService.list(lambdaQueryWrapper);
             }
 
-            List<Map<String,Object>> result = new ArrayList<>();
+
             for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
 
                 //(1)每个项目下的法规清单
@@ -284,6 +284,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 result.add(map);
             }
         }
+        return result;
     }