项目立项

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectTagDictDao.java

@@ -146,5 +146,5 @@ public interface IssueProjectTagDictDao extends BaseDao<IssueProjectTagDictEntit
 	 * @Description  批量查询客户分类信息
 	 * @Author sun
 	 **/
-    List<IssueProjectTagDictDTO> getTagList(@Param("customerId") String customerId, @Param("tagIdList") List<String> categoryIdList);
+    List<IssueProjectTagDictDTO> getTagList(@Param("customerId") String customerId, @Param("tagIdList") List<String> tagIdList);
 }

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueProjectCategoryDictServiceImpl.java

@@ -462,7 +462,7 @@ public class IssueProjectCategoryDictServiceImpl extends BaseServiceImpl<IssuePr
             resultDTO.setCategoryList(categoryList);
         }
         //2.批量查询客户标签信息
-        if (!org.springframework.util.CollectionUtils.isEmpty(formDTO.getCategoryIdList())) {
+        if (!org.springframework.util.CollectionUtils.isEmpty(formDTO.getTagIdList())) {
             List<IssueProjectTagDictDTO> tagList = issueProjectTagDictDao.getTagList(formDTO.getCustomerId(), formDTO.getTagIdList());
             resultDTO.setTagList(tagList);
         }

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml

@@ -213,7 +213,7 @@
         AND customer_id = #{customerId}
         <if test="null != tagIdList and tagIdList.size() > 0">
             <foreach collection="tagIdList" item="tagId" open=" AND (" separator=" OR " close=" )">
-                ID = #{tagId}
+                id = #{tagId}
             </foreach>
         </if>
     </select>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java

@@ -12,6 +12,10 @@ import java.io.Serializable;
 public class StaffListResultDTO implements Serializable {
 
 	private static final long serialVersionUID = 5957826616179876849L;
+	/**
+	 * 客户Id
+	 */
+	private String customerId="";
 	/**
 	 * 人员Id
 	 */
@@ -32,5 +36,9 @@ public class StaffListResultDTO implements Serializable {
 	 * 角色名称(机关领导、部门领导、网格长)
 	 */
 	private String roleName="";
+	/**
+	 * 工作人员手机号
+	 */
+	private String mobile="";
 
 }

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

@@ -336,6 +336,16 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		List<IssueProjectCategoryDictDTO> categoryList = resultDTOResult.getData().getCategoryList();
 		List<IssueProjectTagDictDTO> tagList = resultDTOResult.getData().getTagList();
 
+		//2-4.批量查询被勾选工作人员基础信息
+		List<String> staffIdList = staffList.stream().map(TickStaffFormDTO::getStaffId).collect(Collectors.toList());
+		staffIdList.add(formDTO.getUserId());
+		staffIdList = new ArrayList<String>(new LinkedHashSet<>(staffIdList));
+		Result<CustomerStaffListResultDTO> resultStaff = epmetUserOpenFeignClient.getCustomerStaffList(staffIdList);
+		if (!resultStaff.success() || null == resultStaff.getData()) {
+			throw new RenException("项目立项，调用user服务获取被勾选工作人员基本信息失败");
+		}
+		List<StaffListResultDTO> staffInfoList = resultStaff.getData().getStaffList();
+
 		//3.封装保存业务数据
 		//3-1.项目主表新增数据
 		ProjectEntity projectEntity = new ProjectEntity();
@@ -477,18 +487,17 @@ public class ProjectTraceServiceImpl<ProjectTagService> implements ProjectTraceS
 		//4-3.吹哨短信消息
 		List<ProjectSendMsgFormDTO> smsList = new ArrayList<>();
 		staffList.forEach(staff -> {
-			CustomerStaffDTO staffDTO = new CustomerStaffDTO();
+			staffInfoList.forEach(st->{
-			staffDTO.setUserId(staff.getStaffId());
+				if(staff.getStaffId().equals(st.getStaffId())){
-			Result<CustomerStaffDTO> staffDTOResult = epmetUserFeignClient.getCustomerStaffInfoByUserId(staffDTO);
-			if (staffDTOResult.success() && null != staffDTOResult.getData()) {
 					ProjectSendMsgFormDTO sms = new ProjectSendMsgFormDTO();
-				sms.setCustomerId(staffDTOResult.getData().getCustomerId());
+					sms.setCustomerId(st.getCustomerId());
-				sms.setMobile(staffDTOResult.getData().getMobile());
+					sms.setMobile(st.getMobile());
 					sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_TRANSFER);
 					sms.setParameterKey("send_msg");
 					smsList.add(sms);
 				}
 			});
+		});
 		Result result = epmetMessageOpenFeignClient.projectSendMsg(smsList);
 		if (!result.success()) {
 			logger.error("项目吹哨，发送手机短信失败" + JSON.toJSONString(result));

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

@@ -505,4 +505,11 @@ public interface EpmetUserOpenFeignClient {
      **/
     @PostMapping(value = "/epmetuser/userrole/getuserroleinfo")
     Result<List<UserRoleResultDTO>> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO);
+
+    /**
+     * @Author sun
+     * @Description 根据staffId集合查询工作人员基础信息
+     **/
+    @PostMapping(value = "/epmetuser/customerstaff/getcustomerstafflist")
+    Result<CustomerStaffListResultDTO> getCustomerStaffList(@RequestBody List<String> staffIdList);
 }

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

@@ -358,4 +358,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserRoleInfo", userRoleFormDTO);
     }
+
+    @Override
+    public Result<CustomerStaffListResultDTO> getCustomerStaffList(List<String> staffIdList) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffList", staffIdList);
+    }
 }

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

@@ -181,10 +181,12 @@
 
     <select id="selectStaffByIds" resultType="com.epmet.dto.result.StaffListResultDTO">
         SELECT
+            CUSTOMER_ID AS customerId,
             user_id AS staffId,
             IFNULL(real_name,"") AS staffName,
             IFNULL(head_photo,"") AS staffHeadPhoto ,
-            IFNULL(gender,0) AS gender
+            IFNULL(gender,0) AS gender,
+            IFNULL(mobile,"") AS mobile
         FROM
             customer_staff
         WHERE