网格党建平面图服务需求

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

@@ -1734,16 +1734,23 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
      */
     @Override
     public PageData<DemandRecResultDTO> queryServiceList(ServiceListFormDTO formDTO) {
-        List<String> serverIds=new ArrayList<>();
-        if("community_org".equals(formDTO.getType())){
+        List<String> serverIds = new ArrayList<>();
+        if ("community_org".equals(formDTO.getType())) {
             serverIds.add(formDTO.getServerId());
-        }else if("volunteer".equals(formDTO.getType())){
-            //    根据身份证号查询ic_resi_user.id+epmetUserId
-            //    todo
+        } else if ("volunteer".equals(formDTO.getType())) {
+            // 根据身份证号查询ic_resi_user.id+epmetUserId
+            Result<List<String>> userIdRes = epmetUserOpenFeignClient.getAllUserIds(formDTO.getIdCard(), formDTO.getCustomerId());
+            if (!userIdRes.success()) {
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "根据身份证号查询用户id异常", EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg());
+            }
+            if (CollectionUtils.isNotEmpty(userIdRes.getData())) {
+                serverIds.addAll(userIdRes.getData());
+            }
         }
-        PageInfo<DemandRecResultDTO> pageInfo= PageHelper.startPage(formDTO.getPageNo(),
+        formDTO.setServerIds(serverIds);
+        PageInfo<DemandRecResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
                 formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryServiceList(formDTO));
-        return new PageData<>(pageInfo.getList(),pageInfo.getTotal());
+        return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
     }
 
 

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -764,4 +764,13 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/icresiuser/getByResiIdCard/{idcard}")
     Result<IcResiUserDTO> getByResiIdCard(@PathVariable("idcard") String idCard);
+
+    /**
+     * 根据身份证号查询ic_resi_user.id+居民端用户id
+     *
+     * @param idCard
+     * @return
+     */
+    @PostMapping("/epmetuser/icresiuser/getAllUserIds")
+    Result<List<String>> getAllUserIds(@RequestParam("idcard") String idCard, @RequestParam("customerId") String customerId);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -557,4 +557,16 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<IcResiUserDTO> getByResiIdCard(String idCard) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getByResiIdCard", idCard);
     }
+
+    /**
+     * 根据身份证号查询ic_resi_user.id+居民端用户id
+     *
+     * @param idCard
+     * @param customerId
+     * @return
+     */
+    @Override
+    public Result<List<String>> getAllUserIds(String idCard, String customerId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getAllUserIds", idCard,customerId);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -52,7 +52,6 @@ import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcResiUserDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
-import com.epmet.entity.IcResiUserEntity;
 import com.epmet.enums.IcResiUserTableEnum;
 import com.epmet.excel.PartyMemberAgeExportExcel;
 import com.epmet.excel.PartyMemberEducationExportExcel;
@@ -1062,4 +1061,16 @@ public class IcResiUserController implements ResultDataResolver {
         IcResiUserDTO resi = icResiUserService.getByResiId(idCard);
         return new Result<IcResiUserDTO>().ok(resi);
     }
+
+    /**
+     * 根据身份证号查询ic_resi_user.id+居民端用户id
+     *
+     * @param idCard
+     * @return
+     */
+    @PostMapping("getAllUserIds")
+    public Result<List<String>> getAllUserIds(@RequestParam("idcard") String idCard, @RequestParam("customerId") String customerId) {
+        List<String> list = icResiUserService.getAllUserIds(idCard, customerId);
+        return new Result<List<String>>().ok(list);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java

@@ -309,4 +309,6 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      * @return
      */
     List<HouseIcResiUserResultDTO> getResiUserGroupHomeId(RentTenantDataFormDTO formDTO);
+
+    List<String> getAllUserIds(@Param("idCard") String idCard, @Param("customerId")String customerId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -338,4 +338,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
     IcResiUserBriefDTO findFamilyMemByIdCard(String idCard);
 
     IcResiUserDTO getByResiId(String idCard);
+
+    List<String> getAllUserIds(String idCard, String customerId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1948,4 +1948,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     public IcResiUserDTO getByResiId(String idCard) {
         return baseDao.getResiUserByIdCard(idCard, EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID));
     }
+
+    @Override
+    public List<String> getAllUserIds(String idCard, String customerId) {
+        return baseDao.getAllUserIds(idCard, customerId);
+    }
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -974,4 +974,23 @@
         </if>
     </select>
 
+    <select id="getAllUserIds"  parameterType="map" resultType="java.lang.String">
+        SELECT
+            I.ID
+        FROM
+            ic_resi_user i
+        WHERE
+            i.DEL_FLAG = '0'
+            AND i.CUSTOMER_ID = #{customerId}
+            AND i.ID_CARD = #{idCard}
+        UNION
+        SELECT
+            ubi.USER_ID
+        FROM
+            user_base_info ubi
+        WHERE
+            ubi.DEL_FLAG = '0'
+            AND ubi.CUSTOMER_ID = #{customerId}
+            AND ubi.ID_NUM = #{idCard}
+    </select>
 </mapper>