Merge branch 'refs/heads/main' into main-receipt-search

src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java

@@ -1,5 +1,8 @@
 package cokr.xit.adds.nims.web;
 
+import java.util.List;
+import java.util.Map;
+
 import javax.annotation.Resource;
 
 import org.springframework.beans.factory.annotation.Value;
@@ -12,14 +15,15 @@ import cokr.xit.adds.nims.DsuseMgtDocQuery;
 import cokr.xit.adds.nims.DsuseMgtReceiptQuery;
 import cokr.xit.adds.nims.service.DsuseMgtDocService;
 import cokr.xit.adds.nims.service.DsuseMgtReceiptService;
-import cokr.xit.foundation.web.AbstractController;
+import cokr.xit.base.code.CommonCode;
+import cokr.xit.base.web.ApplicationController;
 
 @Controller
 @RequestMapping(
     name = "마약류 폐기 보고",
     value = {"/adds/nims"}
 )
-public class AddsNimsController extends AbstractController {
+public class AddsNimsController extends ApplicationController {
     @Value("${app.api.host:}")
     private String apiHost;
 
@@ -121,6 +125,10 @@ public class AddsNimsController extends AbstractController {
     public ModelAndView dsuseMgtReceiptMain() {
         ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtReceipt-main");
 
+        Map<String, List<CommonCode>> commonCodes = getCodesOf("ADDS11");
+		mav.addObject("ADDS11List", commonCodes.get("ADDS11"));
+
+
         return mav
             .addObject("pageName", "dsuseMgtReceipt")						// View(jsp)에서 사용할 id 뒤에 붙일 suffix
             //				.addObject("infoPrefix", "dsuseMgtReceipt")						// prefix
@@ -157,6 +165,7 @@ public class AddsNimsController extends AbstractController {
     public ModelAndView dsuseMgtDoc() {
         ModelAndView mav = new ModelAndView();
         mav.setViewName("adds/nims/dsuseDoc-main");
+        mav.addObject("pageName", "dsuseMgtDoc");
         return mav;
     }
     //-------------------------------------------------------------------------------------------------

src/main/java/cokr/xit/adds/nims/web/DsuseMgtDetailController.java

@@ -10,7 +10,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 
 import cokr.xit.adds.nims.DsuseMgtDetailQuery;
 import cokr.xit.adds.nims.service.DsuseMgtDetailService;
-import cokr.xit.foundation.web.AbstractController;
+import cokr.xit.base.web.ApplicationController;
 import net.minidev.json.parser.ParseException;
 
 
@@ -20,7 +20,7 @@ import net.minidev.json.parser.ParseException;
     name = "마약류폐기 신청 상세",
     value = {"/adds/nims"}
 )
-public class DsuseMgtDetailController extends AbstractController {
+public class DsuseMgtDetailController extends ApplicationController {
 
 	public static final String CLASS_URL = "/adds/nims";
 

src/main/java/cokr/xit/adds/nims/web/TestController.java

@@ -5,7 +5,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
-import cokr.xit.foundation.web.AbstractController;
+import cokr.xit.base.web.ApplicationController;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
@@ -14,7 +14,7 @@ import lombok.RequiredArgsConstructor;
     name = "Nims 관리",
     value = {"/adds/nims/"}
 )
-public class TestController extends AbstractController {
+public class TestController extends ApplicationController {
     @Value("${app.api.host:}")
     private String apiHost;
 

src/main/resources/application.yml

@@ -34,7 +34,7 @@ spring:
     static-path-pattern: /resources/**,/webjars/**,/files/**
   web:
     resources:
-      static-locations: /resources/,classpath:/META-INF/resources/webjars/,file:files/
+      static-locations: /resources/,classpath:/META-INF/resources/webjars/,file:${app.file.root.path}
 
 messageSource:
   basenames:

src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp

@@ -48,9 +48,9 @@
                 <label class="form-label fw-bold form-search-title text-end" for="schSttsCd--${pageName}">처리상태</label>
                 <select class="form-select" id="schSttsCd--${pageName}" name="schSttsCd">
                     <option value="">전체</option>
-                    <option value="01">폐기 신청서 접수</option>
-                    <option value="03">폐기보고 맵핑</option>
-                    <option value="05">종료</option>
+					<c:forEach items="${ADDS11List}" var="item">
+						<option value="${item.code}">${item.value}</option>
+					</c:forEach>
                 </select>
             </div>
             <div class="col-1">