From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정
---
src/main/resources/mybatis/query-template/issue-template.xml | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml
index d529c00..a30841c 100644
--- a/src/main/resources/mybatis/query-template/issue-template.xml
+++ b/src/main/resources/mybatis/query-template/issue-template.xml
@@ -139,7 +139,7 @@
</if>
<if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
- <if test="hideDownIssue != null and hideDownIssue == true">
+ <if test="hideDownIssue != null and hideDownIssue == true and parentYN == true">
AND issue.parent_issue_id IS NULL
</if>
</if>
@@ -148,8 +148,12 @@
AND issue_status.issue_status_type != 'CLOSE'
</if>
- <if test="parentYN != null and parentYN == true">
+ <if test="parentYN != null and parentYN == true and hideDownIssue == true">
AND issue.parent_issue_id IS NULL
+ </if>
+
+ <if test="hideDownIssue == false and parentYN == false">
+ AND issue.parent_issue_id IS NOT NULL
</if>
<choose>
@@ -360,9 +364,13 @@
</if>
<if test="combinationIssueNumber == null or combinationIssueNumber.equals('')">
- <if test="hideDownIssue != null and hideDownIssue == true">
+ <if test="hideDownIssue != null and hideDownIssue == true and parentYN == true">
AND issue.parent_issue_id IS NULL
</if>
+ </if>
+
+ <if test="hideDownIssue == false and parentYN == false">
+ AND issue.parent_issue_id IS NOT NULL
</if>
<if test="hideCompleteIssue != null and hideCompleteIssue == true">
@@ -809,6 +817,34 @@
HAVING concatUseValue LIKE CONCAT('%', #{useValue}, '%')
</select>
+ <!-- �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠(SITE,IP) �뾽泥댁� �룞�씪�븳 �씠�뒋瑜� 議고쉶 -->
+ <select id="findByCustomFieldValueBySite" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCustomFieldValueCondition">
+ SELECT
+ issue.id as id,
+ issue.title as title,
+ issc.ip_start AS ipStart,
+ issc.ip_end AS ipEnd,
+ customFieldValue.customFieldType AS customFieldType,
+ GROUP_CONCAT(customFieldValue.useValue ORDER BY customFieldValue.customFieldId ASC) AS concatUseValue
+ FROM issue issue FORCE INDEX(reverseIndex)
+ INNER JOIN issue_status as issStatus ON issue.issue_status_id = issStatus.id
+ LEFT OUTER JOIN (
+ SELECT cf.id AS customFieldId, cf.custom_field_type AS customFieldType, issue_custom.use_value AS useValue, issue_custom.issue_id AS issueId
+ FROM issue_custom_field_value issue_custom
+ INNER JOIN custom_field cf ON cf.id = issue_custom.custom_field_id
+ ) customFieldValue ON customFieldValue.issueId = issue.id
+ LEFT OUTER JOIN issue_company issc ON issc.issue_id = issue.id
+ WHERE issue.issue_type_id = #{issueTypeId}
+ <if test="useValue != null and useValue != ''">
+ AND issc.url LIKE CONCAT('%',#{useValue},'%')
+ </if>
+ <choose>
+ <when test="issueStatusType != null">
+ AND issStatus.issue_status_type != #{issueStatusType}
+ </when>
+ </choose>
+ GROUP BY issue.id
+ </select>
<!-- 醫낅즺 �븞�맂 �븯�쐞 �씠�뒋 媛��졇�삤湲� -->
<select id="findNotCompleteByParentIssueId" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCondition">
--
Gitblit v1.8.0