From d9f3ee8f482c0d352eecb361bb9333d29f554181 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 23 十二月 2020 17:50:19 +0800
Subject: [PATCH] 获取所有人员，人员相关实验室，实验室相关试剂柜
---
src/main/java/com/nanometer/smartlab/entity/dto/SysLaboratoryDto.java | 38 +++++++++
src/main/java/com/nanometer/smartlab/service/SysUserService.java | 3
src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml | 42 ++++++++++
src/main/java/com/nanometer/smartlab/api/ApiAction.java | 18 ++++
src/main/java/com/nanometer/smartlab/entity/dto/SysUserDto.java | 73 ++++++++++++++++++
src/main/java/com/nanometer/smartlab/entity/dto/SysLaboratoryContainerDto.java | 24 ++++++
src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java | 6 +
src/main/java/com/nanometer/smartlab/dao/SysUserDao.java | 3
8 files changed, 207 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
index dbf3054..eba9df5 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -1246,6 +1246,24 @@
}
+ /**
+ * @Description: 获取所有人员，人员相关实验室，实验室相关试剂柜
+ * @date 2020/12/23 16:47
+ */
+ @ResponseBody
+ @RequestMapping("getApplyPersonDetailInfo")
+ public Object getApplyPersonDetailInfo() {
+ try {
+ List data = sysUserService.getUserInfo();
+ return ResponseModel.getOkInstence(data);
+ } catch (Exception e) {
+ e.printStackTrace();
+ logger.info(e);
+ return ResponseModel.getErrInstance("系统出错");
+ }
+
+ }
+
}
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
index 0fe3b5e..8893b27 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
@@ -1,6 +1,7 @@
package com.nanometer.smartlab.dao;
import com.nanometer.smartlab.entity.SysUser;
+import com.nanometer.smartlab.entity.dto.SysUserDto;
import org.apache.ibatis.annotations.Param;
import org.springframework.dao.DataAccessException;
@@ -42,4 +43,6 @@
List<SysUser> getUserListByContainerCodeNew(String containerCode, String startTime, String endTime);
+
+ List<SysUserDto> selectUserInfo();
}
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
index 7411b75..5ab4270 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
@@ -25,6 +25,23 @@
<result property="projectId" column="project_id"></result>
</resultMap>
+ <resultMap id="SysUserDto" type="com.nanometer.smartlab.entity.dto.SysUserDto">
+ <id property="id" column="id"/>
+ <result property="arp" column="arp"/>
+ <result property="account" column="account"/>
+ <result property="department" column="department"/>
+ <result property="name" column="name"/>
+ <result property="point" column="point"/>
+ <collection property="sysLaboratory" ofType="com.nanometer.smartlab.entity.dto.SysLaboratoryDto" fetchType="lazy">
+ <id property="id" column="sl_id"/>
+ <result property="name" column="sl_name"/>
+ <collection property="sysLaboratoryContainer" ofType="com.nanometer.smartlab.entity.dto.SysLaboratoryContainerDto" fetchType="lazy">
+ <id property="id" column="slc_id"/>
+ <result property="name" column="slc_name"/>
+ </collection>
+ </collection>
+ </resultMap>
+
<sql id="queryWhereSql">
<if test="arp != null and arp != ''">
and su.arp like #{arp}
@@ -193,6 +210,31 @@
<select id="selectByAccount" parameterType="com.nanometer.smartlab.entity.SysUser" resultMap="SysUser">
select * from sys_user where valid_flag=1 and account=#{account}
</select>
+ <select id="selectUserInfo" resultMap="SysUserDto">
+ SELECT
+ su.id,
+ su.arp,
+ su.account,
+ su.`name`,
+ su.point,
+ bm1.meta_value department,
+ sl.id sl_id,
+ sl.`name` sl_name,
+ slc.id slc_id,
+ slc.`name` slc_name
+FROM
+ sys_user su
+ LEFT JOIN base_meta bm1 on bm1.id = su.department
+ LEFT JOIN sys_laboratory sl on sl.department = su.department
+ LEFT JOIN sys_laboratory_container slc on slc.laboratory_id = sl.id
+
+
+
+ WHERE su.valid_flag = 1
+ and sl.valid_flag = 1
+ and slc.valid_flag = 1
+
+ </select>
<update id="updateUserPointBySelective" parameterType="java.util.Map">
update sys_user set point=#{point}
diff --git a/src/main/java/com/nanometer/smartlab/entity/dto/SysLaboratoryContainerDto.java b/src/main/java/com/nanometer/smartlab/entity/dto/SysLaboratoryContainerDto.java
new file mode 100644
index 0000000..e805abc
--- /dev/null
+++ b/src/main/java/com/nanometer/smartlab/entity/dto/SysLaboratoryContainerDto.java
@@ -0,0 +1,24 @@
+package com.nanometer.smartlab.entity.dto;
+
+import java.io.Serializable;
+
+public class SysLaboratoryContainerDto implements Serializable {
+ private String id;
+ private String name;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
diff --git a/src/main/java/com/nanometer/smartlab/entity/dto/SysLaboratoryDto.java b/src/main/java/com/nanometer/smartlab/entity/dto/SysLaboratoryDto.java
new file mode 100644
index 0000000..9756e6d
--- /dev/null
+++ b/src/main/java/com/nanometer/smartlab/entity/dto/SysLaboratoryDto.java
@@ -0,0 +1,38 @@
+package com.nanometer.smartlab.entity.dto;
+
+import com.nanometer.smartlab.entity.SysLaboratoryContainer;
+
+import java.io.Serializable;
+import java.util.*;
+
+public class SysLaboratoryDto implements Serializable {
+
+ private String id;
+ private String name;
+ private List<SysLaboratoryContainerDto> sysLaboratoryContainer;
+
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public List<SysLaboratoryContainerDto> getSysLaboratoryContainer() {
+ return sysLaboratoryContainer;
+ }
+
+ public void setSysLaboratoryContainer(List<SysLaboratoryContainerDto> sysLaboratoryContainer) {
+ this.sysLaboratoryContainer = sysLaboratoryContainer;
+ }
+}
diff --git a/src/main/java/com/nanometer/smartlab/entity/dto/SysUserDto.java b/src/main/java/com/nanometer/smartlab/entity/dto/SysUserDto.java
new file mode 100644
index 0000000..891c8c1
--- /dev/null
+++ b/src/main/java/com/nanometer/smartlab/entity/dto/SysUserDto.java
@@ -0,0 +1,73 @@
+package com.nanometer.smartlab.entity.dto;
+
+
+import java.util.*;
+
+import java.io.Serializable;
+
+public class SysUserDto implements Serializable {
+ private String id;
+ private String arp;
+ private String account;
+ private String name;
+ private String point;
+ private String department;
+ private List<SysLaboratoryDto> sysLaboratory;
+
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getArp() {
+ return arp;
+ }
+
+ public void setArp(String arp) {
+ this.arp = arp;
+ }
+
+ public String getAccount() {
+ return account;
+ }
+
+ public void setAccount(String account) {
+ this.account = account;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getPoint() {
+ return point;
+ }
+
+ public void setPoint(String point) {
+ this.point = point;
+ }
+
+ public String getDepartment() {
+ return department;
+ }
+
+ public void setDepartment(String department) {
+ this.department = department;
+ }
+
+ public List<SysLaboratoryDto> getSysLaboratory() {
+ return sysLaboratory;
+ }
+
+ public void setSysLaboratory(List<SysLaboratoryDto> sysLaboratory) {
+ this.sysLaboratory = sysLaboratory;
+ }
+}
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserService.java b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
index 794b3a9..9d8ce1b 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserService.java
@@ -2,6 +2,7 @@
import com.nanometer.smartlab.entity.SysReagent;
import com.nanometer.smartlab.entity.SysUser;
+import com.nanometer.smartlab.entity.dto.SysUserDto;
import java.util.List;
import java.util.Map;
@@ -36,5 +37,7 @@
void updateUserFavor(SysReagent reagent, SysUser user) throws Exception;
+ List<SysUserDto> getUserInfo();
+
}
diff --git a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
index ff70071..1d53f68 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java
@@ -4,6 +4,7 @@
import com.nanometer.smartlab.dao.SysUserDao;
import com.nanometer.smartlab.entity.SysReagent;
import com.nanometer.smartlab.entity.SysUser;
+import com.nanometer.smartlab.entity.dto.SysUserDto;
import com.nanometer.smartlab.entity.enumtype.ApproverFlag;
import com.nanometer.smartlab.entity.enumtype.SeeFlag;
import com.nanometer.smartlab.exception.AlarmCode;
@@ -344,5 +345,10 @@
}
+ @Override
+ public List<SysUserDto> getUserInfo() {
+ return sysUserDao.selectUserInfo();
+ }
+
}
--
Gitblit v1.9.2