diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java
new file mode 100644
index 0000000000..c78a205625
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java
@@ -0,0 +1,29 @@
+package com.epmet.resi.partymember.dto.partyOrg.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class IcPartyActListFormDTO implements Serializable {
+    /**
+     * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动；
+     */
+    private String actType;
+    /**
+     * 签到状态[已签到：signIn 未签到：unSignIn]
+     */
+    private String signIn;
+
+    //参加活动党组织ID,groupId
+    private String joinOrgId;
+
+    private Integer pageNo = 1;
+    private Integer pageSize = 20;
+    private Boolean isPage = false;
+
+    //token中信息
+    private String customerId;
+    private String userId;
+
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java
new file mode 100644
index 0000000000..29c968ba90
--- /dev/null
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java
@@ -0,0 +1,43 @@
+package com.epmet.resi.partymember.dto.partyOrg.result;
+
+import com.epmet.resi.partymember.dto.partymember.result.AdditionalInfoDTO;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@NoArgsConstructor
+@Data
+public class IcPartyActListResultDTO implements Serializable {
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 活动Id
+	 */
+	private String icPartyActId;
+	/**
+	 * 活动主题
+	 */
+	private String topic;
+	/**
+	 * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动；
+	 */
+	private String actType;
+	/**
+	 * 活动时间
+	 */
+	private String holdTime;
+	/**
+	 * 活动地点
+	 */
+	private String address;
+	/**
+	 * 签到状态[已签到：signIn 未签到：unSignIn]
+	 */
+	private String signIn;
+	/**
+	 * 签到状态名
+	 */
+	private String signInName;
+
+
+}
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java
index 0e52bdad31..004e86c2d2 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java
@@ -28,11 +28,9 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO;
+import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO;
-import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO;
-import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO;
-import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO;
-import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO;
+import com.epmet.resi.partymember.dto.partyOrg.result.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -288,4 +286,13 @@ public class IcPartyActController {
             }
         }
     }
+
+    @RequestMapping("list")
+    public Result<PageData<IcPartyActListResultDTO>> list(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActListFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<PageData<IcPartyActListResultDTO>>().ok(icPartyActService.list(formDTO));
+    }
+
+
 }
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java
index 7308aeb25a..5426dfc9e4 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java
@@ -6,7 +6,9 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO;
 import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO;
+import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO;
+import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyActListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -40,4 +42,6 @@ public interface IcPartyActDao extends BaseDao<IcPartyActEntity> {
     String selectActTypeName(@Param("customerId") String customerId,@Param("actType")String actType);
 
     int deleteIcPartyAct(@Param("customerId") String customerId, @Param("userId")String userId, @Param("icPartyActId")String icPartyActId);
+
+    List<IcPartyActListResultDTO> selectresiPartyActList(IcPartyActListFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java
index 434a0bf657..6bb134d35f 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java
@@ -11,11 +11,9 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO;
 import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO;
+import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO;
-import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO;
-import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO;
-import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO;
-import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO;
+import com.epmet.resi.partymember.dto.partyOrg.result.*;
 
 import java.util.List;
 import java.util.Map;
@@ -109,4 +107,7 @@ public interface IcPartyActService extends BaseService<IcPartyActEntity> {
     List<YearSearchResultDTO> yearSearch01(YearSearchFormDTO formDTO);
 
     List<YearSearchDetailResultDTO> yearSearch(YearSearchFormDTO formDTO);
+
+    PageData<IcPartyActListResultDTO> list(IcPartyActListFormDTO formDTO);
+
 }
\ No newline at end of file
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 c48ab658dd..a18b2161d4 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
@@ -24,6 +24,7 @@ import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.modules.partyOrg.dao.*;
 import com.epmet.modules.partyOrg.entity.*;
 import com.epmet.modules.partyOrg.service.*;
+import com.epmet.modules.partymember.dao.IcPartyMemberDao;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO;
@@ -35,11 +36,10 @@ import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO;
 import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO;
+import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO;
 import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO;
-import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO;
-import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO;
-import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO;
-import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO;
+import com.epmet.resi.partymember.dto.partyOrg.result.*;
+import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO;
 import com.epmet.send.SendMqMsgUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -79,6 +79,10 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
     private EpmetMessageOpenFeignClient messageOpenFeignClient;
     @Autowired
     private IcPartyActTypeDictService partyActTypeDictService;
+    @Autowired
+    private IcPartyMemberDao icPartyMemberDao;
+
+
     /**
      * 活动类型列表
      *
@@ -632,4 +636,21 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         });
 
     }
+
+    @Override
+    public PageData<IcPartyActListResultDTO> list(IcPartyActListFormDTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
+        //1.查询当前用户所属党支部信息
+        IcPartyInfoResultDTO dto = icPartyMemberDao.selectByUserId(formDTO.getUserId());
+        if(null == dto){
+            return new PageData<>(new ArrayList<>(), 0);
+        }
+        formDTO.setJoinOrgId(dto.getId());
+
+        //2.根据所属支部及查询条件筛选数据
+        List<IcPartyActListResultDTO> list = baseDao.selectresiPartyActList(formDTO);
+        PageInfo<IcPartyActListResultDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
index cd2b68d772..05cf3aab8a 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
@@ -159,6 +159,44 @@
             and d.type_key = #{actType}
     </select>
 
+    <select id="selectresiPartyActList" resultType="com.epmet.resi.partymember.dto.partyOrg.result.IcPartyActListResultDTO">
+        SELECT
+            ipa.id icPartyActId,
+            ipa.topic topic,
+            ipa.act_type actType,
+            ipa.hold_time holdTime,
+            ipa.address address,
+            IF(sign.id is null, 'unSignIn','signIn') signIn,
+            IF(sign.id is null, '未签到','已签到') signInName
+        FROM
+            ic_party_act ipa
+        INNER JOIN (
+            SELECT
+                ic_party_act_id
+            FROM
+                ic_party_act_org
+            WHERE
+                del_flag = '0'
+                <!-- 某个党支部或反向查询发布到的党支部 -->
+            AND (join_org_id = #{joinOrgId} or #{joinOrgId} LIKE join_org_path)
+            GROUP BY ic_party_act_id
+        ) a ON ipa.id = a.IC_PARTY_ACT_ID
+        <choose>
+            <when test="signIn == 'signIn'"><!-- 查询已签到时 -->
+                INNER JOIN ic_party_act_sign_in_record sign ON sign.del_flag = '0' AND ipa.id = sign.ic_party_act_id AND sign.epmet_user_id = #{userId}
+            </when>
+            <otherwise><!-- 查询未签到或无签到查询条件时 -->
+                LEFT JOIN ic_party_act_sign_in_record sign ON sign.del_flag = '0' AND ipa.id = sign.ic_party_act_id AND sign.epmet_user_id = #{userId}
+            </otherwise>
+        </choose>
+        WHERE
+            ipa.del_flag = '0'
+        <if test="null != actType and actType != ''">
+            AND ipa.act_type = #{actType}
+        </if>
+        ORDER BY ipa.hold_time DESC
+    </select>
+
     <update id="deleteIcPartyAct" parameterType="map">
         update ic_party_act
         set del_flag='1',