From 4455a67f53d8cecbca3be1cd0054463c1d662b50 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 22 Aug 2022 09:23:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/partyOrg/dao/IcPartyActOrgDao.java  | 14 ++++++++++++++
 .../service/impl/IcPartyActServiceImpl.java     |  1 +
 .../mapper/partyOrg/IcPartyActOrgDao.xml        | 17 +++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java
index e38cde539a..09304e8ecb 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java
@@ -2,6 +2,7 @@ package com.epmet.modules.partyOrg.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity;
+import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,5 +17,18 @@ import java.util.List;
 @Mapper
 public interface IcPartyActOrgDao extends BaseDao<IcPartyActOrgEntity> {
 
+    /**
+     * 删除活动时，同时删除，参与活动党组织表
+     * @param customerId
+     * @param icPartyActIds
+     * @return
+     */
     int deleteByPartyActId(@Param("customerId") String customerId, @Param("icPartyActIds")List<String> icPartyActIds);
+
+    /**
+     * 查询活动的参与活动党组织列表
+     * @param icPartyActId
+     * @return
+     */
+    List<JoinOrgDTO> selectJoinOrgList(String icPartyActId);
 }
\ 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 3a7254f146..bab46cb4ff 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
@@ -258,6 +258,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
         resDTO.setJoinUserTypeName(NumConstant.ZERO_STR.equals(resDTO.getJoinUserType()) ? "全体党员" : "支部委员");
         resDTO.setAttachmentList(resiPartymemberAttachmentDao.selectListByBusinessId(icPartyActId));
         resDTO.setIsSignIn(SpringContextUtils.getBean(IcPartyActSignInRecordService.class).checkSignIn(icPartyActId,userId));
+        resDTO.setJoinOrgList(icPartyActOrgDao.selectJoinOrgList(icPartyActId));
         return resDTO;
     }
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml
index ce671cd13c..ad074e65ef 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml
@@ -9,4 +9,21 @@
             IC_PARTY_ACT_ID = #{icPartyActId}
         </foreach>
     </delete>
+
+    <select id="selectJoinOrgList" parameterType="java.lang.String" resultType="com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO">
+        SELECT
+            o.ID AS icPartyActOrgRecId,
+            o.JOIN_ORG_ID as joinOrgId,
+            o.JOIN_ORG_NAME as joinOrgName,
+            o.JOIN_ORG_PATH as joinOrgPath,
+            o.ORG_TYPE as orgType,
+            o.PID as pid,
+            o.CUSTOMER_ID as customerId,
+            o.IC_PARTY_ACT_ID as icPartyActOrgRecId
+        FROM
+            ic_party_act_org o
+        WHERE
+            o.DEL_FLAG = '0'
+          AND o.IC_PARTY_ACT_ID = #{icPartyActId}
+    </select>
 </mapper>
\ No newline at end of file