[fix][M]: 完善LabDTO

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;
 }

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);
+
+
 }

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," +
+        String sql = "SELECT " +
+                " tb_lab.lab_id,  " +
                 " tb_lab.name,  " +
                 " tb_lab.position,  " +
                 " tb_lab.capacity,  " +
-                "tb_lab.software " +
+                " 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;
     }
 
 }