From d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 27 一月 2021 16:54:34 +0800
Subject: [PATCH] 合并
---
src/main/java/com/nanometer/smartlab/dao/SysUserDao.java | 8 ++++++--
1 files changed, 6 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 14685de..581b524 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.java
@@ -1,6 +1,8 @@
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;
@@ -42,9 +44,11 @@
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();
- SysUser getUserByAccount(Map params);
+ HazardousWasteUser getUserByAccount(Map params);
+
+ List<LaboratoryVo.LaboratoryUser> getUserByProject(@Param("project") String project);
}
--
Gitblit v1.9.2