From e7d4e4a302cb83f850aed410bcc8da7e2e4187f9 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 7 Apr 2023 14:59:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/AgencyCountCensusResultDTO.java | 3 ++ .../controller/CustomerAgencyController.java | 11 ++++++- .../java/com/epmet/dao/CustomerAgencyDao.java | 6 +++- .../epmet/service/CustomerAgencyService.java | 6 ++++ .../impl/CustomerAgencyServiceImpl.java | 33 +++++++++++-------- .../resources/mapper/CustomerAgencyDao.xml | 27 +++++++++++++-- 6 files changed, 68 insertions(+), 18 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyCountCensusResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyCountCensusResultDTO.java index 9f453b4a09..4599d00793 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyCountCensusResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyCountCensusResultDTO.java @@ -1,5 +1,7 @@ package com.epmet.dto.result; +import lombok.Data; + import java.io.Serializable; /** @@ -8,6 +10,7 @@ import java.io.Serializable; * @Date 2023/4/6 16:46 * @Author lichao **/ +@Data public class AgencyCountCensusResultDTO implements Serializable { private static final long serialVersionUID = 4360690752084258055L; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 2f70dc04ce..b60cf26230 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -517,7 +517,13 @@ public class CustomerAgencyController { return customerAgencyService.getCurrentUserCommunityInfo(tokenDTO); } - + /** + * @Description: 返回下级数量统计 + * @param agencyId: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/4/7 14:48 + */ @GetMapping("getAgencyCountList") public Result> getAgencyCountList(@RequestParam String agencyId){ return new Result>().ok(customerAgencyService.getAgencyCountList(agencyId)); @@ -525,4 +531,7 @@ public class CustomerAgencyController { + + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 7d01383272..ef13f0573d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -430,6 +430,10 @@ public interface CustomerAgencyDao extends BaseDao { */ List getAllCommunity(String customerId); - Integer agencyCount(@Param("pids") String pids,@Param("level") String level); + List agencyCount(@Param("pids") String pids); + + Integer agencyGridCount(@Param("pids") String pids); + + Integer agencyStaffCount(@Param("pids") String pids); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index d80ec62617..0426634026 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -362,5 +362,11 @@ public interface CustomerAgencyService extends BaseService * @return */ String getOrgIdPath(String orgId); + + /** + * 返回下级数量 + * @param agencyId + * @return + */ List getAgencyCountList(String agencyId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 67f97aeb0c..aac48182eb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -37,6 +37,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.PidUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.CustomerAgencyConstant; import com.epmet.constant.CustomerGridConstant; @@ -1624,6 +1625,14 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl + * @Author: lichao + * @Date: 2023/4/7 14:17 + */ @Override public List getAgencyCountList(String agencyId) { @@ -1631,23 +1640,21 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl - - select count(*) + select level,count(*) from customer_agency where DEL_FLAG = 0 - and LEVEL = #{level} and PIDS like concat(#{pids},'%') + group by level + + + + + + From b4421edf19630fd2855c40ba4639bc3e3d66df89 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Apr 2023 15:33:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E4=BD=8F=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/StaffLoginLogDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index 6ed487ad44..01bca24b0f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -49,7 +49,7 @@ and l.LOGIN_TIME <= #{endDate} GROUP BY ca.id - order by count(l.id) desc + order by count(l.id) desc,ca.CREATED_TIME desc