From 1951e84f213859fb4486b2f19dc827ff3406060d Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 금, 11 2월 2022 19:30:32 +0900
Subject: [PATCH] - 업체의 카테고리 대분류가 공백인데 중분류 조회되는 문제 해결 - 업체 상태 직접입력 일 경우 사용자가 직접입력한 상태명을 보여주도록 수정
---
src/main/resources/mybatis/query-template/issue-template.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index 325646f..56c91b8 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -132,6 +132,10 @@
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
</if>
+ <if test="beginDateRange != null and !beginDateRange.equals('') and endDateRange != null and !endDateRange.equals('')">
+ AND (issue.start_date BETWEEN #{beginDateRange} AND #{endDateRange} OR issue.complete_date BETWEEN #{beginDateRange} AND #{endDateRange})
+ </if>
+
<if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
<if test="hideDownIssue != null and hideDownIssue == true">
AND issue.parent_issue_id IS NULL
@@ -140,6 +144,10 @@
<if test="hideCompleteIssue != null and hideCompleteIssue == true">
AND issue_status.issue_status_type != 'CLOSE'
+ </if>
+
+ <if test="parentYN != null and parentYN == true">
+ AND issue.parent_issue_id IS NULL
</if>
<choose>
@@ -242,7 +250,7 @@
AND issue.reverse_index <![CDATA[ < ]]> 0
AND workspace.id = #{workspaceId}
GROUP BY issue.id
- ORDER BY issue.modify_date DESC
+ ORDER BY issue.register_date DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
@@ -345,6 +353,10 @@
ANd issue.complete_date <![CDATA[ <= ]]> #{endCompleteDate}
</if>
+ <if test="beginDateRange != null and !beginDateRange.equals('') and endDateRange != null and !endDateRange.equals('')">
+ AND (issue.start_date BETWEEN #{beginDateRange} AND #{endDateRange} OR issue.complete_date BETWEEN #{beginDateRange} AND #{endDateRange})
+ </if>
+
<if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
<if test="hideDownIssue != null and hideDownIssue == true">
AND issue.parent_issue_id IS NULL
--
Gitblit v1.8.0