评价人接口修改

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -3304,7 +3304,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		PageInfo<SatisfactionEvaluationListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> satisfactionDetailDao.satisfactionEvaluationList(formDTO.getProjectId()));
 		List<SatisfactionEvaluationListResultDTO> result = pageInfo.getList();
 		if (CollectionUtils.isNotEmpty(result)){
-			Result<List<UserBaseInfoResultDTO>> listResult = epmetUserOpenFeignClient.queryUserBaseInfo(result.stream().map(m -> m.getUserId()).distinct().collect(Collectors.toList()));
+			Result<List<StaffAndResiResultDTO>> listResult = epmetUserOpenFeignClient.getStaffAndResi(result.stream().map(m -> m.getUserId()).distinct().collect(Collectors.toList()));
 			if (!listResult.success()){
 				throw new EpmetException("查询user信息失败...");
 			}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffAndResiResultDTO.java

@@ -0,0 +1,40 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/5/25 09:06
+ * @DESC
+ */
+@Data
+public class StaffAndResiResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 5546194837482246174L;
+
+    /**
+     * staff工作人员，resi居民
+     */
+    private String type;
+
+    private String userId;
+
+    /**
+     * 手机号(注册手机号)
+     */
+    private String mobile;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 性别（1男2女0未知）
+     */
+    private String gender;
+
+    private String address;
+}

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

@@ -782,4 +782,13 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/userresiinfo/isResiFlag")
     Result<Boolean> getIsResiFlag(@RequestParam("userId") String userId);
+
+    /**
+     * Desc: 在不确定userId是工作人员还是居民时，使用此接口查询信息
+     * @param userIds
+     * @author zxc
+     * @date 2022/5/25 09:17
+     */
+    @PostMapping("/epmetuser/userresiinfo/getStaffAndResi")
+    Result<List<StaffAndResiResultDTO>> getStaffAndResi(@RequestBody List<String> userIds);
 }

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

@@ -574,4 +574,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<Boolean> getIsResiFlag(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIsResiFlag", userId);
     }
+
+    @Override
+    public Result<List<StaffAndResiResultDTO>> getStaffAndResi(List<String> userIds) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffAndResi", userIds);
+    }
 }

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

@@ -30,6 +30,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
+import com.epmet.dto.result.StaffAndResiResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.excel.UserResiInfoExcel;
 import com.epmet.service.UserResiInfoService;
@@ -230,4 +231,16 @@ public class UserResiInfoController {
     public Result<Boolean> getIsResiFlag(@RequestParam("userId") String userId){
         return new Result<Boolean>().ok(userResiInfoService.getIsResiFlag(userId));
     }
+
+    /**
+     * Desc: 在不确定userId是工作人员还是居民时，使用此接口查询信息
+     * @param userIds
+     * @author zxc
+     * @date 2022/5/25 09:17
+     */
+    @PostMapping("getStaffAndResi")
+    public Result<List<StaffAndResiResultDTO>> getStaffAndResi(@RequestBody List<String> userIds){
+        return new Result<List<StaffAndResiResultDTO>>().ok(userResiInfoService.getStaffAndResi(userIds));
+    }
+
 }

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

@@ -22,6 +22,7 @@ import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.IssueInitiatorFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
+import com.epmet.dto.result.StaffAndResiResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserResiInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -109,4 +110,12 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 
 	List<UserResiInfoDTO> selectCommonIdNumUser(@Param("customerId") String customerId,
 								  @Param("idNum")String idNum);
+
+	/**
+	 * Desc: 在不确定userId是工作人员还是居民时，使用此接口查询信息
+	 * @param userIds
+	 * @author zxc
+	 * @date 2022/5/25 09:17
+	 */
+	List<StaffAndResiResultDTO> getStaffAndResi(@Param("userIds") List<String> userIds);
 }

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

@@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
+import com.epmet.dto.result.StaffAndResiResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserResiInfoEntity;
 
@@ -203,4 +204,13 @@ public interface UserResiInfoService extends BaseService<UserResiInfoEntity> {
 	 * @date 2022/5/23 13:52
 	 */
 	Boolean getIsResiFlag(String userId);
+
+	/**
+	 * Desc: 在不确定userId是工作人员还是居民时，使用此接口查询信息
+	 * @param userIds
+	 * @author zxc
+	 * @date 2022/5/25 09:17
+	 */
+	List<StaffAndResiResultDTO> getStaffAndResi(List<String> userIds);
+
 }

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

@@ -42,10 +42,7 @@ import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserResiRegisterVisitDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.IssueInitiatorResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.SendVerificationCodeResultDTO;
-import com.epmet.dto.result.UserBaseInfoResultDTO;
-import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.entity.UserResiInfoEntity;
 import com.epmet.entity.UserResiRegisterVisitEntity;
@@ -57,6 +54,7 @@ import com.epmet.resi.group.dto.topic.form.SharableTopicAndInviteeFormDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.service.*;
 import com.epmet.util.ModuleConstant;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -514,6 +512,20 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		return false;
     }
 
+	/**
+	 * Desc: 在不确定userId是工作人员还是居民时，使用此接口查询信息
+	 * @param userIds
+	 * @author zxc
+	 * @date 2022/5/25 09:17
+	 */
+    @Override
+    public List<StaffAndResiResultDTO> getStaffAndResi(List<String> userIds) {
+    	if (CollectionUtils.isEmpty(userIds)){
+    		return new ArrayList<>();
+		}
+        return baseDao.getStaffAndResi(userIds);
+    }
+
 
     /**
 	 * 自动认证居民：志愿者注册，自动认证居民

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

@@ -231,4 +231,38 @@
             and uri.customer_id=#{customerId}
             AND uri.id_num = #{idNum}
     </select>
+
+    <!-- 在不确定userId是工作人员还是居民时，使用此接口查询信息 -->
+    <select id="getStaffAndResi" resultType="com.epmet.dto.result.StaffAndResiResultDTO">
+        SELECT
+            s.USER_ID,
+            s.REAL_NAME,
+            s.GENDER,
+            s.MOBILE,
+            s.ADDRESS,
+            'staff' AS type
+        FROM customer_staff s
+        WHERE s.DEL_FLAG = 0
+            AND s.user_id IN (
+                <foreach collection="userIds" item="u" separator=",">
+                    #{u}
+                </foreach>
+            )
+        UNION ALL
+        SELECT
+            i.USER_ID,
+            b.REAL_NAME,
+            b.GENDER,
+            b.MOBILE,
+            b.STREET AS address,
+            'resi' AS type
+        FROM user_resi_info i
+        INNER JOIN user_base_info b ON b.USER_ID = i.USER_ID AND b.DEL_FLAG = 0
+        WHERE i.DEL_FLAG = 0
+            AND i.user_id IN (
+                <foreach collection="userIds" item="u" separator=",">
+                    #{u}
+                </foreach>
+            )
+    </select>
 </mapper>