组织机构树，组织区域查询

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java

@@ -31,13 +31,13 @@ public class AgencyController {
 
     /**
      * @Description  1、组织机构树
-     * @param tokenDto
+     * @param
      * @author zxc
      * @date 2020/8/18 2:04 下午
      */
     @PostMapping("tree")
-    public Result<List<TreeResultDTO>> tree(@LoginUser TokenDto tokenDto){
-        return new Result<List<TreeResultDTO>>().ok(agencyService.tree(tokenDto));
+    public Result<TreeResultDTO> tree(){
+        return new Result<TreeResultDTO>().ok(agencyService.tree());
     }
 
     /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ProjectController.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java

@@ -11,5 +11,5 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController("screeproject")
 @RequestMapping("/screen/project")
-public class ProjectController {
+public class ScreenProjectController {
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/AgencyService.java

@@ -17,11 +17,11 @@ public interface AgencyService {
 
     /**
      * @Description  1、组织机构树
-     * @param tokenDto
+     * @param
      * @author zxc
      * @date 2020/8/18 2:04 下午
      */
-    List<TreeResultDTO> tree(TokenDto tokenDto);
+    TreeResultDTO tree();
 
     /**
      * @Description  2、组织区域查询

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ProjectService.java → epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/ScreenProjectService.java

@@ -6,5 +6,5 @@ package com.epmet.datareport.service.screen;
  * @author yinzuomei@elink-cn.com
  * @date 2020/8/18 10:22
  */
-public interface ProjectService {
+public interface ScreenProjectService {
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/AgencyServiceImpl.java

@@ -29,15 +29,22 @@ public class AgencyServiceImpl implements AgencyService {
 
     /**
      * @Description  1、组织机构树
-     * @param tokenDto
+     * @param
      * @author zxc
      * @date 2020/8/18 2:04 下午
      */
     @Override
-    public List<TreeResultDTO> tree(TokenDto tokenDto) {
+    public TreeResultDTO tree() {
         // 1. 查询客户根组织ID
-        TreeResultDTO rootAgency = screenCustomerAgencyDao.selectRootAgencyId(tokenDto.getCustomerId());
-        return this.getDepartmentList(("".equals(rootAgency.getPids()) ? "" : rootAgency.getPids() + ":") + rootAgency.getValue());
+        // TODO 改成正式注解获取customerId
+        String customerId = "zxc";
+        TreeResultDTO rootAgency = screenCustomerAgencyDao.selectRootAgencyId(customerId);
+        if (null == rootAgency){
+            return new TreeResultDTO();
+        }
+        List<TreeResultDTO> departmentList = this.getDepartmentList(("".equals(rootAgency.getPids()) ? "" : rootAgency.getPids() + ":") + rootAgency.getValue());
+        rootAgency.setChildren(departmentList);
+        return rootAgency;
     }
 
     private List<TreeResultDTO> getDepartmentList(String subAgencyPids) {

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/DistributionServiceImpl.java

@@ -7,6 +7,7 @@ import com.epmet.screen.dto.result.BranchResultDTO;
 import com.epmet.screen.dto.result.ParymemberResultDTO;
 import com.epmet.screen.dto.result.UserResultDTO;
 import com.epmet.datareport.service.screen.DistributionService;
+import org.springframework.stereotype.Service;
 
 /**
  * 中央区相关各指标查询
@@ -14,6 +15,7 @@ import com.epmet.datareport.service.screen.DistributionService;
  * @author yinzuomei@elink-cn.com
  * @date 2020/8/18 10:19
  */
+@Service
 public class DistributionServiceImpl implements DistributionService {
 
     /**

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/GrassRootsGovernServiceImpl.java

@@ -1,6 +1,7 @@
 package com.epmet.datareport.service.screen.impl;
 
 import com.epmet.datareport.service.screen.GrassRootsGovernService;
+import org.springframework.stereotype.Service;
 
 /**
  * 基层治理相关各指标查询
@@ -8,5 +9,6 @@ import com.epmet.datareport.service.screen.GrassRootsGovernService;
  * @author yinzuomei@elink-cn.com
  * @date 2020/8/18 10:20
  */
+@Service
 public class GrassRootsGovernServiceImpl implements GrassRootsGovernService {
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java

@@ -1,6 +1,7 @@
 package com.epmet.datareport.service.screen.impl;
 
 import com.epmet.datareport.service.screen.IndexService;
+import org.springframework.stereotype.Service;
 
 /**
  * 指数相关相关各指标查询
@@ -8,5 +9,6 @@ import com.epmet.datareport.service.screen.IndexService;
  * @author yinzuomei@elink-cn.com
  * @date 2020/8/18 10:21
  */
+@Service
 public class IndexServiceImpl implements IndexService {
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java

@@ -1,6 +1,7 @@
 package com.epmet.datareport.service.screen.impl;
 
 import com.epmet.datareport.service.screen.PartyMemberLeadService;
+import org.springframework.stereotype.Service;
 
 /**
  * 党建引领相关各指标查询
@@ -8,5 +9,6 @@ import com.epmet.datareport.service.screen.PartyMemberLeadService;
  * @author yinzuomei@elink-cn.com
  * @date 2020/8/18 10:22
  */
+@Service
 public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ProjectServiceImpl.java

@@ -1,12 +0,0 @@
-package com.epmet.datareport.service.screen.impl;
-
-import com.epmet.datareport.service.screen.ProjectService;
-
-/**
- * 项目
- *
- * @author yinzuomei@elink-cn.com
- * @date 2020/8/18 10:23
- */
-public class ProjectServiceImpl implements ProjectService {
-}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java

@@ -0,0 +1,14 @@
+package com.epmet.datareport.service.screen.impl;
+
+import com.epmet.datareport.service.screen.ScreenProjectService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/8/18 10:23
+ */
+@Service
+public class ScreenProjectServiceImpl implements ScreenProjectService {
+}

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -6,6 +6,7 @@
     <!-- 查询客户根组织ID -->
     <select id="selectRootAgencyId" resultType="com.epmet.screen.dto.result.TreeResultDTO">
         SELECT
+            agency_name AS label,
             agency_id AS value,
 			pids AS pids
         FROM