From 42d170e952da0a012c1e82508a2516fcd6e56c6d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 04 七月 2025 19:51:08 +0800
Subject: [PATCH] 保养规范全部代码新增流程处理
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 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 679245d..7f4bc94 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;
@@ -166,10 +167,10 @@
/**
* 鏍规嵁璁惧杞﹂棿绠＄悊Id鏌ヨ
* @param page
- * @param workShopDepartId 璁惧杞﹂棿绠＄悊Id
+ * @param baseFactoryId 璁惧杞﹂棿绠＄悊Id
* @return
*/
- public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String workShopDepartId,String username);
+ public IPage<SysUser> getUserByworkShopDepartId(Page<SysUser> page,String baseFactoryId,String username);
/**
@@ -287,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);
/**
* 缂栬緫鐢ㄦ埛
@@ -296,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
@@ -320,6 +323,11 @@
Map<String, String> getProNamesByUserIds(List<String> userIds);
/**
+ * 鏍规嵁 userIds鏌ヨ锛屾煡璇㈢敤鎴锋墍灞炰骇绾跨殑鍚嶇О锛堝涓骇绾垮悕閫楀彿闅斿紑锛�
+ */
+ Map<String, String> getRepDepNamesByUserIds(List<String> userIds);
+
+ /**
* 鏍规嵁瑙掕壊Id鏌ヨ璇ヨ鑹蹭笅鐨勬墍鏈夌敤鎴蜂俊鎭�,涓嶅垎椤�
*
* @param
@@ -332,4 +340,30 @@
List<SysUser> getUserByRoleCodeList(List<String> roleCodeList);
List<SysUser> getEquipmentAdmin(String roleCode, String equipmentId);
+
+ /**
+ * 閫夋嫨鐢ㄦ埛
+ * @param equipmentCode 閫夋嫨鐨勮澶嘔D
+ * @param productionId 閫夋嫨鐨勮溅闂碔D
+ * @param positionCode 宀椾綅缂栧彿
+ * @return
+ */
+ List<UserSelector> selectOperatorList(String equipmentCode, String productionId, String positionCode);
+
+ /**
+ * 閫夋嫨鐢ㄦ埛
+ * @param equipmentCode 閫夋嫨鐨勮澶嘔D
+ * @param factoryId 閫夋嫨鐨勮溅闂碔D
+ * @param positionCode 宀椾綅缂栧彿
+ * @return
+ */
+ List<UserSelector> selectOperatorFactoryList(String equipmentCode, String factoryId, String positionCode);
+
+ /**
+ * 閫夋嫨鐢ㄦ埛
+ * @param positionCode 宀椾綅缂栧彿
+ * @return
+ */
+ List<UserSelector> selectOperatorList( String positionCode);
+
}
--
Gitblit v1.9.3