From 2b1cfe0e7e3041e1bf8a9c1b14ec0dddf85f9dae Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 19 Aug 2022 17:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcPartyActServiceImpl.java   | 46 ++++++++++++-------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
index c6d123626f..0a1c09f318 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java
@@ -239,13 +239,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
      */
     @Override
     public ActAndScheduleListResultDTO getActAndScheduleList(ActAndScheduleListFormDTO formDTO) {
-        CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(),formDTO.getStaffId());
-        formDTO.setAgencyId(staffInfo.getAgencyId());
-        IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId());
-        if (null == icPartyOrgDTO){
-            throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId());
-        }
-        formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId()));
+        disposeActAndScheduleListFormDTO(formDTO);
         List<ActAndScheduleListResultDTO.ActivityListDTO> activityList = baseDao.getActivityList(formDTO);
         if (CollectionUtils.isNotEmpty(activityList)){
             disposeActivityList(formDTO,activityList);
@@ -270,16 +264,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
      */
     @Override
     public List<ActAndScheduleListResultDTO> homeSearch(ActAndScheduleListFormDTO formDTO) {
-        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
-        if (null == staffInfo){
-            throw new EpmetException("查询工作人员失败："+formDTO.getStaffId());
-        }
-        formDTO.setAgencyId(staffInfo.getAgencyId());
-        IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId());
-        if (null == icPartyOrgDTO){
-            throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId());
-        }
-        formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId()));
+        disposeActAndScheduleListFormDTO(formDTO);
         List<ActAndScheduleListResultDTO> result = constructHomeSearchData(formDTO.getStartDate(), formDTO.getEndDate());
         List<ActAndScheduleListResultDTO.ActivityListDTO> activityList = baseDao.getActivityList(formDTO);
         if (CollectionUtils.isNotEmpty(activityList)){
@@ -312,6 +297,33 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         return result;
     }
 
+    /**
+     * Desc:
+     * @param formDTO
+     * @author zxc
+     * @date 2022/8/19 17:26
+     */
+    public void disposeActAndScheduleListFormDTO(ActAndScheduleListFormDTO formDTO){
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null == staffInfo){
+            throw new EpmetException("查询工作人员失败："+formDTO.getStaffId());
+        }
+        formDTO.setAgencyId(staffInfo.getAgencyId());
+        IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId());
+        if (null == icPartyOrgDTO){
+            throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId());
+        }
+        formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId()));
+
+    }
+
+    /**
+     * Desc: 组装activityList
+     * @param formDTO
+     * @param activityList
+     * @author zxc
+     * @date 2022/8/19 17:19
+     */
     public void disposeActivityList(ActAndScheduleListFormDTO formDTO,List<ActAndScheduleListResultDTO.ActivityListDTO> activityList){
         List<String> partyOrgIdsNoDistinct = new ArrayList<>();
         activityList.forEach(a -> {