- api 이슈 추가 시 입력한 ip에 속해있는 업체정보를 가진 이슈의 하위로 입력되도록 수정 - issue_company 테이블에 i...

minhee

2022-03-10 bdb1efdc604fce543e21152b4263a9362f64389f

 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">
@@ -640,13 +648,13 @@

    <insert id="insertBatch" keyColumn="id" keyProperty="id" useGeneratedKeys="true">
        INSERT INTO issue(title, description, issue_number, project_id, issue_type_id, priority_id, severity_id,
        start_date, complete_date,
        start_date, complete_date, parent_issue_id,
        issue_status_id, register_id, modify_id, register_date, modify_date)
        VALUES
        <foreach collection="list" item="issueForm" index="index" separator="," open="" close="">
            (#{issueForm.title}, #{issueForm.description}, #{issueForm.issueNumber}, #{issueForm.projectId},
            #{issueForm.issueTypeId}, #{issueForm.priorityId}, #{issueForm.severityId}, #{issueForm.startDate},
            #{issueForm.completeDate},
            #{issueForm.completeDate}, #{issueForm.parentIssueId},
            #{issueForm.issueStatusId}, #{issueForm.registerId}, #{issueForm.registerId}, NOW(), NOW())
        </foreach>
    </insert>
@@ -809,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">