From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java | 64 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
index 45b1b36..4bd2806 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
@@ -43,7 +43,7 @@
SysUserDao sysUserDao;
@Transactional(propagation = Propagation.REQUIRED)
- public List<SysUser> getSysUserList(String arp, String name,String departmentName,String project,String company, Integer first, Integer pageSize) {
+ public List<SysUser> getSysUserList(String arp, String name,String departmentName,String projectName,String company, Integer first, Integer pageSize) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(arp)) {
@@ -55,7 +55,9 @@
if (StringUtils.isNotBlank(departmentName)) {
params.put("departmentNameLike", "%" + departmentName + "%");
}
- params.put("project", project);
+ if (StringUtils.isNotBlank(projectName)) {
+ params.put("projectName", projectName);
+ }
params.put("company", company);
params.put("first", first);
params.put("pageSize", pageSize);
@@ -95,7 +97,7 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public int getSysUserTotalCount(String arp, String name,String departmentName,String project,String company) {
+ public int getSysUserTotalCount(String arp, String name,String departmentName,String projectName,String company) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(arp)) {
@@ -107,7 +109,7 @@
if (StringUtils.isNotBlank(departmentName)) {
params.put("departmentNameLike", "%" + departmentName + "%");
}
- params.put("project", project);
+ params.put("projectName", projectName);
params.put("company", company);
return this.sysUserDao.getSysUserTotalCount(params);
} catch (DataAccessException e) {
@@ -117,29 +119,29 @@
}
@Override
- public int getUserCountInProject(String arp, String name, String departmentName, String project, String company) {
+ public int getUserCountInProject(String arp, String name, String departmentName, String projectName, String company) {
Map<String, Object> params = new HashMap<String, Object>();
params.put("arp", arp);
params.put("name", name);
params.put("departmentNameLike", departmentName);
- params.put("project", project);
+ params.put("projectName", projectName);
params.put("company", company);
return sysUserDao.getUserCountInProject(params);
}
@Override
- public List<SysUser> getUserInProject(String arp, String name, String departmentName, String project, String company, Integer first, Integer pageSize) {
+ public List<SysUser> getUserInProject(String arp, String name, String departmentName, String projectName, String company, Integer first, Integer pageSize) {
Map<String, Object> params = new HashMap<String, Object>();
params.put("arp", arp);
params.put("name", name);
params.put("departmentNameLike", departmentName);
- params.put("project", project);
+ params.put("projectName", projectName);
params.put("company", company);
return sysUserDao.getUserInProject(params);
}
@Transactional(propagation = Propagation.REQUIRED)
- public SysUser getSysUser(String id) {
+ public SysUser getSysUser(Long id) {
try {
return this.sysUserDao.getSysUser(id);
} catch (DataAccessException e) {
@@ -149,7 +151,7 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public SysUser getSysUserForSuppllier(String id) {
+ public SysUser getSysUserForSuppllier(Long id) {
try {
return this.sysUserDao.getSysUserForSuppllier(id);
} catch (DataAccessException e) {
@@ -193,7 +195,7 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public boolean isSysUserExist(String arp, String account, String idCard, String editId) {
+ public boolean isSysUserExist(String arp, String account, String idCard, Long editId) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("arp", arp);
@@ -223,11 +225,11 @@
}
@Override
- public List<SysUser> getHasProjectSysUserList(String department, String project) {
+ public List<SysUser> getHasProjectSysUserList(Long department, Long projectId) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("department", department);
- params.put("project", project);
+ params.put("projectId", projectId);
params.put("approverFlag", ApproverFlag.YES);
return this.sysUserDao.getHasProjectSysUserList(params);
} catch (DataAccessException e) {
@@ -248,7 +250,7 @@
}
@Transactional(propagation = Propagation.REQUIRED)
- public List<SysUser> getSeeUserList(String department) {
+ public List<SysUser> getSeeUserList(Long department) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("department", department);
@@ -262,9 +264,9 @@
@Transactional(propagation = Propagation.REQUIRED)
public SysUser insertSysUser(SysUser sysUser) {
try {
- if (sysUser.getId() == null) {
- sysUser.setId(IDUtils.uuid());
- }
+// if (sysUser.getId() == null) {
+// sysUser.setId(IDUtils.uuid());
+// }
this.sysUserDao.insertSysUser(sysUser);
return sysUser;
} catch (DuplicateKeyException ex) {
@@ -304,7 +306,7 @@
return false;
}
- List<String> ids = new ArrayList<String>();
+ List<Long> ids = new ArrayList<Long>();
for (SysUser sysUser : sysUserList) {
ids.add(sysUser.getId());
}
@@ -329,7 +331,7 @@
@Transactional(propagation = Propagation.REQUIRED)
@Override
- public void updateUserPointBySelective(Integer point,String id) {
+ public void updateUserPointBySelective(Integer point,Long id) {
sysUserDao.updateUserPointBySelective(point,id);
}
@@ -347,9 +349,9 @@
}else {
SysUser sysUser=sysUserDao.selectByAccount(user);
if(sysUser==null){
- if (user.getId() == null) {
- user.setId(IDUtils.uuid());
- }
+// if (user.getId() == null) {
+// user.setId(IDUtils.uuid());
+// }
sysUserDao.insertSysUser(user);
}else {
sysUserDao.updateSysUser(user);
@@ -373,7 +375,7 @@
}
@Override
- public SysUser getUser(String id) {
+ public SysUser getUser(Long id) {
try {
return this.sysUserDao.getUser(id);
} catch (DataAccessException e) {
@@ -409,16 +411,16 @@
}
@Override
- public HazardousWasteUser getUserByAccount(String account,String name) {
- Map<String, String> params = new HashMap<>();
+ public HazardousWasteUser getUserByAccount(String account,Long userId) {
+ Map<String, Object> params = new HashMap<>();
params.put("account", account);
- params.put("name", name);
+ params.put("useId", userId);
return sysUserDao.getUserByAccount(params);
}
@Override
- public List<LaboratoryVo.LaboratoryUser> getUserByProject(String project) {
- return sysUserDao.getUserByProject(project);
+ public List<LaboratoryVo.LaboratoryUser> getUserByProject(Long projectId) {
+ return sysUserDao.getUserByProject(projectId);
}
@Override
@@ -427,8 +429,8 @@
}
@Override
- public List<Map> getExportUserList(String arp, String name, String departmentName, String project, String company) {
- return sysUserDao.getExportUserList(arp, name, departmentName, project, company);
+ public List<Map> getExportUserList(String arp, String name, String departmentName, Long projectId, String company) {
+ return sysUserDao.getExportUserList(arp, name, departmentName, projectId, company);
}
@Override
@@ -436,7 +438,7 @@
Map<String, String> map = new LinkedHashMap<>();
map.put("companyName", "单位");
map.put("departmentName", "部门");
- map.put("project", "课题组");
+ map.put("projectName", "课题组");
map.put("arp", "ARP");
map.put("name", "姓名");
map.put("account", "账号");
--
Gitblit v1.9.2