From fcdb56cf78b63f5b1455bbfab0c2bd7934b0aca5 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 07 四月 2021 18:18:14 +0800
Subject: [PATCH] 去除多余事务
---
src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
index 3f5683a..1337895 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
@@ -4,6 +4,8 @@
import com.nanometer.smartlab.dao.SysUserDao;
import com.nanometer.smartlab.entity.SysReagent;
import com.nanometer.smartlab.entity.SysUser;
+import com.nanometer.smartlab.entity.dto.HazardousWasteUser;
+import com.nanometer.smartlab.entity.dto.LaboratoryVo;
import com.nanometer.smartlab.entity.dto.SysUserDto;
import com.nanometer.smartlab.entity.enumtype.ApproverFlag;
import com.nanometer.smartlab.entity.enumtype.SeeFlag;
@@ -41,7 +43,7 @@
SysUserDao sysUserDao;
@Transactional(propagation = Propagation.REQUIRED)
- public List<SysUser> getSysUserList(String arp, String name,String departmentName, Integer first, Integer pageSize) {
+ public List<SysUser> getSysUserList(String arp, String name,String departmentName,String project,String company, Integer first, Integer pageSize) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(arp)) {
@@ -53,6 +55,8 @@
if (StringUtils.isNotBlank(departmentName)) {
params.put("departmentNameLike", "%" + departmentName + "%");
}
+ params.put("project", project);
+ params.put("company", company);
params.put("first", first);
params.put("pageSize", pageSize);
return this.sysUserDao.getSysUserList(params);
@@ -62,7 +66,7 @@
}
}
@Transactional(propagation = Propagation.REQUIRED)
- public int getSysUserTotalCount(String arp, String name,String departmentName) {
+ public int getSysUserTotalCount(String arp, String name,String departmentName,String project,String company) {
try {
Map<String, Object> params = new HashMap<String, Object>();
if (StringUtils.isNotBlank(arp)) {
@@ -74,11 +78,35 @@
if (StringUtils.isNotBlank(departmentName)) {
params.put("departmentNameLike", "%" + departmentName + "%");
}
+ params.put("project", project);
+ params.put("company", company);
return this.sysUserDao.getSysUserTotalCount(params);
} catch (DataAccessException e) {
logger.error(e.getMessage(), e);
throw new BusinessException(ExceptionEnumCode.DB_ERR, MessageUtil.getMessageByCode(ExceptionEnumCode.DB_ERR.getCode()), e);
}
+ }
+
+ @Override
+ public int getUserCountInProject(String arp, String name, String departmentName, String project, 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("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) {
+ 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("company", company);
+ return sysUserDao.getUserInProject(params);
}
@Transactional(propagation = Propagation.REQUIRED)
@@ -351,11 +379,22 @@
}
@Override
- public SysUser getUserByAccount(String account) {
+ public HazardousWasteUser getUserByAccount(String account,String name) {
Map<String, String> params = new HashMap<>();
params.put("account", account);
+ params.put("name", name);
return sysUserDao.getUserByAccount(params);
}
+ @Override
+ public List<LaboratoryVo.LaboratoryUser> getUserByProject(String project) {
+ return sysUserDao.getUserByProject(project);
+ }
+
+ @Override
+ public List<SysUser> getUserByArp(String arp) {
+ return sysUserDao.getUserByArp(arp);
+ }
+
}
--
Gitblit v1.9.2