From 66990e9be43f71b89aa42065d696b682d803afa6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 25 三月 2025 10:07:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/service/UserService.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
index 01fde83..e3bf187 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/UserService.java
@@ -1,15 +1,15 @@
package com.yuanchu.mom.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.PersonDto;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
-import org.springframework.web.multipart.MultipartFile;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
-public interface UserService {
+public interface UserService {
/*鍒ゆ柇鏄惁鐧诲綍鎴愬姛*/
User selectUserByPwd(String account, String password);
@@ -18,6 +18,8 @@
String selectNameById(Integer id);
Map<String, Object> selectUserList(IPage<UserPageDto> page, UserPageDto user);
+
+ Map<String, Object> selectPersonnelOverview(IPage<UserPageDto> page, UserPageDto user);
int updateUser(User user);
@@ -34,4 +36,23 @@
int upUserPassword(String oldPassword, String newPassWord);
+ int addPersonUser(PersonDto personDto);
+
+ int upUserDepardLimsId(String ids, String id);
+
+ int delUserDepardLimsId(Integer id);
+
+ List<User> getUser();
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
+ * @return
+ */
+ String selectUserDepartmentLimsName();
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
+ * @return
+ */
+ List<User> selectDepartmentLimsUserList();
}
--
Gitblit v1.9.3