From 623afb6fbb8ce6adebf237e7b670d9f4f339184d Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期三, 01 五月 2024 00:11:14 +0800 Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-prod-new --- phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 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 3e16eff..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 @@ -2,9 +2,11 @@ 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; +import com.hz.his.dto.employee.EmployeeRoleDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -23,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); /** * 鏌ヨ鍛樺伐鍒楄〃 @@ -53,4 +62,30 @@ */ @PostMapping(value = "/emp/medical/info") Result getEmpMedicalInfo(@RequestBody(required = false) String empId); + + /** + * 鍒ゆ柇鐢ㄦ埛鏄惁瀛樺湪浼佷笟userId,鏄惁瀛樺湪浼犻�掔殑瑙掕壊 + */ + @PostMapping(value = "/emp/userId/role/check") + Result checkUserIdRole(@RequestBody(required = false)EmployeeDto employeeDto); + + @PostMapping(value = "/emp/role/liset") + Result roleList(@RequestBody(required = false) EmployeeDto employeeDto); + + /**鑾峰彇鍛樺伐-瑙掕壊鍒楄〃*/ + @PostMapping(value = "/emp/role/info/list") + Result employeeRoleList(@RequestBody(required = false) EmployeeRoleDto employeeRoleDto); + + @PostMapping(value = "/emp/check/doctor") + Result checkEmployeeRoleDoctor(@RequestBody(required = false) EmpDocDto employeeDto); + + @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