From 8c9fe9cf7890c0360672b8cd6924c76f11452006 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 월, 20 12월 2021 17:00:01 +0900 Subject: [PATCH] - 이슈상세에서 하위이슈 추가 검색시 상위 이슈는 검색 리스트에서 제외 - 이슈상세에서 연관 이슈/하위 이슈 리스트 전체 불러오기(10개이상 스크롤) - 이슈추가,수정 시 파트너 정보 불러오기 수정 - 하위이슈 히스토리 코드 수정 --- src/main/resources/mybatis/query-template/user-template.xml | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mybatis/query-template/user-template.xml b/src/main/resources/mybatis/query-template/user-template.xml index 0ab56f2..e16010d 100644 --- a/src/main/resources/mybatis/query-template/user-template.xml +++ b/src/main/resources/mybatis/query-template/user-template.xml @@ -113,8 +113,14 @@ <!-- �씠硫붿씪 �삁�빟 �떆媛� 李얘린 --> <select id="findByReservationNotifyTime" resultType="java.util.HashMap" parameterType="java.util.HashMap"> - select account from user where reservation_notify_time between - #{startTime} and #{endTime} + select account from user + where reservation_notify_time between #{startTime} and #{endTime} + </select> + + <!-- �씠硫붿씪 �떎�떆媛� 李얘린 --> + <select id="findByRealTimeNotifyTime" resultType="java.util.HashMap" parameterType="java.util.HashMap"> + select account from user + where reservation_notify_time = "realTime" </select> <select id="findByAllWorkspace" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.UserCondition"> @@ -176,4 +182,20 @@ WHERE u.level_id = #{id} </select> + <select id="findByMyLevelAndDepartment" resultType="java.util.HashMap" parameterType="java.lang.Long"> + SELECT + DISTINCT u.id as id, + ul.level_name AS levelName, + GROUP_CONCAT(d.department_name) AS departmentName, + u.name as name, + u.account as account, + u.profile as profile, + u.status as STATUS + FROM user u + LEFT OUTER JOIN user_level ul ON u.level_id = ul.id + LEFT OUTER JOIN user_department ud ON ud.user_id = u.id + LEFT OUTER JOIN department d ON d.id = ud.department_id + WHERE u.id = #{id} + </select> + </mapper> \ No newline at end of file -- Gitblit v1.8.0