From 9ccf317eb3617784052f6f000a47f157241df403 Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Thu, 18 Jul 2024 12:51:08 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/adds/nims/web/AddsNimsController.java | 26 +------------------
 .../WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp   |  4 +--
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java
index 43afbc2..0929b01 100644
--- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java
+++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java
@@ -201,9 +201,7 @@ public class AddsNimsController extends ApplicationController {
 	        .toList();
         mav.addObject("fileInfos", toJson(fileInfos));
         // 폐기증거사진 - 폐기증거사진 등록 정보 조회
-        mav.addObject("dsuseRsltImgList",
-            toJson("[]")
-        );
+        mav.addObject("dsuseRsltImgList","[]");
 
         // 폐기일자가 있는 경우 - 폐기증거사진 등록 정보 조회
         if(!isEmpty(dsuseRsltInfo.getDsuseDe())) {
@@ -486,28 +484,6 @@ public class AddsNimsController extends ApplicationController {
         Map<String,String> globalVariable = new HashMap<String,String>();
         printOption.setGlobalVariable(globalVariable);
 
-
-        for(DataObject data : dataForDoc) {
-            String infKey = data.string("dscdmngId");
-            String subType = data.string("dscdmngSn");
-
-            List<DataObject> fileinfo = fileService.getFileList(
-                new FileQuery().setInfoKeys(infKey).setInfoType("100").setBy("SUB_TYPE").setTerm(subType)
-            );
-            if(fileinfo == null) { fileinfo = new ArrayList<DataObject>(); }
-            fileinfo = fileinfo.stream()
-                .filter((item) -> item.string("USE_YN").equals("Y"))
-                .sorted((item1, item2) -> item1.string("FILE_ID").compareTo(item2.string("FILE_ID")))
-                .toList();
-
-            if(fileinfo.isEmpty()) {
-                data.put("filePath", "");
-            } else {
-                data.put("filePath", fileinfo.get(fileinfo.size()-1).string("FILE_PATH"));
-            }
-
-        }
-
         //1.한글문서파일 데이터 입력
         DisposeResultReport form = new DisposeResultReport(print, printOption, dataForDoc);
         //2.한글문서파일 생성
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp
index 15af103..6afe0e3 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp
@@ -103,8 +103,8 @@
 						<th class="cmn" style="width: 120.469px;">폐기일자</th>
 						<th class="cmn" style="width: 150px;">폐기방법</th>
 						<th class="cmn" style="width: 250.469px;">업체명</th>
-						<th class="cmn" style="width: 140.469px;">폐기결과보고서</th>
-						<th class="cmn" style="width: 140.469px;">처리내역및사진</th>
+						<th class="cmn" style="width: 150px;">폐기결과보고서</th>
+						<th class="cmn" style="width: 150px;">처리내역및사진</th>
 						<th class="cmn" style="width: 120.141px;">취급일자</th>
 						<th class="cmn" style="width: 90px;">폐기건수</th>
 						<th class="cmn" style="width: 160.469px;">처리상태</th>