From 11fc7fefb11994102fdefc1213cfb0ca5f043f9e Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期二, 02 一月 2024 11:22:14 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 7 +++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
index 0f0a37c..1b75670 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java
@@ -23,6 +23,8 @@
private Integer isPerformanceEmp;
/**鍛樺伐瑙掕壊鍞竴鏍囪瘑鏁扮粍*/
private List<String> roleList;
+ /**鍛樺伐缂栧彿*/
+ private String employeeNo;
/**鏌ヨ绫诲瀷*/
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 5393a67..61231e3 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
@@ -27,6 +27,13 @@
Result getEmpDetail(@RequestParam("empId") String empId);
/**
+ * 鑾峰彇鍛樺伐璇︽儏
+ * @return Result
+ */
+ @PostMapping(value = "/emp/detail/byNoOrId")
+ Result getEmpDetailByIdOrNo(@RequestBody EmployeeDto employeeDto);
+
+ /**
* 鏌ヨ鍛樺伐鍒楄〃
*/
@PostMapping(value = "/emp/page/list")
--
Gitblit v1.8.0