From d3070b33270b56c7c196edd524910027bc21449f Mon Sep 17 00:00:00 2001 From: leebj Date: Mon, 1 Jul 2024 14:01:18 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=201.=EC=82=AD=EC=A0=9C=EC=97=AC?= =?UTF-8?q?=EB=B6=80=EA=B0=80=20Y=EC=9D=B8=20=ED=8C=8C=EC=9D=BC=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EA=B0=80=20=ED=8F=AC=ED=95=A8=EB=90=A0=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20=EC=A0=9C=EC=99=B8=202.=EC=A4=91=EB=B3=B5=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=EC=9D=B4=20=EC=A1=B4=EC=9E=AC=ED=95=A0?= =?UTF-8?q?=EC=8B=9C=20=EA=B0=80=EC=9E=A5=20=EB=82=98=EC=A4=91=EC=97=90=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=EB=90=9C=20=EA=B2=83=EC=9D=84=20=EA=B0=80?= =?UTF-8?q?=EC=A0=B8=EC=98=A4=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=203.?= =?UTF-8?q?=EC=BF=BC=EB=A6=AC=EC=97=90=EC=84=9C=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=ED=95=9C=20=ED=8C=8C=EC=9D=BC=EC=9D=B4=20=EC=A0=95=EB=A0=AC?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EC=95=98=EC=9D=84=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20=EC=9E=AC=EC=A0=95=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/adds/nims/web/AddsNimsController.java | 61 +++++++++++++++---- 1 file changed, 48 insertions(+), 13 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 4d89063..87009d3 100644 --- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java +++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java @@ -15,9 +15,6 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import net.minidev.json.JSONObject; -import net.minidev.json.parser.ParseException; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -45,6 +42,8 @@ import cokr.xit.base.web.ApplicationController; import cokr.xit.foundation.data.DataObject; import cokr.xit.foundation.data.JSON; import cokr.xit.foundation.web.WebClient; +import net.minidev.json.JSONObject; +import net.minidev.json.parser.ParseException; @Controller @RequestMapping( @@ -87,6 +86,11 @@ public class AddsNimsController extends ApplicationController { setCmmCode("ADDS04", mav); List fileInfo = new ArrayList(); + if(fileInfo == null) { fileInfo = new ArrayList();} + fileInfo = fileInfo.stream() + .filter((item) -> item.string("USE_YN").equals("Y")) + .sorted((item1, item2) -> item1.string("SUB_TYPE").compareTo(item2.string("SUB_TYPE"))) + .toList(); if(!isEmpty(dsuseReceptInfo) && !isEmpty(dsuseReceptInfo.getDscdmngId())){ mav.addObject("dsuseReceptInfo", toJson(dsuseReceptInfo)); @@ -144,6 +148,15 @@ public class AddsNimsController extends ApplicationController { FileQuery fileQuery = new FileQuery().setInfoType("110").setInfoKeys(dsuseRsltInfo.getDscdmngId()); List fileInfos = fileService.getFileList(fileQuery); + if(fileInfos == null) { fileInfos = new ArrayList(); } + fileInfos = fileInfos.stream() + .filter((item) -> item.string("USE_YN").equals("Y")) + .sorted((item1, item2) -> { + int a = item1.number("SRT_ORD").intValue(); + int b = item2.number("SRT_ORD").intValue(); + return (a < b) ? -1 : ((a == b) ? 0 : 1); + }) + .toList(); mav.addObject("fileInfos", toJson(fileInfos)); return mav @@ -229,11 +242,17 @@ public class AddsNimsController extends ApplicationController { List fileinfo = fileService.getFileList( new FileQuery().setInfoKeys(infKey).setInfoType("100").setBy("SUB_TYPE").setTerm(subType) ); - if(fileinfo == null || fileinfo.isEmpty()) { - data.put("filePath", ""); - } else { - data.put("filePath", fileinfo.get(0).string("FILE_PATH")); - } + if(fileinfo == null) { fileinfo = new ArrayList(); } + 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")); + } } @@ -277,6 +296,16 @@ public class AddsNimsController extends ApplicationController { List dsuseimgs = fileService.getFileList( new FileQuery().setInfoType("110").setInfoKeys(dataForDoc.get(0).string("dscdmngId")) ); + if(dsuseimgs == null) { dsuseimgs = new ArrayList(); } + dsuseimgs = dsuseimgs.stream() + .filter((item) -> item.string("USE_YN").equals("Y")) + .sorted((item1, item2) -> { + int a = item1.number("SRT_ORD").intValue(); + int b = item2.number("SRT_ORD").intValue(); + return (a < b) ? -1 : ((a == b) ? 0 : 1); + }) + .toList(); + List dsuseimgPaths = new ArrayList<>(); for(DataObject dsuseimg : dsuseimgs) { dsuseimgPaths.add(dsuseimg.string("FILE_PATH")); @@ -289,11 +318,17 @@ public class AddsNimsController extends ApplicationController { List fileinfo = fileService.getFileList( new FileQuery().setInfoKeys(infKey).setInfoType("100").setBy("SUB_TYPE").setTerm(subType) ); - if(fileinfo == null || fileinfo.isEmpty()) { - data.put("filePath", ""); - } else { - data.put("filePath", fileinfo.get(0).string("FILE_PATH")); - } + if(fileinfo == null) { fileinfo = new ArrayList(); } + 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")); + } }