From e309c72c145f18d9b86ce9335893695ba2411803 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Wed, 19 Jun 2024 13:37:39 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=ED=86=B5=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/sql/mapper/base/code-mapper.xml    | 16 ++++++++--------
 .../webapp/WEB-INF/jsp/base/code/code-main.jsp   | 14 ++++++++++----
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/sql/mapper/base/code-mapper.xml b/src/main/resources/sql/mapper/base/code-mapper.xml
index be27d2b..3934e28 100644
--- a/src/main/resources/sql/mapper/base/code-mapper.xml
+++ b/src/main/resources/sql/mapper/base/code-mapper.xml
@@ -44,8 +44,8 @@
 <sql id="selectCategories"><include refid="utility.paging-prefix" />
 SELECT *
   FROM TB_CODE_CTGR
- WHERE USE_YN = 'Y'
-<if test="categoryIDs != null">  AND CTGR_ID IN (<foreach collection="categoryIDs" item="categoryID" separator=",">#{categoryID}</foreach>)</if>
+<where><if test="!includeAll"> AND USE_YN = 'Y'</if>
+<if test="categoryIDs != null">  AND CTGR_ID IN (<foreach collection="categoryIDs" item="categoryID" separator=",">#{categoryID}</foreach>)</if></where>
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix" /></sql>
 
@@ -94,9 +94,9 @@ UPDATE TB_CODE_CTGR SET
 <sql id="selectGroups"><include refid="utility.paging-prefix" />
 SELECT *
   FROM TB_CODE_GRP
- WHERE USE_YN = 'Y'
-<if test="categoryIDs != null">AND CTGR_ID IN (<foreach collection="categoryIDs" item="categoryID" separator=",">#{categoryID}</foreach>)</if>
-<if test="groupIDs != null">AND GRP_ID IN (<foreach collection="groupIDs" item="groupID" separator=",">#{groupID}</foreach>)</if>
+<where><if test="!includeAll"> AND USE_YN = 'Y'</if>
+<if test="categoryIDs != null"> AND CTGR_ID IN (<foreach collection="categoryIDs" item="categoryID" separator=",">#{categoryID}</foreach>)</if>
+<if test="groupIDs != null"> AND GRP_ID IN (<foreach collection="groupIDs" item="groupID" separator=",">#{groupID}</foreach>)</if></where>
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix" /></sql>
 
@@ -151,9 +151,9 @@ UPDATE TB_CODE_GRP SET
 <sql id="selectCodes"><include refid="utility.paging-prefix" />
 SELECT *
   FROM TB_CMN_CODE
- WHERE USE_YN = 'Y'
-  <if test='groupIDs != null'>AND GRP_ID IN (<foreach collection="groupIDs" item="groupID" separator=",">#{groupID}</foreach>)</if>
-  <if test='codes != null'>AND CODE IN (<foreach collection="codes" item="code" separator=",">#{code}</foreach>)</if>
+<where><if test="!includeAll"> AND USE_YN = 'Y'</if>
+  <if test='groupIDs != null'> AND GRP_ID IN (<foreach collection="groupIDs" item="groupID" separator=",">#{groupID}</foreach>)</if>
+  <if test='codes != null'> AND CODE IN (<foreach collection="codes" item="code" separator=",">#{code}</foreach>)</if></where>
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix" /></sql>
 
diff --git a/src/main/webapp/WEB-INF/jsp/base/code/code-main.jsp b/src/main/webapp/WEB-INF/jsp/base/code/code-main.jsp
index 8284c77..6ac3389 100644
--- a/src/main/webapp/WEB-INF/jsp/base/code/code-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/code/code-main.jsp
@@ -35,7 +35,7 @@
                     <tbody id="groupList">
 					</tbody>
                    	<template id="groupRow">
-                   	<tr data-key="{GRP_ID}">
+                   	<tr data-key="{GRP_ID}"{notUsed}>
                        <td style="text-align:center;"><input value="{GRP_ID}" onchange="codeControl.groups.select('{GRP_ID}', this.checked);" type="checkbox" class="form-check-input"></td>
                        <td onclick="codeControl.groups.setCurrent('{GRP_ID}')" ondblclick="codeControl.groups.getInfo({})">{GRP_ID}</td>
                        <td onclick="codeControl.groups.setCurrent('{GRP_ID}')" ondblclick="codeControl.groups.getInfo({})">{GRP_NM}</td>
@@ -73,7 +73,7 @@
                     <tbody id="codeList">
 					</tbody>
                    	<template id="codeRow">
-                   	<tr data-key="{CODE}">
+                   	<tr data-key="{CODE}"{notUsed}>
                        <td style="text-align:center;"><input value="{CODE}" onchange="codeControl.codes.select('{CODE}', this.checked);" type="checkbox" class="form-check-input"></td>
                        <td onclick="codeControl.codes.setCurrent('{CODE}')" ondblclick="codeControl.codes.getInfo({})">{CODE}</td>
                        <td onclick="codeControl.codes.setCurrent('{CODE}')" ondblclick="codeControl.codes.getInfo({})">{CODE_VAL}</td>
@@ -131,7 +131,10 @@ function renderGroupList() {
 	
 	let trs = empty ?
 		[document.getElementById("groupNotFound").innerHTML] : <%-- from template#groupNotFound --%>
-		groupList.inStrings(document.getElementById("groupRow").innerHTML); <%-- from template#groupRow --%>
+		groupList.inStrings(
+			document.getElementById("groupRow").innerHTML,
+			(tmpl, item) => tmpl.replace(/{notUsed}/gi, item.getValue("USE_YN") == "N" ? "class=\"not-used\"" : "")
+		); <%-- from template#groupRow --%>
 	$("#groupList").html(trs.join());
 	$("th input[type='checkbox']").prop("checked", false);
 }
@@ -174,7 +177,10 @@ function renderCodeList() {
 	
 	let trs = empty ?
 		[document.getElementById("codeNotFound").innerHTML] : <%-- from template#groupNotFound --%>
-		codeList.inStrings(document.getElementById("codeRow").innerHTML); <%-- from template#groupRow --%>
+		codeList.inStrings(
+			document.getElementById("codeRow").innerHTML,
+			(tmpl, item) => tmpl.replace(/{notUsed}/gi, item.getValue("USE_YN") == "N" ? "class=\"not-used\"" : "")
+		); <%-- from template#groupRow --%>
 	$("#codeList").html(trs.join());
 	$("#codeToggler").prop("checked", false);
 }