分析模块bug

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml

@@ -53,6 +53,12 @@
             <artifactId>epdc-commons-api-version-control</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-admin-client</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@@ -0,0 +1,42 @@
+package com.elink.esua.epdc.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/5 14:44
+ */
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
+public interface AdminFeignClient {
+
+    /**
+     * 根据部门ID，获取下属所有网格ID
+     *
+     * @param pid
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < java.lang.Long>>
+     * @author yujintao
+     * @date 2019/9/5 14:49
+     */
+    @GetMapping("/sys/dept/listGridId/{pid}")
+    Result<List<Long>> listGridIdByDeptPid(@PathVariable("pid") Long pid);
+
+    /**
+     * 根据部门ID获取上级所有部门信息
+     *
+     * @param deptId
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<ParentAndAllDeptDTO>
+     * @author gp
+     * @date 2019-11-29
+     */
+    @GetMapping("/sys/dept/getParentAndAllDept/{deptId}")
+    Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") String deptId);
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
+import com.elink.esua.epdc.feign.AdminFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/5 14:44
+ */
+@Component
+public class AdminFeignClientFallback implements AdminFeignClient {
+
+    @Override
+    public Result<List<Long>> listGridIdByDeptPid(Long pid) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listGridIdByDeptPid", pid);
+    }
+
+    @Override
+    public Result<ParentAndAllDeptDTO> getParentAndAllDept(String depId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", depId);
+    }
+}

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java

@@ -20,11 +20,13 @@ import com.elink.esua.epdc.dto.user.result.GriddingCountDTO;
 import com.elink.esua.epdc.dto.user.result.UserAnalysisCountDTO;
 import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO;
 import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO;
+import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.user.dao.UserAnalysisDao;
 import com.elink.esua.epdc.modules.user.service.UserAnalysisService;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -39,6 +41,8 @@ import java.util.Map;
 @Slf4j
 @Service
 public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, UserAnalysisDTO> implements UserAnalysisService {
+    @Autowired
+    private AdminFeignClient ademinFeignClient;
 
     @Override
     public PageData<GridOpeningResultDTO> listPageGridOpening(Map<String, Object> params) {

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -278,7 +278,7 @@
         </if>
 
         <if test='formDto.deptId != null and formDto.deptId != ""'>
-            AND ad2.id = #{formDto.deptId}
+            AND (ad2.id = #{formDto.deptId} or ad1.id = #{formDto.deptId} or ad.id = #{formDto.deptId})
         </if>
         GROUP BY
         ad2.ID