From f919af96e5e083ad462a5e71c00ff148ebdb91c6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 15:23:28 +0900
Subject: [PATCH] - 오토 컴플릿 항목 선택하면 목록 사라지게 수정 - 업체 메일 발송 시 템플릿 선택 문구 변경 - 연락처 입력 폼 정규식 제거하고 숫자만 입력 가능하게 수정 - 모든 사용자 필드(날짜) 24시간 타입으로 변경
---
src/main/resources/mybatis/query-template/user-template.xml | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/user-template.xml b/src/main/resources/mybatis/query-template/user-template.xml
index 93a60ef..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">
@@ -173,7 +179,23 @@
<select id="findByLevelId" resultType="java.lang.Long" parameterType="java.lang.Long">
SELECT count(u.id)
FROM user u
- WHERE u.level_id = #{levelId}
+ 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