补全TODO

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java

@@ -109,4 +109,6 @@ public interface IcPartyOrgDao extends BaseDao<IcPartyOrgEntity> {
     List<ActAndScheduleListResultDTO.JoinOrgDTO> getPartyOrg(@Param("orgIds")List<String> orgIds);
 
     IcPartyOrgEntity selectDefaultPartyOrg(@Param("agencyId") String agencyId, @Param("level") String level);
+
+    List<String> getUserIdByPartyOrgIds(@Param("partyOrgIdList") List<String> partyOrgIdList);
 }

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

@@ -476,9 +476,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl<IcPartyActDao, IcPart
                 }
                 userIdList = result.getData().stream().map(ResiGroupMemberDTO::getCustomerUserId).collect(Collectors.toList());
             }
-            if (!CollectionUtils.isEmpty(groupIdList)) {
-                //TODO
+            if (!CollectionUtils.isEmpty(partyOrgIdList)) {
+                List<String> partyIdList = partyOrgDao.getUserIdByPartyOrgIds(partyOrgIdList);
+                userIdList.addAll(partyIdList);
             }
+            userIdList = userIdList.stream().distinct().collect(Collectors.toList());
 
             //组装消息
             for (String id : userIdList){

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java

@@ -30,6 +30,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.form.IcPartyMemberFormDTO;
 import com.epmet.dto.form.IcPartyMemberListFormDTO;
+import com.epmet.dto.form.ReadIcMessageFormDTO;
 import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.dto.result.PartyMemberAgeResultDTO;
 import com.epmet.dto.result.PartyMemberEducationResultDTO;
@@ -39,6 +40,7 @@ import com.epmet.modules.partymember.excel.IcPartyMemberExcel;
 import com.epmet.modules.partymember.service.IcPartyMemberService;
 import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO;
 import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO;
+import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO;
 import com.epmet.utils.ImportTaskUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -341,4 +343,15 @@ public class IcPartyMemberController implements ResultDataResolver {
         }
 
     }
+
+    /**
+     * @Author sun
+     * @Description 消息】未读消息数[居民/工作端共用]
+     **/
+    @PostMapping("partyinfo")
+    public Result<IcPartyInfoResultDTO> partyInfo(@LoginUser TokenDto tokenDto) {
+        return new Result<IcPartyInfoResultDTO>().ok(icPartyMemberService.partyInfo(tokenDto));
+    }
+
+
 }

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

@@ -185,4 +185,20 @@
         order by CREATED_TIME asc
         limit 1
     </select>
+
+    <select id="getUserIdByPartyOrgIds" resultType="java.lang.String">
+        SELECT
+            pi.user_id
+        FROM
+            ic_party_org ipo
+        INNER JOIN ic_party_member ipm ON ipm.del_flag = '0' AND ipo.id = ipm.sszb
+        INNER JOIN partymember_info pi ON pi.del_flag = '0' AND ipm.id_card = pi.id_card
+        WHERE
+            ipo.del_flag = '0'
+        <foreach collection="partyOrgIdList" item="id" open="AND ipo.id IN (" separator="," close=")">
+            #{id}
+        </foreach>
+        ORDER BY ipo.id
+    </select>
+
 </mapper>