已报名

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyActivityController.java

@@ -316,4 +316,21 @@ public class IcPartyActivityController implements ResultDataResolver {
                         formDTO.getAgencyId(),
                         formDTO.getUserId()));
     }
+
+    /**
+     * 居民端钉钉，已报名列表
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("applied-act")
+    public Result<PageData<PartyActivityResDTO>> appliedAct(@RequestBody PartyActivityFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, PartyActivityFormDTO.ResiDingQueryInternalGroup.class);
+        return new Result<PageData<PartyActivityResDTO>>().ok(
+                icPartyActivityService.appliedAct(formDTO.getPageNo(),
+                        formDTO.getPageSize(),
+                        formDTO.getGridId(),
+                        formDTO.getAgencyId(),
+                        formDTO.getUserId()));
+    }
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPartyActivityDao.java

@@ -68,4 +68,17 @@ public interface IcPartyActivityDao extends BaseDao<IcPartyActivityEntity> {
                                          @Param("gridId") String gridId,
                                          @Param("agencyId")String agencyId,
                                          @Param("userId")String userId);
+
+    /**
+     * 居民端钉钉，已报名列表
+     * @param customerId
+     * @param gridId
+     * @param agencyId
+     * @param userId
+     * @return
+     */
+    List<PartyActivityResDTO> selectAppliedAct(@Param("customerId")String customerId,
+                                               @Param("gridId") String gridId,
+                                               @Param("agencyId")String agencyId,
+                                               @Param("userId")String userId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyActivityService.java

@@ -164,4 +164,19 @@ public interface IcPartyActivityService extends BaseService<IcPartyActivityEntit
      * @return
      */
     PageData<PartyActivityResDTO> pageAllAct(Integer pageNo, Integer pageSize, String gridId, String agencyId,String userId);
+
+    /**
+     * 居民端钉钉，已报名列表
+     * @param pageNo
+     * @param pageSize
+     * @param gridId
+     * @param agencyId
+     * @param userId
+     * @return
+     */
+    PageData<PartyActivityResDTO> appliedAct(Integer pageNo,
+                                             Integer pageSize,
+                                             String gridId,
+                                             String agencyId,
+                                             String userId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java

@@ -650,4 +650,33 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
         PageInfo<PartyActivityResDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal(),pageSize);
     }
+
+    /**
+     * 居民端钉钉，已报名列表
+     *
+     * @param pageNo
+     * @param pageSize
+     * @param gridId
+     * @param agencyId
+     * @param userId
+     * @return
+     */
+    @Override
+    public PageData<PartyActivityResDTO> appliedAct(Integer pageNo, Integer pageSize, String gridId, String agencyId, String userId) {
+        PageHelper.startPage(pageNo, pageSize);
+        List<PartyActivityResDTO> list = baseDao.selectAppliedAct(EpmetRequestHolder.getLoginUserCustomerId(), gridId, agencyId, userId);
+        list.forEach(resDTO -> {
+            // 主办方:组织名称
+            AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(resDTO.getAgencyId());
+            if (null != agencyInfoCache) {
+                resDTO.setAgencyName(agencyInfoCache.getOrganizationName());
+            }
+            // 联建单位：
+            resDTO.setUnitNameList(icActivityUnitRelationService.getActivityUntiNames(resDTO.getActivityId()));
+            // 服务事项
+            resDTO.setServiceMatterNameList(SpringContextUtils.getBean(IcServiceItemDictService.class).getByActivityId(resDTO.getActivityId(), EpmetRequestHolder.getLoginUserCustomerId()));
+        });
+        PageInfo<PartyActivityResDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal(), pageSize);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml

@@ -204,4 +204,43 @@
         )
         order by a.ACTIVITY_END_TIME desc,a.CREATED_TIME desc
     </select>
+
+    <!--  居民端钉钉，已报名列表  -->
+    <select id="selectAppliedAct" parameterType="map" resultType="com.epmet.dto.result.PartyActivityResDTO">
+        select
+            a.ID as activityId,
+            a.AGENCY_ID,
+            '' as agencyName,
+            a.TITLE,
+            a.TARGET,
+            a.CONTENT,
+            a.PEOPLE_COUNT,
+            a.ACTIVITY_TIME,
+            a.ACTIVITY_END_TIME,
+            a.COVER_URL,
+            a.ADDRESS,
+            a.RESULT,
+            su.id as signUpId,
+            1 as signUpFlag,
+            (
+                select count(s.id)
+                from ic_party_activity_sign_up_record s
+                where s.ACTIVITY_ID=a.id
+                  and s.DEL_FLAG='0'
+            )as signUpCount
+        from ic_party_activity_sign_up_record su
+        inner join ic_party_activity a
+            on(su.ACTIVITY_ID=a.ID)
+        where su.DEL_FLAG='0'
+          and a.DEL_FLAG='0'
+          and su.CUSTOMER_ID = #{customerId}
+          and su.USER_ID = #{userId}
+          and (a.GRID_ID = #{gridId}
+                or a.AGENCY_ID = #{agencyId}
+                or a.PIDS like concat('%',#{agencyId},'%')
+            )
+        order by a.ACTIVITY_END_TIME desc,a.CREATED_TIME desc
+    </select>
+
+
 </mapper>