新增接口根据staffId查询基本信息

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java

@@ -8,14 +8,10 @@ import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.StaffInfoFromDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.StaffSubmitFromDTO;
-import com.epmet.dto.form.StaffTransferFormDTO;
-import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.result.*;
 import com.epmet.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -151,4 +147,13 @@ public class StaffController {
 		staffService.staffTransfer(tokenDto, formDTO);
 		return new Result();
 	}
+
+	/**
+	 * 根据staffId查询用户基本信息
+	 * @author sun
+	 */
+	@PostMapping("staffbasicinfo")
+	public Result<BasicInfoResultDTO> staffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO){
+		return staffService.staffBasicInfo(fromDTO);
+	}
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java

@@ -2,10 +2,7 @@ package com.epmet.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.StaffInfoFromDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.StaffSubmitFromDTO;
-import com.epmet.dto.form.StaffTransferFormDTO;
-import com.epmet.dto.form.StaffsInAgencyFromDTO;
 import com.epmet.dto.result.*;
 
 import java.util.List;
@@ -103,4 +100,9 @@ public interface StaffService {
 	 */
 	void staffTransfer(TokenDto tokenDto, StaffTransferFormDTO fromDTO);
 
+	/**
+	 * 根据staffId查询用户基本信息
+	 * @author sun
+	 */
+    Result<BasicInfoResultDTO> staffBasicInfo(StaffBasicInfoFromDTO fromDTO);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -256,4 +256,13 @@ public class StaffServiceImpl implements StaffService {
 		staffTransferRecordDTO.setRemarks(fromDTO.getRemarks());
 		staffTransferRecordService.save(staffTransferRecordDTO);
 	}
+
+	/**
+	 * 根据staffId查询用户基本信息
+	 * @author sun
+	 */
+	@Override
+	public Result<BasicInfoResultDTO> staffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
+		return epmetUserOpenFeignClient.staffBasicInfo(fromDTO);
+	}
 }

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

@@ -327,4 +327,11 @@ public interface EpmetUserOpenFeignClient {
      **/
     @PostMapping(value = "epmetuser/staffagencyvisited/getstaffbasicinfo")
     Result<StaffBasicInfo> getStaffBasicInfo(@RequestBody StaffBasicInfoFormDTO formDTO);
+
+    /**
+     * 根据staffId查询用户基本信息
+     * @author sun
+     */
+    @PostMapping("/epmetuser/customerstaff/staffbasicinfo")
+    Result<BasicInfoResultDTO> staffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO);
 }

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

@@ -220,4 +220,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<StaffBasicInfo> getStaffBasicInfo(StaffBasicInfoFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffBasicInfo", formDTO);
     }
+
+    @Override
+    public Result<BasicInfoResultDTO> staffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "staffBasicInfo", fromDTO);
+    }
 }

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

@@ -385,7 +385,7 @@ public class CustomerStaffController {
      * @Date 11:09 2020-08-25
      **/
     @PostMapping(value = "staffbasicinfo")
-    public Result<StaffBasicInfoResultDTO> staffBasicInfo(@LoginUser TokenDto tokenDTO){
+    public Result<BasicInfoResultDTO> staffBasicInfo(@LoginUser TokenDto tokenDTO){
         return customerStaffService.selectStaffBasicInfo(tokenDTO.getUserId());
     }
 
@@ -401,4 +401,13 @@ public class CustomerStaffController {
         return new Result<GovWebOperLoginResultDTO>().ok(customerStaffService.getStaffIdAndPwd(formDTO));
     }
 
+    /**
+     * 根据staffId查询用户基本信息
+     * @author sun
+     */
+    @PostMapping("staffbasicinfo")
+    public Result<BasicInfoResultDTO> staffBasicInfo(@RequestBody StaffBasicInfoFromDTO fromDTO){
+        return new Result<BasicInfoResultDTO>().ok(customerStaffService.staffBasicInfo(fromDTO));
+    }
+
 }

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

@@ -18,7 +18,6 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -190,5 +189,12 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
      * @Author zhangyong
      * @Date 10:07 2020-08-26
      **/
-	StaffBasicInfoResultDTO selectStaffBasicInfo(@Param("userId") String userId);
+	BasicInfoResultDTO selectStaffBasicInfo(@Param("userId") String userId);
+
+	/**
+	 * 根据staffId查询用户基本信息
+	 * @author sun
+	 * @return
+	 */
+	BasicInfoResultDTO getStaffBasicInfo(StaffBasicInfoFromDTO fromDTO);
 }

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

@@ -305,7 +305,7 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 * @Author zhangyong
 	 * @Date 11:10 2020-08-25
 	 **/
-    Result<StaffBasicInfoResultDTO> selectStaffBasicInfo(String userId);
+    Result<BasicInfoResultDTO> selectStaffBasicInfo(String userId);
 
 	/**
 	 * @param  formDTO
@@ -315,4 +315,10 @@ public interface CustomerStaffService extends BaseService<CustomerStaffEntity> {
 	 **/
 	GovWebOperLoginResultDTO getStaffIdAndPwd(GovWebOperLoginFormDTO formDTO);
 
+	/**
+	 * 根据staffId查询用户基本信息
+	 * @author sun
+	 * @return
+	 */
+	BasicInfoResultDTO staffBasicInfo(StaffBasicInfoFromDTO fromDTO);
 }

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

@@ -650,9 +650,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	}
 
     @Override
-    public Result<StaffBasicInfoResultDTO> selectStaffBasicInfo(String userId) {
+    public Result<BasicInfoResultDTO> selectStaffBasicInfo(String userId) {
-        StaffBasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId);
+        BasicInfoResultDTO resultDTO = baseDao.selectStaffBasicInfo(userId);
-        return new Result<StaffBasicInfoResultDTO>().ok(resultDTO);
+        return new Result<BasicInfoResultDTO>().ok(resultDTO);
     }
 
 	/**
@@ -667,4 +667,14 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		return baseDao.selectByCustomerIdAndPhone(formDTO);
 	}
 
+	/**
+	 * 根据staffId查询用户基本信息
+	 * @author sun
+	 * @return
+	 */
+	@Override
+	public BasicInfoResultDTO staffBasicInfo(StaffBasicInfoFromDTO fromDTO) {
+		return baseDao.getStaffBasicInfo(fromDTO);
+	}
+
 }

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

@@ -311,7 +311,7 @@
         LIMIT 1
     </select>
 
-    <select id="selectStaffBasicInfo" resultType="com.epmet.dto.result.StaffBasicInfoResultDTO">
+    <select id="selectStaffBasicInfo" resultType="com.epmet.dto.result.BasicInfoResultDTO">
         SELECT
             cs.CUSTOMER_ID customerId,
             cs.USER_ID id,
@@ -334,4 +334,23 @@
             cs.DEL_FLAG = '0'
             AND cs.USER_ID = #{userId}
     </select>
+
+    <select id="getStaffBasicInfo" resultType="com.epmet.dto.result.BasicInfoResultDTO">
+        SELECT
+            user_id AS "staffId",
+            real_name AS "realName",
+            mobile AS "mobile",
+            gender AS "gender",
+            IFNULL(head_photo, "") AS "staffHeadPhoto",
+            enable_flag AS "enableFlag",
+            active_flag AS "activeFlag",
+            active_time AS "activeTime",
+            work_type AS "workType"
+        FROM
+            customer_staff
+        WHERE
+            del_flag = '0'
+          AND user_id = #{staffId}
+        LIMIT 1
+    </select>
 </mapper>