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 | 101 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 71 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
index 021fbca..4bd2806 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
@@ -2,6 +2,7 @@
import com.google.common.collect.ImmutableMap;
import com.nanometer.smartlab.dao.SysUserDao;
+import com.nanometer.smartlab.entity.SysLaboratoryContainer;
import com.nanometer.smartlab.entity.SysReagent;
import com.nanometer.smartlab.entity.SysUser;
import com.nanometer.smartlab.entity.dto.HazardousWasteUser;
@@ -13,6 +14,7 @@
import com.nanometer.smartlab.exception.AlarmException;
import com.nanometer.smartlab.exception.BusinessException;
import com.nanometer.smartlab.exception.ExceptionEnumCode;
+import com.nanometer.smartlab.model.CommonPage;
import com.nanometer.smartlab.util.ExcelUtils;
import com.nanometer.smartlab.util.FacesUtils;
import com.nanometer.smartlab.util.IDUtils;
@@ -41,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)) {
@@ -53,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);
@@ -63,8 +67,37 @@
throw new BusinessException(ExceptionEnumCode.DB_ERR, MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
}
}
+
+ @Override
+ public CommonPage<SysUser> getSysUserList(Integer pageNum, Integer pageSize, String name) {
+ if(pageNum==null||pageNum<1){
+ pageNum=1;
+ }
+ if(pageSize==null||pageSize<1){
+ pageSize=10;
+ }
+ if(pageSize>50){
+ pageSize=50;
+ }
+ Map<String, Object> params = new HashMap<>();
+ if (StringUtils.isNotBlank(name)) {
+ params.put("name","%" + name+ "%");
+ }
+ params.put("first", (pageNum-1)*pageSize);
+ params.put("pageSize", pageSize);
+ CommonPage commonPage=new CommonPage();
+ commonPage.setPageNum(pageNum);
+ commonPage.setPageSize(pageSize);
+ Long total=new Long(sysUserDao.getSysUserTotalCount(params));
+ commonPage.setTotal(total);
+ commonPage.setTotalPage(CommonPage.getTotalPage(total,pageSize));
+ List<SysUser> sysReagents=sysUserDao.getSysUserSimpleInfoList(params);
+ commonPage.setList(sysReagents);
+ return commonPage;
+ }
+
@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)) {
@@ -76,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) {
@@ -86,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) {
@@ -118,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) {
@@ -162,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);
@@ -192,10 +225,11 @@
}
@Override
- public List<SysUser> getHasProjectSysUserList(String department) {
+ public List<SysUser> getHasProjectSysUserList(Long department, Long projectId) {
try {
Map<String, Object> params = new HashMap<String, Object>();
params.put("department", department);
+ params.put("projectId", projectId);
params.put("approverFlag", ApproverFlag.YES);
return this.sysUserDao.getHasProjectSysUserList(params);
} catch (DataAccessException e) {
@@ -216,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);
@@ -230,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) {
@@ -272,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());
}
@@ -297,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);
}
@@ -315,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);
@@ -341,7 +375,7 @@
}
@Override
- public SysUser getUser(String id) {
+ public SysUser getUser(Long id) {
try {
return this.sysUserDao.getUser(id);
} catch (DataAccessException e) {
@@ -377,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
@@ -395,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
@@ -404,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", "账号");
@@ -427,5 +461,12 @@
return sysUserDao.getLibrarianEmail();
}
+ @Override
+ public SysUser getUserByName(String approveUserName) {
+ List<SysUser> users = sysUserDao.getUserByName(approveUserName);
+ if (users.size() != 1) return null;
+ return users.get(0);
+ }
+
}
--
Gitblit v1.9.2