处理拉取代码冲突

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.user.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @program: esua-epdc-cloud
@@ -30,4 +31,14 @@ public class UserAnalysisCountDTO implements Serializable {
      **/
     private Integer userCount;
 
+    /**
+     *   党员认证率
+     **/
+    private BigDecimal partyMemberPercent;
+
+    /**
+     *   居民认证率
+     **/
+    private BigDecimal residentPercent;
+
 }

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

@@ -16,11 +16,13 @@ import com.elink.esua.epdc.dto.user.UserAnalysisDTO;
 import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO;
 import com.elink.esua.epdc.dto.user.form.UserCountDTO;
 import com.elink.esua.epdc.dto.user.result.*;
+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;
@@ -35,6 +37,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) {
@@ -157,8 +161,13 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl<UserAnalysisDao, Us
      */
     @Override
     public Result getUserStatistics(UserCountDTO formDto) {
-        UserAnalysisCountDTO message = baseDao.getUserStatistics(formDto, SecurityUser.getUser().getDeptIdList());
+        if(formDto.getDeptId()!=null && !"".equals(formDto.getDeptId())){
-        return new Result<UserAnalysisCountDTO>().ok(message);
+            UserAnalysisCountDTO message = baseDao.getUserStatistics(formDto, SecurityUser.getUser().getDeptIdList());
+            return new Result<UserAnalysisCountDTO>().ok(message);
+        }else{
+            UserAnalysisCountDTO message = baseDao.getUserStatistics(formDto, null);
+            return new Result<UserAnalysisCountDTO>().ok(message);
+        }
     }
 
 

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

@@ -41,7 +41,7 @@ FROM (
 				AND uu.PARTY_FLAG = '1'
 				AND ad.id IS NOT NULL
 				<if test="formDto.deptId != null and formDto.deptId !=''">
-					AND ad2.id = #{formDto.deptId}
+					AND (ad2.id = #{formDto.deptId} or ad.id = #{formDto.deptId} or ad1.id = #{formDto.deptId} )
 				</if>
                 AND ad2.id IN
                 <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">

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

@@ -174,9 +174,11 @@
     <select id="getUserStatistics" resultType="com.elink.esua.epdc.dto.user.result.UserAnalysisCountDTO"
             parameterType="com.elink.esua.epdc.dto.user.form.UserCountDTO">
         SELECT
-        t.userCount,
+        t.userCount as allUserCount,
         t.partyMemberCount,
-        t.residentCount - t.partyMemberCount allUserCount
+        t.residentCount userCount,
+        round(t.partyMemberCount/t.userCount,2) as partyMemberPercent,
+        round(t.residentCount/t.userCount,2) as residentPercent
         FROM
         (
         SELECT
@@ -188,18 +190,16 @@
         LEFT JOIN esua_epdc_admin.sys_dept ad ON u.DEPT_ID = ad.ID
         AND ad.type_key = 'grid_party'
         LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad.pid = ad1.id
-        LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad1.pid = ad2.id
         WHERE
         u.DEL_FLAG = '0'
-        AND ad.id IS NOT NULL
         <if test="deptIdList != null and deptIdList.size() > 0">
-            and ad2.ID in
+            and ad.ID in
             <foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">
                 #{deptIdItem}
             </foreach>
         </if>
         <if test='formDto.deptId != null and formDto.deptId != ""'>
-            AND ad2.id = #{formDto.deptId}
+            AND ( ad1.id = #{formDto.deptId} or ad.id = #{formDto.deptId})
         </if>
 
         )t
@@ -225,7 +225,7 @@
         </if>
 
         <if test='formDto.deptId != null and formDto.deptId != ""'>
-            AND ad2.id = #{formDto.deptId}
+            AND (ad.id = #{formDto.deptId} or ad1.id = #{formDto.deptId} or ad2.id = #{formDto.deptId})
         </if>
         ORDER BY
         ad.create_date ASC
@@ -263,7 +263,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

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

@@ -41,7 +41,7 @@ FROM (
 				AND uu.PARTY_FLAG = '1'
 				AND ad.id IS NOT NULL
 				<if test="formDto.deptId != null and formDto.deptId !=''">
-					AND ad2.id = #{formDto.deptId}
+					AND (ad2.id = #{formDto.deptId} or ad.id = #{formDto.deptId} or ad1.id = #{formDto.deptId} )
 				</if>
 				AND ad2.id IN
 				<foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">