Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2022-01-06 6adb341db180240e0af34ace40100912d4ed5257

 src/main/resources/mybatis/query-template/issue-template.xml

@@ -32,6 +32,9 @@
        severity.id as severityId,
        severity.name as severityName,
        severity.color as severityColor,
        ic.name AS companyName,
        ii.name AS ispName,
        ih.name AS hostingName,
        GROUP_CONCAT(issue_custom.use_value) AS useValue,
        IFNULL(temp_attached_file.attachedFileCount, 0) as attachedFileCount,
        IFNULL(temp_issue_comment.issueCommentCount, 0) as issueCommentCount
@@ -204,7 +207,7 @@
        </choose>

        <choose>
            <when test="departmentIds.size != 0 and myDepartmentIds != null and myDepartmentIds.size != 0">
            <when test="myDepartmentIds != null and myDepartmentIds.size != 0">
                AND isd.department_id IN
                <foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
                    #{item}
@@ -737,7 +740,7 @@
        </choose>

        <choose>
            <when test="departmentIds.size != 0 and myDepartmentIds != null and myDepartmentIds.size != 0">
            <when test="myDepartmentIds != null and myDepartmentIds.size != 0">
                AND isd.department_id IN
                <foreach collection="myDepartmentIds" item="item" index="index" separator="," open="(" close=")">
                    #{item}
@@ -1096,16 +1099,28 @@
            issue.id as id,
            issue.title as title,
            customFieldValue.customFieldType AS customFieldType,
            GROUP_CONCAT(customFieldValue.useValue) AS concatUseValue
            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
            ORDER BY issue_custom.id ASC) customFieldValue ON customFieldValue.issueId = issue.id
        WHERE issStatus.issue_status_type != 'CLOSE'
          AND issue.issue_type_id = #{issueTypeId}
            <choose>
                <when test="useValues.size != 0">
                    WHERE issue_custom.use_value IN
                    <foreach collection="useValues" item="item" index="index" separator="," open="(" close=")">
                        #{item}
                    </foreach>
                </when>
            </choose>
            ) customFieldValue ON customFieldValue.issueId = issue.id
        WHERE issue.issue_type_id = #{issueTypeId}
        <choose>
            <when test="issueStatusType != null">
                AND issStatus.issue_status_type != #{issueStatusType}
            </when>
        </choose>
        GROUP BY issue.id
        HAVING concatUseValue LIKE CONCAT('%', #{useValue}, '%')
    </select>