From fd46c0ea7bd0b62dadfc4098a77a6db5927e3b1f Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Wed, 12 Jun 2024 10:36:17 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EB=A0=88=EC=9D=B4=EB=B8=94=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A6=84=20=EC=A1=B0=EC=A0=95=20=20=20=20=20=20=ED=8C=9D?=
 =?UTF-8?q?=EC=97=85=20=EA=B2=80=EC=83=89=20=ED=95=84=EB=93=9C=20=EB=A0=88?=
 =?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20?=
 =?UTF-8?q?=EC=A0=95=EB=A0=AC=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nims/web/DsuseMgtReceiptController.java   | 19 ++-----------------
 .../WEB-INF/jsp/adds/nims/bssh-main.jsp       | 17 +++++++++--------
 .../WEB-INF/jsp/adds/nims/dsuseMgt-info.jsp   |  4 ++--
 .../jsp/adds/nims/dsuseMgtMapping-main.jsp    |  2 +-
 .../jsp/adds/nims/dsuseMgtReceipt-info.jsp    |  6 +++---
 .../jsp/adds/nims/dsuseMgtReceipt-main.jsp    |  6 +++---
 .../jsp/adds/nims/dsuseMgtRslt-main.jsp       |  6 +++---
 .../WEB-INF/jsp/adds/nims/product-main.jsp    |  7 +++----
 8 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/src/main/java/cokr/xit/adds/nims/web/DsuseMgtReceiptController.java b/src/main/java/cokr/xit/adds/nims/web/DsuseMgtReceiptController.java
index c791cc1..22b48c9 100644
--- a/src/main/java/cokr/xit/adds/nims/web/DsuseMgtReceiptController.java
+++ b/src/main/java/cokr/xit/adds/nims/web/DsuseMgtReceiptController.java
@@ -1,34 +1,19 @@
 package cokr.xit.adds.nims.web;
 
-import java.text.SimpleDateFormat;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 
-import org.apache.poi.ss.usermodel.CellStyle;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import cokr.xit.adds.nims.service.DsuseMgtReceiptService;
 import cokr.xit.adds.nims.DsuseMgtReceiptQuery;
-import cokr.xit.base.code.CommonCode;
-import cokr.xit.base.docs.xls.CellDef;
-import cokr.xit.base.docs.xls.Format;
-import cokr.xit.base.docs.xls.Style;
-import cokr.xit.base.docs.xls.XLSWriter;
-import cokr.xit.base.user.ManagedUser;
-import cokr.xit.base.web.ApplicationController;
+import cokr.xit.adds.nims.service.DsuseMgtReceiptService;
 import cokr.xit.foundation.web.AbstractController;
-import lombok.RequiredArgsConstructor;
 
 
 @Controller
 @RequestMapping(
-    name = "마약류폐기 신청서 접수",
+    name = "마약류 폐기 신청서 접수",
     value = {"/adds/nims"}
 )
 public class DsuseMgtReceiptController extends AbstractController {
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-main.jsp
index d576641..6e5517b 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/bssh-main.jsp
@@ -1,19 +1,19 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
 <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
 
-<c:set var="prefixName" scope="request">취급자 정보 조회</c:set>
+<c:set var="prefixName" scope="request">마약류 취급업체 조회</c:set>
 <!-- 입력 영역 -->
 <form id="frmSearch--${pageName}" name="frmSearch">
 	<div class="container-search">
 	<!-- hidden -->
-		<label for="bssh--${pageName}">취급자 정보</label>
-		<div class="row my-1 mx-4 g-1 border-card rounded-3">
+<%--		<label for="bssh--${pageName}">마약류 취급업체 정보</label>--%>
+		<div class="row my-1 mx-4 g-1" style="align-items: baseline">
 			<div class="col-md-4">
-				<label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">업체명</label>
+				<label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">취급업체명</label>
 				<input type="text" class="form-control w-60" id="bsshNm--${pageName}" name="schBsshNm" data-map="BSSH_NM" >
 			</div>
 			<div class="col-md-4">
-				<label for="bsshCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">식별번호</label>
+				<label for="bsshCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">취급자번호</label>
 				<input type="text" class="form-control w-60" id="bsshNm--${pageName}" name="schBsshCd" data-map="BSSH_CD" >
 			</div>
 			<button type="button" class="btn btn-search w-px-120" id="btnSearch--${pageName}" title="검색">검색</button>
@@ -38,7 +38,7 @@
 				<thead>
 					<tr><th style="width: 15.828px;text-align:center;" tabindex="0">No</th>
 						<th class="sorting" style="width: 146.156px;">취급자번호</th>
-						<th class="sorting" style="width: 160.141px;">취급자명</th>
+						<th class="sorting" style="width: 160.141px;">취급업체명</th>
 						<th class="sorting" style="width: 160.141px;">업종명</th>
 						<th class="sorting" style="width: 230.469px;">대표자</th>
 						<th class="sorting" style="width: 230.469px;">허가번호</th>
@@ -94,7 +94,7 @@
 		    	load : wctx.url("/adds/nims/bssh-list.do")
 		    }
 			, prefix: "bsshMain"
-			, prefixName: "취급자 정보 조회"
+			, prefixName: "마약류 취급업체 조회"
 			, keymapper: info => info ? info.bsshCd : ""
 			, dataGetter : obj => obj.bsshMainList
 			, appendData: true
