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/issueStatus-template.xml | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issueStatus-template.xml b/src/main/resources/mybatis/query-template/issueStatus-template.xml
index 14cf401..44f121f 100644
--- a/src/main/resources/mybatis/query-template/issueStatus-template.xml
+++ b/src/main/resources/mybatis/query-template/issueStatus-template.xml
@@ -3,6 +3,35 @@
<mapper namespace="kr.wisestone.owl.mapper.IssueStatusMapper">
+ <!--<select id="find" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueStatusCondition">
+ SELECT
+ DISTINCT i.id as id,
+ i.name as name,
+ i.color as color,
+ i.issue_status_type as issueStatusType,
+ CASE i.default_yn WHEN 'Y' THEN 'true' ELSE 'false' END as defaultYn
+ FROM
+ issue_status i
+ INNER JOIN workspace ws on i.workspace_id = ws.id
+ WHERE 1=1
+ <if test="name != '' and name != null">
+ AND i.name like CONCAT('%',#{name},'%')
+ </if>
+ <choose>
+ <when test="issueStatusTypes.size != 0">
+ AND i.issue_status_type IN
+ <foreach collection="issueStatusTypes" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ </when>
+ </choose>
+ AND ws.id = #{workspaceId}
+ ORDER BY i.name DESC
+ <if test="page != null and !page.equals('')">
+ limit #{pageSize} offset #{page};
+ </if>
+ </select>-->
+
<select id="find" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueStatusCondition">
SELECT
DISTINCT i.id as id,
@@ -25,7 +54,7 @@
</when>
</choose>
AND ws.id = #{workspaceId}
- ORDER BY i.name DESC
+ ORDER BY i.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
--
Gitblit v1.8.0