getScheduleAndActCount

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java

@@ -44,5 +44,5 @@ public class HomeMonthTotalFormDTO implements Serializable {
      */
     private String agencyId;
 
-    private String path;
+    // private String path;
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java

@@ -122,11 +122,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
     public List<HomeMonthTotalResultDTO> getHomeMonthTotal(HomeMonthTotalFormDTO formDTO) {
         CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
         formDTO.setAgencyId(staffInfo.getAgencyId());
-        IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId());
+        // IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId());
-        if (null == icPartyOrgDTO){
+        // if (null == icPartyOrgDTO){
-            throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId());
+        //     throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId());
-        }
+        // }
-        formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId()));
+        // formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId()));
         List<HomeMonthTotalResultDTO> result = constructMonthData(formDTO.getYearId());
         List<HomeMonthTotalResultDTO> countList = scheduleDao.getScheduleAndActCount(formDTO);
         if (CollectionUtils.isNotEmpty(countList)){

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml

@@ -40,7 +40,7 @@
                <if test=' isSelf == "1" '>
                    AND PUBLISH_STAFF_ID = #{staffId}
                </if>
-               AND PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%')
+               AND (PUBLISH_PARTY_ORG_ID = #{orgId} or PUBLISH_ORG_PATH LIKE CONCAT('%',#{orgId},'%'))
              GROUP BY HOLD_MONTH_ID)t
         GROUP BY t.monthId
     </select>