From 0c71357d1ef48afce3a30dae50be59615834426e Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Tue, 9 Jul 2024 11:18:30 +0900
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=EA=B4=80=ED=95=A0=EA=B4=80=EC=B2=AD?=
 =?UTF-8?q?=20=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cokr/xit/adds/cmm/model/NimsApiRequest.java    | 5 +++++
 src/main/resources/application.yml                           | 5 ++---
 .../sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml          | 2 ++
 .../webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp    | 2 ++
 .../webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp    | 2 ++
 src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp  | 2 ++
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cokr/xit/adds/cmm/model/NimsApiRequest.java b/src/main/java/cokr/xit/adds/cmm/model/NimsApiRequest.java
index 039cec3..57246db 100644
--- a/src/main/java/cokr/xit/adds/cmm/model/NimsApiRequest.java
+++ b/src/main/java/cokr/xit/adds/cmm/model/NimsApiRequest.java
@@ -79,6 +79,11 @@ public class NimsApiRequest {
          */
         private String fg2 = "1";
 
+        /**
+         * 대표자
+         */
+        private String rprsntvNm;
+
         /**
          * <pre>
          * DB 조회 skip 여부
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 38be294..1e0be99 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -106,9 +106,8 @@ spring:
 
   datasource:
     hikari:
-      #driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      driver-class-name: org.mariadb.jdbc.Driver
-      jdbc-url: jdbc:mariadb://211.119.124.9:4407/adds?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Seoul&useSSL=false
+      driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
+      jdbc-url: jdbc:log4jdbc:mariadb://211.119.124.9:4407/adds?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Seoul&useSSL=false
       username: addsweb
       password: addsweb1234
       auto-commit: false
diff --git a/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml b/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml
index ebe6691..90d4747 100644
--- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml
+++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml
@@ -9,6 +9,7 @@
         SELECT 
 			  A.DSCDMNG_ID											/* 폐기관리 ID */
 			, A.DEPT_CD												/* 부서 코드 */
+            , td.DEPT_NM											/* 부서명 */
 			, A.USER_ID												/* 사용자 ID */
 			, A.PRGRS_STTS_CD										/* 진행상태 코드 */
 			, GET_CODE_NM("ADDS11", A.PRGRS_STTS_CD) PRGRS_STTS_NM	/* 진행상태 */
@@ -44,6 +45,7 @@
 			, B.HPTL_NO												/* 요양기관 번호 */
 			, B.PRMISN_NO											/* 허가번호 */
 		FROM TB_DSUSE_MGT A
+		 JOIN tb_dept td ON A.dept_cd = td.dept_cd
 		  LEFT OUTER JOIN TB_BSSH_INFO B ON A.BSSH_CD = B.BSSH_CD
 		WHERE A.USE_YN = "Y"
     </sql>
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
index a3a5d3c..d9a92f3 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
@@ -86,6 +86,7 @@
 					<tr id="theadTr--${pageName}"
 						data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
 						<th class="cmn" style="width: 72px;">No.</th>
+						<th class="cmn" style="width: 170.141px;">관할관청</th>
 						<th class="cmn" style="width: 160.141px;">취급일자</th>
 						<th class="cmn" style="width: 160.141px;">관리번호</th>
 						<th class="cmn" style="width: 230.469px;">업체명</th>
@@ -104,6 +105,7 @@
 				<template id="${infoPrefix}Row--${pageName}">
 					<tr data-key="{DSCDMNG_ID}">
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td>
+						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DEPT_NM}</td>
 						<td class="cmn text-center"  onclick="{onclick}" ondblclick="{ondblclick}">{HDR_DE}</td>
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td>
 						<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{BSSH_NM}</td>
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp
index 9af8cf2..af7d089 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp
@@ -89,6 +89,7 @@
                 <tr id="theadTr--${pageName}"
                     data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
                     <th class="cmn" style="width: 72px;">No.</th>
+                    <th class="cmn" style="width: 170.141px;">관할관청</th>
                     <th class="cmn" style="width: 130.141px;">폐기관리번호</th>
                     <th class="cmn" style="width: 170.469px;">처리상태</th>
                     <th class="cmn" style="width: 300.469px;">업체명</th>
@@ -107,6 +108,7 @@
                 <template id="${infoPrefix}Row--${pageName}">
                     <tr data-key="{DSCDMNG_ID}">
                         <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td>
