From 9f0a2abe27085bd8c7edf8a43a24f375f17fc43c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 18 Dec 2020 14:11:48 +0800
Subject: [PATCH] 模块：api接口 新增：根据7位货柜条码获取所属课题下的所有人员否则部门寻找 提出：秦老师
---
src/main/java/com/nanometer/smartlab/api/ApiAction.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 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 dc10aca..10aa27a 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -1067,4 +1067,38 @@
System.out.println(5);
return retJSON;*/
}
+
+ //从柜子的设备码根据设备的所在实验室的课题组的课题组下的所有用户，没有课题组则返回用部门搜索
+ @ResponseBody
+ @RequestMapping(value = "/userListByContainerCodeNew")
+ public Object userListByContainerCodeNew(@RequestParam String containerCode,@RequestParam String startTime, @RequestParam String endTime) throws ApiException {
+ logger.info("userListByContainerCodeNew start...containerCode= " + containerCode
+ + ",startTime=" + startTime
+ + ",endTime=" + endTime);
+
+
+ //1.课题组下的用户
+ List<SysUser> userList= interfaceService.getUserListByContainerCodeNew(containerCode, startTime, endTime);
+ if (userList == null) {
+ //2.否则部门下用户
+ userList = interfaceService.getUserListByContainerCode(containerCode, startTime, endTime);
+ }
+
+ List<Map> datalist = Lists.newArrayListWithCapacity(userList.size());
+ for (SysUser user : userList) {
+ Map<String, Object> map = Maps.newHashMapWithExpectedSize(5);
+ datalist.add(map);
+ map.put("name", user.getName());
+ map.put("role", user.getSeeFlag().getKey());
+ map.put("validFlag", user.getValidFlag().getKey());
+ map.put("idcard", user.getIdCard());
+ map.put("point", user.getPoint());
+ map.put("unit", user.getCompany());
+ map.put("Arp", user.getArp());
+ map.put("departmentName", user.getDepartment());
+
+ }
+ logger.info("getUserInfo end...");
+ return ResponseModel.getOkInstence(datalist);
+ }
}
--
Gitblit v1.9.2