From 93781c5ba334f3b1b606d7427f5433676d09af3c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 29 八月 2022 17:39:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 16 +++++++
phis-feign/src/main/java/com/hz/phis/dt/user/UserPhipDt.java | 33 ++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeDto.java | 6 +++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SEmployeeService.java | 7 +++
phis-feign/src/main/java/com/hz/his/dto/user/UserListDto.java | 36 ++++++++++++++++++
5 files changed, 97 insertions(+), 1 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 f0aa39c..7bc4cb5 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
@@ -3,6 +3,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;
+import java.util.List;
+
/**
* @author fwq
* 鍛樺伐鎵╁睍
@@ -11,4 +13,8 @@
public class EmployeeDto extends PageDto {
/**淇敼鏃堕棿*/
private String updateTime;
+ /**鍛樺伐浼佷笟userId*/
+ private String userId;
+ /**鍛樺伐瑙掕壊鍞竴鏍囪瘑鏁扮粍*/
+ private List<String> roleList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserListDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserListDto.java
new file mode 100644
index 0000000..e1383a1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserListDto.java
@@ -0,0 +1,36 @@
+package com.hz.his.dto.user;
+
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鐢ㄦ埛鍙傛暟
+ */
+@Data
+public class UserListDto extends PageDto {
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+ /**鐢佃瘽*/
+ private String tel;
+ /**鎬у埆*/
+ private Integer sex;
+ /**鍚嶇О*/
+ private String name;
+ /**CIQ*/
+ private String ciq;
+ /**浼氬憳绛夌骇*/
+ private String memberLevel;
+ /**鐢ㄦ埛鍋氳繃椤圭洰鍚嶇О*/
+ private String projectName;
+
+ /**鐢ㄦ埛娑堣垂鏃堕棿娈碉紙寮�濮嬶級*/
+ private String consumeStartTime;
+ /**鐢ㄦ埛娑堣垂鏃堕棿娈碉紙缁撴潫锛�*/
+ private String consumeEndTime;
+
+ /**鐢ㄦ埛鍒涘缓鏃堕棿娈碉紙寮�濮嬶級*/
+ private String createStartTime;
+ /**鐢ㄦ埛娑堣垂鏃堕棿娈碉紙缁撴潫锛�*/
+ private String createEndTime;
+}
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..9462bd1 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
@@ -53,4 +53,11 @@
*/
@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);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index 79a648a..0b773ba 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -1,7 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
-import com.hz.his.dto.token.GetTokenDto;
+import com.hz.his.dto.user.UserListDto;
import com.hz.his.dto.user.UserParamDto;
import com.hz.his.dto.user.UserUnionDto;
import com.hz.his.dto.user.coupon.UserCouponDto;
@@ -17,6 +17,20 @@
public interface SPhipUserService {
/**
+ * 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鍒楄〃
+ * 杩斿洖瀹炰綋鐢║serPhipDt
+ */
+ @PostMapping(value = "/user/list")
+ Result userList(@RequestBody UserListDto userListDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-绮剧‘鑾峰彇鐢ㄦ埛鍒楄〃
+ * 杩斿洖瀹炰綋鐢║serPhipDt
+ */
+ @PostMapping(value = "/user/appoint_user")
+ Result appointUser(@RequestBody UserListDto userListDto);
+
+ /**
* 寮�鏀惧钩鍙�-鐢ㄦ埛鏂板
*/
@PostMapping(value = "/user/add")
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserPhipDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserPhipDt.java
new file mode 100644
index 0000000..f189d3f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserPhipDt.java
@@ -0,0 +1,33 @@
+package com.hz.phis.dt.user;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 寮�鏀惧钩鍙板垪琛ㄨ繑鍥炲疄浣�
+ * */
+@Data
+public class UserPhipDt {
+ /**鏍囪瘑*/
+ private String id;
+ /**ciq浼氬憳鍙�*/
+ private String CIQ;
+ /**鍚嶇О*/
+ private String name;
+ /**鎵嬫満鍙�*/
+ private String tel;
+
+ /**棰嗗缓绯荤粺鐨刬d*/
+ private String apiId;
+ /**鐢ㄦ埛浼氬憳鍚嶇О*/
+ private String imgUrl;
+
+ /**鐢ㄦ埛鎬у埆*/
+ private Integer gender;
+ /**unionId*/
+ private String unionId;
+ /**鍒涘缓鏃堕棿*/
+ private String createTime;
+
+}
--
Gitblit v1.8.0