From e1454a154718e20abbab36d0def4de9124a07254 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 11 六月 2021 12:03:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/dao/SysUserDao.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
index 0fe3b5e..c2502aa 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
@@ -1,6 +1,9 @@
package com.nanometer.smartlab.dao;
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 org.apache.ibatis.annotations.Param;
import org.springframework.dao.DataAccessException;
@@ -32,7 +35,7 @@
public SysUser selectByAccount(SysUser user);
- Map getUser(String id);
+ SysUser getUser(String id);
void insertUserFavor(Map params);
@@ -41,5 +44,20 @@
int selectUserFavor(Map params);
- List<SysUser> getUserListByContainerCodeNew(String containerCode, String startTime, String endTime);
+ List<SysUser> getUserListByProject(String project, String startTime, String endTime);
+
+ List<SysUserDto> selectUserInfo();
+
+ HazardousWasteUser getUserByAccount(Map params);
+
+ List<LaboratoryVo.LaboratoryUser> getUserByProject(@Param("project") String project);
+
+ List<SysUser> getUserByArp(String arp);
+
+ int getUserCountInProject(Map params);
+
+ List<SysUser> getUserInProject(Map params);
+
+ List<Map> getExportUserList(@Param("arp") String arp,@Param("name") String name, @Param("departmentName") String departmentName,
+ @Param("project") String project,@Param("company") String company);
}
--
Gitblit v1.9.2