新增：/data/report/user/checksublist接口

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/DimDepartmentDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 部门维度
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/29 13:59
+ */
+@Data
+public class DimDepartmentDTO implements Serializable {
+    private static final long serialVersionUID = -521155628850201172L;
+    /**
+     * DEPARTMENT_ID
+     */
+    private String id;
+
+    /**
+     * 部门名称
+     */
+    private String departmentName;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserAgencyInfoResultDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.result.user;
+
+import com.epmet.dto.DimAgencyDTO;
+import com.epmet.dto.DimDepartmentDTO;
+import com.epmet.dto.DimGridDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 直属机关、部门、网格列表查询  返参DTO
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/29 13:55
+ */
+@Data
+public class UserAgencyInfoResultDTO implements Serializable {
+    private static final long serialVersionUID = 4471324414446061654L;
+    private Boolean subGridFlag;
+    private Boolean subDepartmentFlag;
+    private Boolean subAgencyFlag;
+//    @JsonIgnore
+    private List<DimAgencyDTO> subAgencyList;
+//    @JsonIgnore
+    private List<DimGridDTO> subGridList;
+//    @JsonIgnore
+    private List<DimDepartmentDTO> subDepartmentList;
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/user/UserAnalysisController.java

@@ -6,10 +6,7 @@ import com.epmet.dto.form.user.UserIncrTrendFormDTO;
 import com.epmet.dto.form.user.UserSubAgencyFormDTO;
 import com.epmet.dto.form.user.UserSubGridFormDTO;
 import com.epmet.dto.form.user.UserSummaryInfoFormDTO;
-import com.epmet.dto.result.user.UserIncrTrendResultDTO;
+import com.epmet.dto.result.user.*;
-import com.epmet.dto.result.user.UserSubAgencyResultDTO;
-import com.epmet.dto.result.user.UserSubGridResultDTO;
-import com.epmet.dto.result.user.UserSummaryInfoResultDTO;
 import com.epmet.service.user.UserAnalysisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -87,4 +84,18 @@ public class UserAnalysisController {
         return new Result<List<UserIncrTrendResultDTO>>().ok(userIncrTrendResultDTO);
     }
 
+    /**
+     * @param
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.user.UserAgencyInfoResultDTO>
+     * @author yinzuomei
+     * @description 直属机关、部门、网格列表查询
+     * @Date 2020/6/29 14:10
+     **/
+    @PostMapping("checksublist")
+    public Result<UserAgencyInfoResultDTO> checkSubList() {
+        UserAgencyInfoResultDTO userAgencyInfoResultDTO = userService.checkSubList();
+        return new Result<UserAgencyInfoResultDTO>().ok(userAgencyInfoResultDTO);
+    }
+
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java

@@ -2,6 +2,7 @@ package com.epmet.dao.user;
 
 
 import com.epmet.dto.DimAgencyDTO;
+import com.epmet.dto.DimDepartmentDTO;
 import com.epmet.dto.DimGridDTO;
 import com.epmet.dto.result.user.UserIncrTrendResDTO;
 import com.epmet.dto.result.user.UserSubAgencyResDTO;
@@ -132,4 +133,13 @@ public interface UserAnalysisDao {
      * @Date 2020/6/23 11:24
      **/
     List<UserIncrTrendResDTO> selectParticipationUserMonthIncr(@Param("agencyId") String myAgencyId);
+
+    /**
+     * @return java.util.List<com.epmet.dto.DimDepartmentDTO>
+     * @param myAgencyId 工作人员所属机关单位id
+     * @author yinzuomei
+     * @description 查询机关下的部门列表
+     * @Date 2020/6/29 14:18
+     **/
+    List<DimDepartmentDTO> selectSubDepartmentList(@Param("agencyId")String myAgencyId);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/UserAnalysisService.java

@@ -5,10 +5,7 @@ import com.epmet.dto.form.user.UserIncrTrendFormDTO;
 import com.epmet.dto.form.user.UserSubAgencyFormDTO;
 import com.epmet.dto.form.user.UserSubGridFormDTO;
 import com.epmet.dto.form.user.UserSummaryInfoFormDTO;
-import com.epmet.dto.result.user.UserIncrTrendResultDTO;
+import com.epmet.dto.result.user.*;
-import com.epmet.dto.result.user.UserSubAgencyResultDTO;
-import com.epmet.dto.result.user.UserSubGridResultDTO;
-import com.epmet.dto.result.user.UserSummaryInfoResultDTO;
 
 import java.util.List;
 
@@ -64,4 +61,13 @@ public interface UserAnalysisService {
      * @Date 2020/6/22 13:42
      **/
     List<UserIncrTrendResultDTO> incrTrendV2(UserIncrTrendFormDTO formDTO);
+    
+    /**
+     * @return com.epmet.dto.result.user.UserAgencyInfoResultDTO
+     * @param 
+     * @author yinzuomei
+     * @description  直属机关、部门、网格列表查询
+     * @Date 2020/6/29 14:10 
+     **/
+    UserAgencyInfoResultDTO checkSubList();
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserAnalysisConstant;
 import com.epmet.dao.user.UserAnalysisDao;
 import com.epmet.dto.DimAgencyDTO;
+import com.epmet.dto.DimDepartmentDTO;
 import com.epmet.dto.DimGridDTO;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.form.user.UserIncrTrendFormDTO;
@@ -454,6 +455,32 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
         return resultList;
     }
 
+    @Override
+    public UserAgencyInfoResultDTO checkSubList() {
+        //获取用户所属机关id
+        String myAgencyId = this.getMyAgency();
+        UserAgencyInfoResultDTO userAgencyInfoResultDTO=new UserAgencyInfoResultDTO();
+        userAgencyInfoResultDTO.setSubAgencyFlag(false);
+        userAgencyInfoResultDTO.setSubGridFlag(false);
+        userAgencyInfoResultDTO.setSubDepartmentFlag(false);
+        List<DimAgencyDTO> subAgencyList=userAnalysisDao.selectSubAgencyList(myAgencyId);
+        if(null!=subAgencyList&&subAgencyList.size()>0){
+            userAgencyInfoResultDTO.setSubAgencyFlag(true);
+        }
+        List<DimGridDTO> subGridList=userAnalysisDao.selectSubGridList(myAgencyId);
+        if(null!=subGridList&&subGridList.size()>0){
+            userAgencyInfoResultDTO.setSubGridFlag(true);
+        }
+        List<DimDepartmentDTO> subDepartmentList=userAnalysisDao.selectSubDepartmentList(myAgencyId);
+        if(null!=subDepartmentList&&subDepartmentList.size()>0){
+            userAgencyInfoResultDTO.setSubDepartmentFlag(true);
+        }
+        userAgencyInfoResultDTO.setSubAgencyList(subAgencyList);
+        userAgencyInfoResultDTO.setSubGridList(subGridList);
+        userAgencyInfoResultDTO.setSubDepartmentList(subDepartmentList);
+        return userAgencyInfoResultDTO;
+    }
+
     private List<UserIncrTrendResultDTO> initUserIncrTrendResultDTO(String type) {
         List<UserIncrTrendResultDTO> list=new ArrayList<>();
         if(UserAnalysisConstant.DAY_TYPE.equals(type)){

epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -220,4 +220,16 @@
             m.MONTH_ID DESC
             LIMIT 12
     </select>
+
+    <!--   查询机关下的部门列表  -->
+    <select id="selectSubDepartmentList" parameterType="java.lang.String" resultType="com.epmet.dto.DimDepartmentDTO">
+        SELECT
+            dd.id,
+            dd.DEPARTMENT_NAME
+        FROM
+            dim_department dd
+        WHERE
+            dd.DEL_FLAG = '0'
+            AND dd.AGENCY_ID =#{agencyId}
+    </select>
 </mapper>