From 8d6b17bfa56fd767c6f9de666eb0dd44c6b032cd Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 五月 2025 15:42:38 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 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..3b0510c 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
@@ -5,23 +5,17 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.controller.dto.UserDTO;
-import com.example.erp.entity.userInfo.PermissionBasic;
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;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Service
@DS("user_info")
@@ -32,12 +26,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 +179,43 @@
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);
+ }
+
+ public Object findByAddress(Map<String,String> userName) {
+ if(Objects.equals(userName.get("userName"), "")){
+ userName.put("userName", null) ;
+ }
+ List<User> users = userMapper.findByAddress(userName.get("userName"));
+ List<Map<String,Object>> userList = new ArrayList<>();
+ users.forEach(user -> {
+ Map<String,Object> userMap = new HashMap<>();
+ userMap.put("value", user.getLoginName());
+ userMap.put("text", user.getUserName());
+ userList.add(userMap);
+ });
+ Map<String,List<Object>> map = new HashMap<>();
+
+ map.put("users", Collections.singletonList(userList));
+ return map;
+ }
+
+
+//鏌ヨ鐢ㄦ埛浼樺寲鍙傛暟
+public String getOptimizeParms(String username) {
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+
+ return userMapper.selectOptimizeParmsById(username);
+ }
+
}
+
--
Gitblit v1.8.0