From 6984757bfc75b4a25014de1eb71c2aa75ebdb86f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 26 八月 2023 15:59:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
index cab8442..3b7a54e 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
@@ -4,14 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.User;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
-import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
-import java.io.Serializable;
-
+import java.util.List;
import java.util.Map;
-import java.util.Objects;
/**
* <p>
@@ -22,21 +19,65 @@
* @since 2023-07-07
*/
public interface UserService extends IService<User> {
-// 閫氳繃鐢ㄦ埛id鑾峰彇鐢ㄦ埛淇℃伅
+ /**
+ * 閫氳繃鐢ㄦ埛id鑾峰彇鐢ㄦ埛淇℃伅
+ * @param userId
+ * @return
+ */
Map<String, String> selectUserByUserId(int userId);
User AccordingUsernameSelectAll(String account);
- Integer addNewPersonnel(NewPersonnelVo newPersonnelVo);
+ /**
+ * 娣诲姞鐢ㄦ埛
+ * @param newPersonnelVo
+ * @param enterpriseId
+ * @return
+ */
+ Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId);
+ /**
+ * 鏇存柊鐢ㄦ埛鍩烘湰淇℃伅
+ * @param updatePersonnelVo
+ * @return
+ */
Integer updateNewPersonnel(UpdatePersonnelVo updatePersonnelVo);
- IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);
+ /**
+ * 鍒嗛〉鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
+ * @param name
+ * @param page
+ * @return
+ */
+ IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status);
+ /**
+ * 鐧诲綍鑾峰彇鐢ㄦ埛鍩烘湰淇℃伅涓庣郴缁熻秴鏃舵椂闂存彁閱�
+ * @param token
+ * @return
+ */
Map<String, Object> getUserInfo(String token);
/**
* 鏍规嵁Id鏌ヨ鏄惁瀛樺湪璇ョ敤鎴�
*/
Boolean userIsNull(Integer Id);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛Id鏌ヨ鐢ㄦ埛鍚嶇О
+ * @param userId 鐢ㄦ埛Id
+ * @return
+ */
+ String selectByUserId(Integer userId);
+
+ /**
+ * 鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
+ * @return
+ */
+ List<Map<String,Object>> selectUser();
+
+ /**
+ * 鑾峰彇鎵�鏈夌敤鎴风殑鍚嶇О涓嶪d
+ */
+ List<Map<String, Object>> getUserNameAndId();
}
--
Gitblit v1.9.3