From 8904f9e6005e7e1f3cc06f415fdcde0033c32332 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 21 七月 2025 20:33:53 +0800
Subject: [PATCH] art: 技术状态鉴定工单-生成逻辑优化
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java | 67 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
index 7632e37..b3abea7 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
@@ -10,6 +10,7 @@
import org.jeecg.modules.system.entity.SysRoleIndex;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.model.SysUserSysDepartModel;
+import org.jeecg.modules.system.vo.UserSelector;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
@@ -66,15 +67,15 @@
* @return SysUser
*/
public SysUser getUserByName(String username);
-
+
/**
* 娣诲姞鐢ㄦ埛鍜岀敤鎴疯鑹插叧绯�
* @param user
* @param roles
*/
public void addUserWithRole(SysUser user,String roles);
-
-
+
+
/**
* 淇敼鐢ㄦ埛鍜岀敤鎴疯鑹插叧绯�
* @param user
@@ -97,7 +98,7 @@
* @return
*/
public SysRoleIndex getDynamicIndexByUserRole(String username,String version);
-
+
/**
* 鏌ヨ鐢ㄦ埛淇℃伅鍖呮嫭 閮ㄩ棬淇℃伅
* @param username
@@ -162,6 +163,16 @@
*/
public IPage<SysUser> getUserByRoleId(Page<SysUser> page,String roleId, String username);
+
+ /**
+ * 鏍规嵁璁惧杞﹂棿绠＄悊Id鏌ヨ
+ * @param page
+ * @param baseFactoryId 璁惧杞﹂棿绠＄悊Id
+ * @return
+ */
+ public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String baseFactoryId,String username);
+
+
/**
* 閫氳繃鐢ㄦ埛鍚嶈幏鍙栫敤鎴疯鑹查泦鍚�
*
@@ -177,14 +188,14 @@
* @return 鏉冮檺闆嗗悎
*/
Set<String> getUserPermissionsSet(String username);
-
+
/**
* 鏍规嵁鐢ㄦ埛鍚嶈缃儴闂↖D
* @param username
* @param orgCode
*/
void updateUserDepart(String username,String orgCode);
-
+
/**
* 鏍规嵁鎵嬫満鍙疯幏鍙栫敤鎴峰悕鍜屽瘑鐮�
* @param phone 鎵嬫満鍙�
@@ -214,7 +225,7 @@
* @param departs
*/
void editUserWithDepart(SysUser user, String departs);
-
+
/**
* 鏍￠獙鐢ㄦ埛鏄惁鏈夋晥
* @param sysUser
@@ -277,8 +288,9 @@
* @param selectedRoles 閫夋嫨鐨勮鑹瞚d锛屽涓互閫楀彿闅斿紑
* @param selectedDeparts 閫夋嫨鐨勯儴闂╥d锛屽涓互閫楀彿闅斿紑
* @param selectedProductions 閫夋嫨鐨勪骇绾縤d锛屽涓互閫楀彿闅斿紑
+ * @param selectedRepairDeparts 閫夋嫨鐨勭淮淇儴闂╥d锛屽涓互閫楀彿闅斿紑
*/
- void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedProductions);
+ void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedProductions, String selectedRepairDeparts);
/**
* 缂栬緫鐢ㄦ埛
@@ -286,8 +298,9 @@
* @param roles 閫夋嫨鐨勮鑹瞚d锛屽涓互閫楀彿闅斿紑
* @param departs 閫夋嫨鐨勯儴闂╥d锛屽涓互閫楀彿闅斿紑
* @param productions 閫夋嫨鐨勪骇绾縤d锛屽涓互閫楀彿闅斿紑
+ * @param repairDeparts 閫夋嫨鐨勭淮淇儴闂╥d锛屽涓互閫楀彿闅斿紑
*/
- void editUser(SysUser user, String roles, String departs, String productions);
+ void editUser(SysUser user, String roles, String departs, String productions, String repairDeparts);
/**
* userId杞负username
@@ -308,4 +321,40 @@
* 鏍规嵁 userIds鏌ヨ锛屾煡璇㈢敤鎴锋墍灞炰骇绾跨殑鍚嶇О锛堝涓骇绾垮悕閫楀彿闅斿紑锛�
*/
Map<String, String> getProNamesByUserIds(List<String> userIds);
+
+ /**
+ * 鏍规嵁 userIds鏌ヨ锛屾煡璇㈢敤鎴锋墍灞炰骇绾跨殑鍚嶇О锛堝涓骇绾垮悕閫楀彿闅斿紑锛�
+ */
+ Map<String, String> getRepDepNamesByUserIds(List<String> userIds);
+
+ /**
+ * 鏍规嵁瑙掕壊Id鏌ヨ璇ヨ鑹蹭笅鐨勬墍鏈夌敤鎴蜂俊鎭�,涓嶅垎椤�
+ *
+ * @param
+ * @return
+ */
+ public List<SysUser> getAllUsersByRoleId(String roleId);
+
+ List<String> getUserByRoleCode(String roleCode);
+
+ List<SysUser> getUserByRoleCodeList(List<String> roleCodeList);
+
+ List<SysUser> getEquipmentAdmin(String roleCode, String equipmentId);
+
+ /**
+ * 閫夋嫨鐢ㄦ埛
+ * @param equipmentCode 閫夋嫨鐨勮澶嘔D
+ * @param factoryOrgCode 閫夋嫨鐨勪腑蹇冧俊鎭�
+ * @param positionCode 宀椾綅缂栧彿
+ * @return
+ */
+ List<UserSelector> selectOperatorList(String equipmentCode, String factoryOrgCode, String positionCode);
+
+ /**
+ * 閫夋嫨鐢ㄦ埛
+ * @param positionCode 宀椾綅缂栧彿
+ * @return
+ */
+ List<UserSelector> selectOperatorList( String positionCode);
+
}
--
Gitblit v1.9.3