+                        <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DEPT_NM}</td>
                         <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td>
                         <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
                         <td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{BSSH_NM}</td>
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp
index b6dea03..780a84c 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp
@@ -84,6 +84,7 @@
                 <tr id="theadTr--${pageName}"
                     data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
                     <th class="cmn" style="width: 72px;">No.</th>
+                    <th class="cmn" style="width: 170.141px;">관할관청</th>
                     <th class="cmn" style="width: 130.141px;">폐기관리번호</th>
                     <th class="cmn" style="width: 170.469px;">처리상태</th>
                     <th class="cmn" style="width: 250.469px;">업체명</th>
@@ -101,6 +102,7 @@
                 <template id="${infoPrefix}Row--${pageName}">
                     <tr data-key="{DSCDMNG_ID}">
                         <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td>
+                        <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DEPT_NM}</td>
                         <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSCDMNG_ID}</td>
                         <td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{PRGRS_STTS_NM}</td>
                         <td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{BSSH_NM}</td>

From f509253ad509bf55eb0dc50cdab8a7a78ebaffbd Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Tue, 9 Jul 2024 11:21:45 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EC=A0=9C=ED=92=88=EB=AA=85=20?=
 =?UTF-8?q?=ED=95=84=EB=93=9C=20=ED=8F=AD=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp
index ca28707..4ebc00e 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp
@@ -30,7 +30,7 @@
 						<thead>
 							<tr>
 								<th class="sorting" style="width: 146.156px;">제품코드</th>
-								<th class="sorting" style="width: 330.141px;">제품명</th>
+								<th class="sorting" style="width: 350.141px;">제품명</th>
 								<th class="sorting" style="width: 120.469px;">유통단위</th>
 								<th class="sorting" style="width: 120.469px;">낱개단위</th>
 								<th class="sorting" style="width: 130.141px;">마약/향정구분</th>

From 68bc97bac763046cc1c93d2d88c7ce4988452bd4 Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Tue, 9 Jul 2024 11:27:07 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=EC=8A=A4=ED=81=AC=EB=A1=A4?=
 =?UTF-8?q?=EB=A7=81=20=EC=98=A4=EB=A5=98=20=EB=B0=A9=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp           | 2 +-
 src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgt-info.jsp        | 2 +-
 src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp | 2 +-
 src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp | 2 +-
 src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp    | 2 +-
 src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp
index eb19821..ad6206d 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-popup.jsp
@@ -187,7 +187,7 @@
 			let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").content.outerHTML]
 							: ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer);
 
-			let noMore = (totalSize == ${infoPrefix}List.length);
+			let noMore = (${infoPrefix}List.length >= totalSize);
 			let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0);
 
 			$("#tbody--${pageName}").html(trs.join());
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgt-info.jsp
index e3890a1..609c7be 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgt-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgt-info.jsp
@@ -311,7 +311,7 @@
 			let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").content.outerHTML]
 							: ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer);
 							
-			let noMore = (totalSize == ${infoPrefix}List.length);
+			let noMore = (${infoPrefix}List.length >= totalSize);
 			let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0);
 
 			$("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore);
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
index d9a92f3..a4549c5 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp
@@ -421,7 +421,7 @@
 			let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").content.outerHTML]
 							: ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer);
 
-			let noMore = (totalSize == ${infoPrefix}List.length);
+			let noMore = (${infoPrefix}List.length >= totalSize);
 			let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0);
 
 			$("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore);
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp
index af7d089..f56a899 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp
@@ -399,7 +399,7 @@
             let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").content.outerHTML]
                 : ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer);
 
-            let noMore = (totalSize == ${infoPrefix}List.length);
+            let noMore = (${infoPrefix}List.length >= totalSize);
             let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0);
 
             $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore);
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp
index 780a84c..b881728 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp
@@ -354,7 +354,7 @@
             let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").content.outerHTML]
                 : ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer);
 
-            let noMore = (totalSize == ${infoPrefix}List.length);
+            let noMore = (${infoPrefix}List.length >= totalSize);
             let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0);
 
             $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore);
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp
index 4ebc00e..f890bef 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp
@@ -321,7 +321,7 @@
 			let trs = empty ? [document.getElementById("${infoPrefix}NotFound--${pageName}").innerHTML]
 							: ${infoPrefix}List.inStrings(foundTr.outerHTML, replacer);
 
-			let noMore = (totalSize == ${infoPrefix}List.length);
+			let noMore = (${infoPrefix}List.length >= totalSize);
 			let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0);
 
 			$("#tbody--${pageName}").html(trs.join());