baoming列表

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java

@@ -18,8 +18,16 @@ import java.util.Date;
 @Data
 public class PartyActivityFormDTO extends PageFormDTO implements Serializable {
     private static final long serialVersionUID = -2510068555703677L;
-    @NotBlank(message = "组织Id不能为空" )
+
+    public interface ResiDingQueryInternalGroup {
+    }
+
+
+    @NotBlank(message = "组织Id不能为空",groups = {ResiDingQueryInternalGroup.class})
     private String agencyId;
+
+    @NotBlank(message = "gridId不能为空",groups = {ResiDingQueryInternalGroup.class})
+
     private String gridId;
     private String unitId;
     private String title;
@@ -31,4 +39,10 @@ public class PartyActivityFormDTO extends PageFormDTO implements Serializable {
     // private Integer pageNo;
     // private Integer pageSize;
     private String customerId;
+
+    /**
+     * 居民端钉钉，传userId
+     */
+    @NotBlank(message = "userId不能为空",groups = {ResiDingQueryInternalGroup.class})
+    private String userId;
 }

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

@@ -300,4 +300,20 @@ public class IcPartyActivityController implements ResultDataResolver {
         return new Result<PartyActivityResDTO>().ok(icPartyActivityService.queryActDetailForResi(tokenDto.getCustomerId(),tokenDto.getUserId(),activityId));
     }
 
+    /**
+     * 居民端钉钉，分页查询联建活动
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("page-all-act")
+    public Result<PageData<PartyActivityResDTO>> pageAllAct(@RequestBody PartyActivityFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, PartyActivityFormDTO.ResiDingQueryInternalGroup.class);
+        return new Result<PageData<PartyActivityResDTO>>().ok(
+                icPartyActivityService.pageAllAct(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

@@ -20,8 +20,10 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.form.PartyActivityFormDTO;
 import com.epmet.dto.result.ActivityStatisticsDTO;
+import com.epmet.dto.result.PartyActivityResDTO;
 import com.epmet.entity.IcPartyActivityEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -54,4 +56,16 @@ public interface IcPartyActivityDao extends BaseDao<IcPartyActivityEntity> {
 
 
     List<IcPartyActivityEntity> getActivityList(PartyActivityFormDTO formDTO);
+
+    /**
+     *
+     * @param gridId 当前用户所在网格id
+     * @param agencyId 当前用户所在网格所属组织id
+     * @param userId 居民端用户id,校验当前用户是否报名
+     * @return 居民端钉钉-分页查询全部联建活动
+     */
+    List<PartyActivityResDTO> pageAllAct(@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

@@ -153,4 +153,15 @@ public interface IcPartyActivityService extends BaseService<IcPartyActivityEntit
      * @return
      */
     PartyActivityResDTO queryActDetailForResi(String customerId, String userId, String activityId);
+
+    /**
+     * 居民端钉钉-分页查询全部联建活动
+     *
+     * @param pageNo
+     * @param pageSize
+     * @param gridId
+     * @param userId
+     * @return
+     */
+    PageData<PartyActivityResDTO> pageAllAct(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

@@ -623,5 +623,31 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
     }
 
 
-
+    /**
+     * 居民端钉钉-分页查询全部联建活动
+     *
+     * @param pageNo
+     * @param pageSize
+     * @param gridId
+     * @param userId
+     * @return
+     */
+    @Override
+    public PageData<PartyActivityResDTO> pageAllAct(Integer pageNo, Integer pageSize, String gridId,String agencyId, String userId) {
+        PageHelper.startPage(pageNo,pageSize);
+        List<PartyActivityResDTO> list=baseDao.pageAllAct(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());
+    }
 }

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

@@ -164,4 +164,44 @@
     </select>
 
 
+    <!--  居民端钉钉-分页查询全部联建活动  -->
+    <select id="pageAllAct" 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,
+            (
+                case when su.id is null then 0
+                else 1
+                end
+            )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 a
+        left join ic_party_activity_sign_up_record su
+            on(a.id=su.ACTIVITY_ID
+                   and su.USER_ID=#{userId}
+                   and su.DEL_FLAG='0')
+        where a.DEL_FLAG='0'
+        and a.CUSTOMER_ID = #{customerId}
+        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>