diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java new file mode 100644 index 000000000..fc43ff372 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/GridDataTotalResultDTO.java @@ -0,0 +1,23 @@ +package com.elink.esua.epdc.dto.user.result; + +import lombok.Data; + +/** + * 已开通网格 用户数据总计 + * + * @author work@yujt.net.cn + * @date 2020/2/13 13:46 + */ +@Data +public class GridDataTotalResultDTO extends GridOpeningResultDTO { + + /** + * 已开通网格数 + */ + private Integer workGridCount; + /** + * 未开通网格数 + */ + private Integer unWorkGridCount; + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java index d53f876da..a258488d3 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/result/UserAnalysisCountDTO.java +++ b/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; + } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml index f90067871..7684d5b03 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml @@ -53,6 +53,12 @@ epdc-commons-api-version-control ${project.version} + + com.esua.epdc + epdc-admin-client + 1.0.0 + compile + diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java new file mode 100644 index 000000000..c6cae13f5 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/excel/GridOpiningExcel.java @@ -0,0 +1,48 @@ +package com.elink.esua.epdc.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author: qushutong + * @Date: 2020/2/13 15:23 + * @Description: 网格开通导出 + */ +@Data +public class GridOpiningExcel { + @Excel(name = "网格名称") + private String allDeptName; + + @Excel(name = "网格党建指导员姓名") + private String gridLeader; + + @Excel(name = "注册用户数") + private Integer registerCount; + + @Excel(name = "注册党员数") + private Integer partyCount; + + @Excel(name = "新闻发布数") + private Integer newsCount; + + @Excel(name = "社群数") + private Integer communityCount; + + @Excel(name = "群成员数") + private Integer communityMemberCount; + + @Excel(name = "话题数") + private Integer communityTopicCount; + + @Excel(name = "项目数") + private Integer itemCount; + + @Excel(name = "项目关闭数") + private Integer itemCloseCount; + + @Excel(name = "议题数") + private Integer eventCount; + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java new file mode 100644 index 000000000..7655e329c --- /dev/null +++ b/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> + * @author yujintao + * @date 2019/9/5 14:49 + */ + @GetMapping("/sys/dept/listGridId/{pid}") + Result> listGridIdByDeptPid(@PathVariable("pid") Long pid); + + /** + * 根据部门ID获取上级所有部门信息 + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author gp + * @date 2019-11-29 + */ + @GetMapping("/sys/dept/getParentAndAllDept/{deptId}") + Result getParentAndAllDept(@PathVariable("deptId") String deptId); +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java new file mode 100644 index 000000000..7ec1c523a --- /dev/null +++ b/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> listGridIdByDeptPid(Long pid) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listGridIdByDeptPid", pid); + } + + @Override + public Result getParentAndAllDept(String depId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", depId); + } +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java index 6bc576381..9974509fb 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/controller/UserAnalysisController.java @@ -12,6 +12,7 @@ import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO; import com.elink.esua.epdc.dto.user.result.OldMemberRankResultDTO; import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO; import com.elink.esua.epdc.dto.user.result.YoungMemberRankResultDTO; +import com.elink.esua.epdc.excel.GridOpiningExcel; import com.elink.esua.epdc.modules.user.service.OldMemberRankService; import com.elink.esua.epdc.modules.user.service.YoungMemberRankService; import org.springframework.beans.factory.annotation.Autowired; @@ -19,14 +20,15 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.excel.PartyAnalysExcel; import com.elink.esua.epdc.excel.RegisterExcel; import com.elink.esua.epdc.modules.user.service.UserAnalysisService; + import java.util.List; import java.util.Map; + import org.springframework.web.bind.annotation.RequestParam; + import javax.servlet.http.HttpServletResponse; /** @@ -62,10 +64,25 @@ public class UserAnalysisController { PageData pageData = userAnalysisService.pageUserDataRank(params); return new Result().ok(pageData); } + + /** + * 网格开通数据总计（pc端网格开通情况，数据总计） + * + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2020/2/13 14:22 + */ + @GetMapping("pageGridDataToal") + public Result selectGridDataTotal(@RequestParam Map params) { + GridDataTotalResultDTO result = userAnalysisService.selectGridDataTotal(params); + return new Result().ok(result); + } + /*** * 开通网格分页 * @param params - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2020/2/11 16:01 */ @@ -74,36 +91,39 @@ public class UserAnalysisController { PageData page = userAnalysisService.listPageGridOpening(params); return new Result>().ok(page); } + /** - * @Description 党员老龄化列表 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description 党员老龄化列表 * @Author songyunpeng - * @Date 2020/2/11 + * @Date 2020/2/11 * @Param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ @GetMapping("partyMemberOldSort") public Result> listOldMemberRankByDeptId(@RequestBody MemberRankFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return this.oldMemberRankService.listOldMemberRankByDeptId(formDto); } + /** - * @Description 党员年轻化列表 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description 党员年轻化列表 * @Author songyunpeng - * @Date 2020/2/11 + * @Date 2020/2/11 * @Param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ @GetMapping("partyMemberYoungSort") public Result> listYoungMemberRankByDeptId(@RequestBody MemberRankFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return this.youngMemberRankService.listYoungMemberRankByDeptId(formDto); } + /** - * @Description 注册用户数排名 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description 注册用户数排名 * @Author lpf - * @Date 2020/2/11 + * @Date 2020/2/11 * @Param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ @GetMapping("userRegisterSort") public Result> userRegisterSort(@RequestBody UserSortRankFormDTO formDto) { @@ -112,12 +132,12 @@ public class UserAnalysisController { } /** - *用户数据统计 + * 用户数据统计 * - * @author wangtong - * @date 2020/2/11 11:57 * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author wangtong + * @date 2020/2/11 11:57 */ @GetMapping("getUserStatistics") public Result getUserStatistics(@RequestBody UserCountDTO formDto) { @@ -126,18 +146,19 @@ public class UserAnalysisController { } /** - *网格开通状况 + * 网格开通状况 * - * @author wangtong - * @date 2020/2/11 14:26 * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author wangtong + * @date 2020/2/11 14:26 */ @GetMapping("getGridStatistics") - public Result getGridStatistics(@RequestBody UserCountDTO formDto) { + public Result getGridStatistics(@RequestBody UserCountDTO formDto) { ValidatorUtils.validateEntity(formDto); return userAnalysisService.getGridStatistics(formDto); } + /*** * 注册用户总数排名分析导出 * @param params @@ -178,6 +199,6 @@ public class UserAnalysisController { @GetMapping("export/grid0pining") public void exportGridOpining(@RequestParam Map params, HttpServletResponse response) throws Exception { PageData page = userAnalysisService.listPageGridOpening(params); - ExcelUtils.exportExcelToTarget(response, "开通网格情况", page.getList(), PartyAnalysExcel.class); + ExcelUtils.exportExcelToTarget(response, "开通网格情况", page.getList(), GridOpiningExcel.class); } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java index 1e15e61ed..02115e6ab 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/dao/UserAnalysisDao.java @@ -4,11 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.elink.esua.epdc.dto.user.UserAnalysisDTO; import com.elink.esua.epdc.dto.user.form.UserCountDTO; import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO; -import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO; -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.dto.user.result.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -131,4 +127,22 @@ public interface UserAnalysisDao extends BaseMapper { * @date 2020/2/13 11:18 */ List selectListNewsNoticeEventCount(Map params); + + /** + * 查询已开通网格数和未开通网格数 + * @param params + * @return com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO + * @author work@yujt.net.cn + * @date 2020/2/13 13:50 + */ + GridDataTotalResultDTO selectCountGridWorkOrNot(Map params); + + /** + * 查询用户注册数，党员注册，居民注册数 + * @param params + * @return com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO + * @author work@yujt.net.cn + * @date 2020/2/13 14:11 + */ + GridDataTotalResultDTO selectUserRegisterDataCount(Map params); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java index d0da3ad30..04bfa080a 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/UserAnalysisService.java @@ -3,8 +3,8 @@ package com.elink.esua.epdc.modules.user.service; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.user.form.UserSortRankFormDTO; -import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.user.form.UserCountDTO; +import com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO; import com.elink.esua.epdc.dto.user.result.GridOpeningResultDTO; import com.elink.esua.epdc.dto.user.result.UserDataRankResultDTO; import com.elink.esua.epdc.dto.user.result.UserSortRankResultDTO; @@ -40,33 +40,42 @@ public interface UserAnalysisService { PageData pageUserDataRank(Map params); /** - * @Description 注册用户数排名 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description 注册用户数排名 * @Author lpf - * @Date 2020/2/11 + * @Date 2020/2/11 * @Param [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ Result> userRegisterSort(UserSortRankFormDTO formDto); /** - *用户数据统计 + * 用户数据统计 * - * @author wangtong - * @date 2020/2/11 17:14 * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author wangtong + * @date 2020/2/11 17:14 */ Result getUserStatistics(UserCountDTO formDto); /** - *网格开通状况 + * 网格开通状况 * - * @author wangtong - * @date 2020/2/11 17:15 * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author wangtong + * @date 2020/2/11 17:15 */ Result getGridStatistics(UserCountDTO formDto); + /** + * 网格开通数据总计 + * + * @param params + * @return com.elink.esua.epdc.dto.user.result.GridDataTotalResultDTO + * @author work@yujt.net.cn + * @date 2020/2/13 14:22 + */ + GridDataTotalResultDTO selectGridDataTotal(Map params); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java index 32c8898b8..86dc25d04 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/UserAnalysisServiceImpl.java @@ -15,16 +15,14 @@ import com.elink.esua.epdc.datasources.annotation.DataSource; 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.GridOpeningResultDTO; -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.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; @@ -39,6 +37,8 @@ import java.util.Map; @Slf4j @Service public class UserAnalysisServiceImpl extends BaseServiceImpl implements UserAnalysisService { + @Autowired + private AdminFeignClient ademinFeignClient; @Override public PageData listPageGridOpening(Map params) { @@ -75,6 +75,7 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl().ok(message); + if(formDto.getDeptId()!=null && !"".equals(formDto.getDeptId())){ + UserAnalysisCountDTO message = baseDao.getUserStatistics(formDto, SecurityUser.getUser().getDeptIdList()); + return new Result().ok(message); + }else{ + UserAnalysisCountDTO message = baseDao.getUserStatistics(formDto, null); + return new Result().ok(message); + } } @@ -183,4 +192,23 @@ public class UserAnalysisServiceImpl extends BaseServiceImpl data = baseDao.userRegisterSort(formDto, SecurityUser.getUser().getDeptIdList()); return new Result>().ok(data); } + + @Override + public GridDataTotalResultDTO selectGridDataTotal(Map params) { + + params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); + + // 网格开通数，网格未开通数 + GridDataTotalResultDTO gridWorkOrNot = baseDao.selectCountGridWorkOrNot(params); + // 用户注册数，党员注册，居民注册数 + GridDataTotalResultDTO registerDataCount = baseDao.selectUserRegisterDataCount(params); + + GridDataTotalResultDTO result = new GridDataTotalResultDTO(); + result.setWorkGridCount(gridWorkOrNot.getWorkGridCount()); + result.setUnWorkGridCount(gridWorkOrNot.getUnWorkGridCount()); + result.setResidentCount(registerDataCount.getResidentCount()); + result.setRegisterCount(registerDataCount.getRegisterCount()); + result.setPartyCount(registerDataCount.getPartyCount()); + return null; + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/OldMemberRankDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/OldMemberRankDao.xml index b784d92a7..0fdd5c8a6 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/OldMemberRankDao.xml +++ b/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 - AND ad2.id = #{formDto.deptId} + AND (ad2.id = #{formDto.deptId} or ad.id = #{formDto.deptId} or ad1.id = #{formDto.deptId} ) AND ad2.id IN diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml index 3dd6ce38b..5ffc16f38 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml @@ -29,8 +29,7 @@ FROM esua_epdc_user.epdc_user uu LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.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 uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '1' @@ -49,21 +48,11 @@ ) t ) t1 - - order by t1.oldCount desc - - - order by t1.youngCount desc - - - order by t1.oldCount asc - - - order by t1.youngCount asc - - - GROUP BY t1.streetId - + order by t1.oldCount desc + order by t1.youngCount desc + order by t1.oldCount asc + order by t1.youngCount asc + GROUP BY t1.streetId @@ -75,10 +64,8 @@ FROM esua_epdc_user.epdc_user uu LEFT JOIN esua_epdc_user.epdc_party_authentication_failed uf ON uu.id = uf.user_id - LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.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 + LEFT JOIN esua_epdc_admin.sys_dept ad ON uu.DEPT_ID = ad.ID AND ad.type_key = 'grid_party' + WHERE uu.DEL_FLAG = '0' AND uu.PARTY_FLAG = '0' @@ -109,8 +96,7 @@ ad.type_key = 'grid_party' AND ad.del_flag = 0 ) t0 - LEFT JOIN esua_epdc_user.epdc_user_grid_relation ug ON ug.GRID_ID = t0.id - AND ug.DEL_FLAG = '0' + LEFT JOIN esua_epdc_user.epdc_user_grid_relation ug ON ug.GRID_ID = t0.id AND ug.DEL_FLAG = '0' LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = t0.pid LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid GROUP BY @@ -188,9 +174,11 @@ + + + + + + esua_epdc_admin.sys_dept ad + + + + + LEFT JOIN esua_epdc_admin.sys_dept ad1 ON ad1.id = ad.pid + LEFT JOIN esua_epdc_admin.sys_dept ad2 ON ad2.id = ad1.pid + diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/YoungMemberRankDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/YoungMemberRankDao.xml index c99d14b72..104a49d9a 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/YoungMemberRankDao.xml +++ b/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 - AND ad2.id = #{formDto.deptId} + AND (ad2.id = #{formDto.deptId} or ad.id = #{formDto.deptId} or ad1.id = #{formDto.deptId} ) AND ad2.id IN