From bdb1efdc604fce543e21152b4263a9362f64389f Mon Sep 17 00:00:00 2001 From: minhee <alsdldlfrl@gmail.com> Date: 목, 10 3월 2022 15:35:19 +0900 Subject: [PATCH] - api 이슈 추가 시 입력한 ip에 속해있는 업체정보를 가진 이슈의 하위로 입력되도록 수정 - issue_company 테이블에 ip 컬럼 추가 및 이슈 추가/수정 시 ip 대역대 항목 추가 --- src/main/resources/mybatis/query-template/issue-template.xml | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mybatis/query-template/issue-template.xml b/src/main/resources/mybatis/query-template/issue-template.xml index 8392915..ac15754 100644 --- a/src/main/resources/mybatis/query-template/issue-template.xml +++ b/src/main/resources/mybatis/query-template/issue-template.xml @@ -817,6 +817,36 @@ HAVING concatUseValue LIKE CONCAT('%', #{useValue}, '%') </select> + <!-- �듅�젙 �궗�슜�옄 �젙�쓽 �븘�뱶 IP 媛믪씠 �뾽泥댁� �룞�씪�븳 �씠�뒋瑜� 議고쉶 --> + <select id="findByCustomFieldValueOfIp" resultType="java.util.HashMap" parameterType="kr.wisestone.owl.web.condition.IssueCustomFieldValueCondition"> + SELECT + issue.id as id, + issue.title as title, + 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 + INNER JOIN issue_company issc ON issc.issue_id = issue.id + WHERE issue.issue_type_id = #{issueTypeId} + <if test="customFieldType != '' and customFieldType != null"> + AND customFieldValue.customFieldType = #{customFieldType} + </if> + <if test="useValue != '' and useValue != null"> + AND INET_ATON(issc.ip_start) <![CDATA[ <= ]]> #{useValue} AND INET_ATON(issc.ip_end) >= #{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