From 3c1f9d699497dcfc4b682502945a4ebee4c37e03 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 27 十二月 2024 16:54:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
index e5d3c54..a035b9c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
@@ -9,6 +9,7 @@
import com.example.erp.entity.userInfo.Role;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.entity.userInfo.User;
+import com.example.erp.mapper.pp.ProductionSchedulingMapper;
import com.example.erp.mapper.userInfo.*;
import com.example.erp.tools.TokenTools;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,12 +33,14 @@
private final UserRoleMapper userRoleMapper;
private final PermissionRoleMapper permissionRoleMapper;
+ private final ProductionSchedulingMapper productionSchedulingMapper;
- public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper, UserRoleMapper userRoleMapper) {
+ public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper, UserRoleMapper userRoleMapper, ProductionSchedulingMapper productionSchedulingMapper) {
this.userMapper = userMapper;
this.roleMapper = roleMapper;
this.permissionRoleMapper = permissionRoleMapper;
this.userRoleMapper = userRoleMapper;
+ this.productionSchedulingMapper = productionSchedulingMapper;
}
@@ -183,5 +186,15 @@
return userMapper.userDelete(id);
}
+
+ public Map<String, Object> selectProcessSv() {
+ Map<String, Object> map = new HashMap<>();
+ map.put("process", productionSchedulingMapper.selectProcess());
+ return map;
+ }
+
+ public Boolean updateProcessSv(Integer id, String process) {
+ return userMapper.updateProcessMp(id,process);
+ }
}
--
Gitblit v1.8.0