From 971eb04d09d950f7fa0d534560a76dd69d84c69c Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 08 七月 2024 10:39:43 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-stander
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
index 4e4d24a..4068a6b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
+import com.hz.his.dto.employee.EmpAuthDto;
import com.hz.his.dto.employee.EmpDocDto;
import com.hz.his.dto.TimeDto;
import com.hz.his.dto.employee.EmployeeDto;
@@ -14,7 +15,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "employee")
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "employee")
public interface SEmployeeService {
/**
@@ -24,6 +25,13 @@
*/
@PostMapping(value = "/emp/detail")
Result getEmpDetail(@RequestParam("empId") String empId);
+
+ /**
+ * 鑾峰彇鍛樺伐璇︽儏
+ * @return Result
+ */
+ @PostMapping(value = "/emp/detail/byNoOrId")
+ Result getEmpDetailByIdOrNo(@RequestBody EmployeeDto employeeDto);
/**
* 鏌ヨ鍛樺伐鍒楄〃
@@ -74,4 +82,10 @@
@PostMapping(value = "/emp/detail/name")
Result getDetailsByName(@RequestBody(required = false) EmpDocDto employeeDto);
+ @PostMapping(value = "/emp/role/get/one")
+ Result getEmployeeByRoleId(@RequestBody(required = false) EmpAuthDto empAuthDto);
+
+ @PostMapping(value = "/emp/auth/check")
+ Result empAuthCheck(@RequestBody(required = false) EmpAuthDto empAuthDto);
+
}
--
Gitblit v1.8.0