模块：api接口 修改：新增返回字段课题组 提出：秦老师

gdg

2020-12-18 bc2fe224aa18e0b503d26ceace086e90fadf5608

模块：api接口
修改：新增返回字段课题组
提出：秦老师

 src/main/java/com/nanometer/smartlab/api/ApiAction.java

@@ -222,35 +222,6 @@
        return retJSON.toJSONString();
    }

    @ResponseBody
    @RequestMapping(value = "/userListByContainerCode")
    public Object userListByContainerCode(@RequestParam String containerCode,@RequestParam String startTime, @RequestParam String endTime) throws ApiException {
        logger.info("userListByContainerCode start...containerCode= " + containerCode
                + ",startTime=" + startTime
                + ",endTime=" + endTime);

        List<SysUser> 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);
    }




    @ResponseBody
    @RequestMapping(value = "/openCabinetDoor")
@@ -1070,7 +1041,7 @@

    //从柜子的设备码根据设备的所在实验室的课题组的课题组下的所有用户，没有课题组则返回用部门搜索
    @ResponseBody
    @RequestMapping(value = "/userListByContainerCodeNew")
    @RequestMapping(value = "/userListByContainerCode")
    public Object userListByContainerCodeNew(@RequestParam String containerCode,@RequestParam String startTime, @RequestParam String endTime) throws ApiException {
        logger.info("userListByContainerCodeNew start...containerCode= " + containerCode
                + ",startTime=" + startTime
@@ -1096,6 +1067,7 @@
            map.put("unit", user.getCompany());
            map.put("Arp", user.getArp());
            map.put("departmentName", user.getDepartment());
            map.put("project", user.getProject());

        }
        logger.info("getUserInfo end...");

 src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml

@@ -164,27 +164,30 @@
  </select>

  <select id="getUserListByContainerCode" parameterType="java.util.Map" resultMap="SysUser">
    select u.name,u.see_flag,u.role_id,u.valid_flag,u.id_card,container_code,bm2.meta_value department,bm1.meta_value company,u.arp,u.point
    select u.name,u.see_flag,u.role_id,u.valid_flag,u.id_card,container_code,bm2.meta_value department,bm1.meta_value company,u.arp,u.point,sp.project
    from sys_user u
    left join sys_laboratory l on l.department = u.department and l.valid_flag = 1
    left join sys_laboratory_container c on c.laboratory_id = l.id and c.valid_flag = 1
    left join base_meta bm1 on bm1.id = u.company
    left join base_meta bm2 on bm2.id = u.department
    LEFT JOIN sys_project sp on sp.id = u.project_id and sp.valid_flag = 1
    where container_code = #{0}
    and u.update_time >= #{1} and #{2} > u.update_time
  </select>


    <select id="getUserListByContainerCodeNew" parameterType="java.util.Map" resultMap="SysUser">
        SELECT u.name,u.see_flag,u.role_id,u.valid_flag,u.id_card,bm2.meta_value department,bm1.meta_value company,u.arp,u.point
        SELECT u.name,u.see_flag,u.role_id,u.valid_flag,u.id_card,bm2.meta_value department,bm1.meta_value company,u.arp,u.point,sp.project
    from sys_user u
    left join base_meta bm1 on bm1.id = u.company
    left join base_meta bm2 on bm2.id = u.department
    where project_id = (
    LEFT JOIn sys_project sp on sp.id = u.project_id
    where u.project_id = (
    SELECT project_id from sys_laboratory_container
    WHERE container_code =  #{0}
    and  valid_flag = 1)
    AND u.valid_flag = 1
    and sp.valid_flag = 1
    and u.update_time >= #{1} and #{2} > u.update_time
  </select>


 src/main/java/com/nanometer/smartlab/entity/SysUser.java

@@ -33,6 +33,7 @@
    private String containerCodeList;
    private String roleName;
    private String projectId;
    private String project;

    public String getId() {
        return id;
@@ -202,4 +203,11 @@
        this.projectId = projectId;
    }

    public String getProject() {
        return project;
    }

    public void setProject(String project) {
        this.project = project;
    }
}