@@ -187,7 +187,8 @@
 		 **************************************************************************/
 		 
 		$P.fnSearchList = () => {
-				// 검색조건
+			// 검색조건
+			// FIXME: 업체명 또는 식별번호중 하나는 필수
 			$P.control.query = $P.formFields.get();								// 검색 조건
 			$P.control.query.fetchSize = $P.control.defaultFetchSize;			// 한번에 조회되는 자료 건수
 			$P.control.query.delYn = "N";										// 삭제 여부
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 898d753..00f01d2 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
@@ -13,7 +13,7 @@
 			<!-- 입력 영역 -->
 			<form id="frmEdit--${pageName}" name="frmEdit">
 				<!-- hidden -->
-                <label for="bssh--${pageName}">취급자 정보</label>
+                <label for="bssh--${pageName}">마약류 취급업체 정보</label>
 				<div class="row my-1 mx-4 g-1 border-card rounded-3">
 				<div class="col-md-4">
 					<label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">업체명</label>
@@ -254,7 +254,7 @@
 		}
 
 		$P.control.getBsshInfo = (gdccId) => {
-			let dialogTitle = "취급자 정보 조회";
+			let dialogTitle = "마약류 취급자 조회";
 			let params = {};
 
 			ajax.get({
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 6ab2b3b..9944e1b 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
@@ -297,7 +297,7 @@
 		}
 		
 		$P.control.getBsshInfo = (gdccId) => {
-			let dialogTitle = "취급자 정보 조회";
+			let dialogTitle = "마약류 취급자 조회";
 			let params = {};
 
 			ajax.get({
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
index daf53b5..940cd1c 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
@@ -14,7 +14,7 @@
 <!--			<form id="frmEdit--${pageName}" name="frmEdit"> -->
 				<form id="bssh--${pageName}" name="bssh">
 					<!-- hidden -->
-	                <label for="bssh--${pageName}">취급자 정보</label>
+	                <label for="bssh--${pageName}">마약류 취급업체 정보</label>
 					<div class="row my-1 mx-4 g-1 border-card rounded-3">
 						<div class="col-md-4">
 							<label for="bsshNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">업체명</label>
@@ -201,7 +201,7 @@
 		}
 
 		$P.control.getBsshInfo = () => {
-			let dialogTitle = "취급자 정보 조회";
+			let dialogTitle = "마약류 취급업체 조회";
 			let params = {openPage : "bssh--${pageName}"};
 
 			ajax.get({
@@ -220,7 +220,7 @@
 		}
 		
 		$P.control.getProductInfo = () => {
-			let dialogTitle = "취급자 정보 조회";
+			let dialogTitle = "마약류 제품 조회";
 			let params = {openPage : "product--${pageName}"};
 
 			ajax.get({
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 909abe7..6266f9d 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
@@ -280,7 +280,7 @@
 
 		// 신청서 정보 dialog
 		$P.control.getInfo = (gdccId) => {
-			let dialogTitle = "신청서 정보 등록";
+			let dialogTitle = "폐기 신청서 접수";
 			let params = {};
 
 			ajax.get({
@@ -373,7 +373,7 @@
 				, success: resp => {
 					dialog.open({
 						  id: "dsuseMgtinfoDialog"
-						, title: "신청서 정보 상세"
+						, title: "폐기 신청 접수 상세"
 						, content: resp
 						, size: "xl"
 						, init: () => { }
@@ -384,7 +384,7 @@
 		}
 		
 		$P.control.getBsshInfo = (gdccId) => {
-			let dialogTitle = "취급자 정보 조회";
+			let dialogTitle = "마약류 취급업체 조회";
 			let params = {openPage : "frmSearch--${pageName}"};
 
 			ajax.get({
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 17bcd57..7c6686f 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
@@ -205,7 +205,7 @@
 
 		// 신청서 정보 dialog
 		$P.control.getInfo = (gdccId) => {
-			let dialogTitle = "신청서 정보 등록";
+			let dialogTitle = "폐기 결과[통보] 등록";
 			let params = {};
 
 			ajax.get({
@@ -286,7 +286,7 @@
 				, success: resp => {
 					dialog.open({
 						  id: "dsuseMgtReceiptinfoDialog"
-						, title: "신청서 정보 상세"
+						, title: "폐기 신청 상세"
 						, content: resp
 						, size: "xl"
 						, init: () => { }
@@ -297,7 +297,7 @@
 		}
 		
 		$P.control.getBsshInfo = (gdccId) => {
-			let dialogTitle = "취급자 정보 조회";
+			let dialogTitle = "마약류 취급업체 조회";
 			let params = {};
 
 			ajax.get({
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp
index b3ebf64..8d02395 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/product-main.jsp
@@ -1,13 +1,12 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%>
 <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>
 
-<c:set var="prefixName" scope="request">취급자 정보 조회</c:set>
+<c:set var="prefixName" scope="request">마약류 제품 조회</c:set>
 <!-- 입력 영역 -->
 <form id="frmSearch--${pageName}" name="frmSearch">
 	<div class="container-search">
 	<!-- hidden -->
-		<label for="product--${pageName}">취급자 정보</label>
-		<div class="row my-1 mx-4 g-1 border-card rounded-3">
+		<div class="row my-1 mx-4 g-1" style="align-items: baseline">
 			<div class="col-md-4">
 				<label for="ProductNm--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">제품명</label>
 				<input type="text" class="form-control w-60" id="productNm--${pageName}" name="schProductNm" > 
@@ -97,7 +96,7 @@
 		    	load : wctx.url("/adds/nims/product-list.do")
 		    }
 			, prefix: "productMain"
-			, prefixName: "취급자 정보 조회"
+			, prefixName: "마약류 제품 조회"
 			, keymapper: info => info ? info.productCd : ""
 			, dataGetter : obj => obj.productMainList
 			, appendData: true