Commit @034e796fc3a14328129f26df1c6403a81b0cb0fa

woals 07-26

240726 권민수 학생 history에 책과 단원의 id 칼럼도 포함하여 보내도록 수정

@034e796fc3a14328129f26df1c6403a81b0cb0fa

30230f8

034e796

src/main/java/com/takensoft/ai_lms/lms/student/service/Impl/StudentInfoServiceImpl.java

--- src/main/java/com/takensoft/ai_lms/lms/student/service/Impl/StudentInfoServiceImpl.java

+++ src/main/java/com/takensoft/ai_lms/lms/student/service/Impl/StudentInfoServiceImpl.java


 
     @Override
     public StudentInfoVO getStudentInfo(String userId) {
-//        List<StudentInfoVO> studentInfos = studentInfoDAO.getStudentInfo(userId);
-//        return studentInfos.isEmpty() ? null : studentInfos.get(0);
         return studentInfoDAO.getStudentInfo(userId);
     }
 

30230f8

034e796

src/main/java/com/takensoft/ai_lms/lms/student/vo/HistoryVO.java

--- src/main/java/com/takensoft/ai_lms/lms/student/vo/HistoryVO.java

+++ src/main/java/com/takensoft/ai_lms/lms/student/vo/HistoryVO.java


 @Setter
 public class HistoryVO {
 
+    private String bookId;
     private String bookName;
+    private String unitId;
     private String unitName;
-    private Timestamp completionTime;
+    private String completionTime;
 
 }

30230f8

034e796

src/main/resources/mybatis/mapper/lms/student-SQL.xml

--- src/main/resources/mybatis/mapper/lms/student-SQL.xml

+++ src/main/resources/mybatis/mapper/lms/student-SQL.xml


         <result property="studentQuestion" column="studentQuestion"/>
         <collection property="history" ofType="com.takensoft.ai_lms.lms.student.vo.HistoryVO">
             <result property="bookName" column="bookName"/>
+            <result property="bookId" column="bookId"/>
             <result property="unitName" column="unitName"/>
+            <result property="unitId" column="unitId"/>
             <result property="completionTime" column="completionTime"/>
         </collection>
     </resultMap>

             ui.grd_no AS grade,
             ui.scls_nm AS className,
             uc.stn_qna AS studentQuestion,
+            hu.book_id AS bookId,
             hu.book_nm AS bookName,
+            hu.unit_id AS unitId,
             hu.unit_nm AS unitName,
             hu.cmptn_tm AS completionTime
         FROM users u

                  LEFT JOIN (
             SELECT
                 uu.user_id,
+                b.book_id,
                 b.book_nm,
+                un.unit_id,
                 un.unit_nm,
                 uu.cmptn_tm
             FROM user_unit uu

Add a comment

Open 0
Closed 0

List

...	...	@@ -16,8 +16,10 @@
16	16	@Setter
17	17	public class HistoryVO {
18	18
	19	+ private String bookId;
19	20	private String bookName;
	21	+ private String unitId;
20	22	private String unitName;
21		- private Timestamp completionTime;
	23	+ private String completionTime;
22	24
23	25	}

...	...	@@ -16,7 +16,9 @@
16	16	<result property="studentQuestion" column="studentQuestion"/>
17	17	<collection property="history" ofType="com.takensoft.ai_lms.lms.student.vo.HistoryVO">
18	18	<result property="bookName" column="bookName"/>
	19	+ <result property="bookId" column="bookId"/>
19	20	<result property="unitName" column="unitName"/>
	21	+ <result property="unitId" column="unitId"/>
20	22	<result property="completionTime" column="completionTime"/>
21	23	</collection>
22	24	</resultMap>
...	...	@@ -28,7 +30,9 @@
28	30	ui.grd_no AS grade,
29	31	ui.scls_nm AS className,
30	32	uc.stn_qna AS studentQuestion,
	33	+ hu.book_id AS bookId,
31	34	hu.book_nm AS bookName,
	35	+ hu.unit_id AS unitId,
32	36	hu.unit_nm AS unitName,
33	37	hu.cmptn_tm AS completionTime
34	38	FROM users u
...	...	@@ -38,7 +42,9 @@
38	42	LEFT JOIN (
39	43	SELECT
40	44	uu.user_id,
	45	+ b.book_id,
41	46	b.book_nm,
	47	+ un.unit_id,
42	48	un.unit_nm,
43	49	uu.cmptn_tm
44	50	FROM user_unit uu

...	...	@@ -23,8 +23,6 @@
23	23
24	24	@Override
25	25	public StudentInfoVO getStudentInfo(String userId) {
26		-// List<StudentInfoVO> studentInfos = studentInfoDAO.getStudentInfo(userId);
27		-// return studentInfos.isEmpty() ? null : studentInfos.get(0);
28	26	return studentInfoDAO.getStudentInfo(userId);
29	27	}
30	28

Delete comment