From c6019ef49d09ec3ef50485a2733401e99474bfe0 Mon Sep 17 00:00:00 2001
From: Romesum <zhiyuewu@foxmail.com>
Date: Sun, 24 May 2020 16:01:53 +0800
Subject: [PATCH] =?UTF-8?q?[fix][M]:=20=E5=AE=8C=E5=96=84LabDTO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hzu/bookingsystem/dto/LabDTO.java     | 14 +++---
 .../hzu/bookingsystem/service/LabService.java |  8 ++++
 .../service/impl/LabServiceImpl.java          | 48 +++++++++++++++----
 3 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/java/src/main/java/com/hzu/bookingsystem/dto/LabDTO.java b/java/src/main/java/com/hzu/bookingsystem/dto/LabDTO.java
index 1aa560d..11f4943 100644
--- a/java/src/main/java/com/hzu/bookingsystem/dto/LabDTO.java
+++ b/java/src/main/java/com/hzu/bookingsystem/dto/LabDTO.java
@@ -6,9 +6,15 @@ import java.util.Date;
 
 @Data
 public class LabDTO {
-    private Integer labId;
+    private Integer lab_id;
     // 管理员uID
-    private Integer managerId;
+    private Integer manager_id;
+
+    // 管理员姓名
+    private String nickname;
+
+    // 管理员联系电话
+    private String tel;
 
     // 实验室名称
     private String name;
@@ -21,8 +27,4 @@ public class LabDTO {
 
     // 实验室含有的软件（逗号隔开）
     private String software;
-
-    private Date createTime;
-
-    private Date updateTime;
 }
\ No newline at end of file
diff --git a/java/src/main/java/com/hzu/bookingsystem/service/LabService.java b/java/src/main/java/com/hzu/bookingsystem/service/LabService.java
index d2805c9..4d99e31 100644
--- a/java/src/main/java/com/hzu/bookingsystem/service/LabService.java
+++ b/java/src/main/java/com/hzu/bookingsystem/service/LabService.java
@@ -67,4 +67,12 @@ public interface LabService {
      */
     List<LabDTO> findAllLabInfo();
 
+
+    /**
+     * author 吴志岳
+     * 通过ID查找DTO
+     */
+    LabDTO findDTOById(Integer lab_id);
+
+
 }
\ No newline at end of file
diff --git a/java/src/main/java/com/hzu/bookingsystem/service/impl/LabServiceImpl.java b/java/src/main/java/com/hzu/bookingsystem/service/impl/LabServiceImpl.java
index 55342b5..049ef69 100644
--- a/java/src/main/java/com/hzu/bookingsystem/service/impl/LabServiceImpl.java
+++ b/java/src/main/java/com/hzu/bookingsystem/service/impl/LabServiceImpl.java
@@ -64,18 +64,48 @@ public class LabServiceImpl implements LabService {
 
     @Override
     public List<LabDTO> findAllLabInfo() {
-        String sql = "SELECT tb_lab.lab_id as LabId," +
-                "tb_lab.manager_id as managerId," +
-                "tb_lab.name," +
-                "tb_lab.position," +
-                "tb_lab.capacity," +
-                "tb_lab.software " +
+        String sql = "SELECT " +
+                " tb_lab.lab_id,  " +
+                " tb_lab.name,  " +
+                " tb_lab.position,  " +
+                " tb_lab.capacity,  " +
+                " tb_lab.software,  " +
+                " tb_lab.manager_id,  " +
+                " tb_user.nickname,  " +
+                " tb_user.tel " +
                 "FROM " +
-                "tb_lab ";
+                " tb_lab, " +
+                " tb_user " +
+                "WHERE " +
+                " tb_lab.manager_id = tb_user.u_id";
         Query query = entityManager.createNativeQuery(sql);
         query.unwrap(SQLQuery.class).setResultTransformer(Transformers.aliasToBean(LabDTO.class));
-        List<LabDTO> LabDTOList = query.getResultList();
-        return LabDTOList;
+        List<LabDTO> labDTOList = query.getResultList();
+        return labDTOList;
+    }
+
+
+    @Override
+    public LabDTO findDTOById(Integer lab_id) {
+        String sql = "SELECT " +
+                " tb_lab.lab_id,  " +
+                " tb_lab.name,  " +
+                " tb_lab.position,  " +
+                " tb_lab.capacity,  " +
+                " tb_lab.software,  " +
+                " tb_lab.manager_id,  " +
+                " tb_user.nickname,  " +
+                " tb_user.tel " +
+                "FROM " +
+                " tb_lab, " +
+                " tb_user " +
+                "WHERE " +
+                " tb_lab.manager_id = tb_user.u_id AND tb_lab.lab_id = "+ lab_id;
+        Query query = entityManager.createNativeQuery(sql);
+        query.unwrap(SQLQuery.class).setResultTransformer(Transformers.aliasToBean(LabDTO.class));
+        List<LabDTO> labDTOList = query.getResultList();
+        LabDTO labDTO = labDTOList.get(0);
+        return labDTO;
     }
 
 }