From a28714e9d4a84eb0b76160f4389b39f93e5d6fb0 Mon Sep 17 00:00:00 2001 From: Leeyh1121 <130335980+Leeyh1121@users.noreply.github.com> Date: Tue, 9 Jul 2024 10:12:32 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fit=20:=20=EC=83=81=EC=84=B8=20=ED=98=B8?= =?UTF-8?q?=EC=B6=9C=EC=8B=9C=20=EC=82=AC=EA=B3=A0=EB=B0=9C=EC=83=9D?= =?UTF-8?q?=EC=9D=BC=20disabled=20=ED=92=80=EB=A6=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp | 8 ++++++++ 1 file changed, 8 insertions(+) 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 ca2745c..76e79ef 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 @@ -229,6 +229,14 @@ if (!item) return; $P.bsshFormFields.set($P.control, item); + + let checkData = item.data.dsusePrvCd; + if (checkData =="01" || checkData =="02") { + $("#dsuseAcdtDe--${pageName}").prop('disabled', false); + }else{ + $("#dsuseAcdtDe--${pageName}").prop('disabled', true); + $("#dsuseAcdtDe--${pageName}").val(""); + } } $P.productControl.onCurrentChange = item => { From e3bdc6241f695f0abc4ce6fbd12ca3f9cde37b43 Mon Sep 17 00:00:00 2001 From: leebj Date: Tue, 9 Jul 2024 10:13:28 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=86=8C=EC=8A=A4=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/adds/nims/web/AddsNimsController.java | 78 ++++++++++--------- 1 file changed, 42 insertions(+), 36 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 5be4166..c209c22 100644 --- a/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java +++ b/src/main/java/cokr/xit/adds/nims/web/AddsNimsController.java @@ -350,6 +350,46 @@ public class AddsNimsController extends ApplicationController { } //폐기증거사진 + List partitions = this.getPartitions(dataForDoc); + + //1.한글문서파일 데이터 입력 + DisposeProcessDetails form = new DisposeProcessDetails(print, printOption, dataForDoc, partitions); + //2.한글문서파일 생성 + form.makeFile(); + //3.DB 저장, 스토리지 저장 + List dscdmngIds = IntStream.rangeClosed(1, dataForDoc.size()).boxed().map(i -> { + return dataForDoc.get(i-1).string("dscdmngId"); + }).collect(Collectors.toList()); + boolean allEqual = dscdmngIds.stream().distinct().count() <= 1; + if(allEqual) { + String resultFilePath = form.andGetPath(); + File file = new File(resultFilePath); + String newFileId = ""; + String before = ""; + boolean changeDscdmngId = false; + for(DataObject data : dataForDoc) { + if(!before.equals(data.string("dscdmngId"))) { + changeDscdmngId = true; + } else { + changeDscdmngId = false; + } + if(changeDscdmngId) { + Relation rel = new Relation().setInfoType("200").setSubType("02").setInfoKey(data.string("dscdmngId")); + FileInfo fileInfo = new FileInfo.Factory().create(rel, file); + fileInfo.setName(print.getFormatKorName()+".hwp"); + int effected= fileService.create(fileInfo); + newFileId = fileInfo.getId(); + } + } + } + + //4.다운로드 + HashMap result = form.andDownload(); + mav.addAllObjects(result); + return mav; + } + + private List getPartitions(List dataForDoc){ List partitions = new ArrayList<>(); String before = ""; boolean changeDscdmngId = false; @@ -389,43 +429,9 @@ public class AddsNimsController extends ApplicationController { } } - - //1.한글문서파일 데이터 입력 - DisposeProcessDetails form = new DisposeProcessDetails(print, printOption, dataForDoc, partitions); - //2.한글문서파일 생성 - form.makeFile(); - //3.DB 저장, 스토리지 저장 - List dscdmngIds = IntStream.rangeClosed(1, dataForDoc.size()).boxed().map(i -> { - return dataForDoc.get(i-1).string("dscdmngId"); - }).collect(Collectors.toList()); - boolean allEqual = dscdmngIds.stream().distinct().count() <= 1; - if(allEqual) { - String resultFilePath = form.andGetPath(); - File file = new File(resultFilePath); - String newFileId = ""; - before = ""; - changeDscdmngId = false; - for(DataObject data : dataForDoc) { - if(!before.equals(data.string("dscdmngId"))) { - changeDscdmngId = true; - } else { - changeDscdmngId = false; - } - if(changeDscdmngId) { - Relation rel = new Relation().setInfoType("200").setSubType("02").setInfoKey(data.string("dscdmngId")); - FileInfo fileInfo = new FileInfo.Factory().create(rel, file); - fileInfo.setName(print.getFormatKorName()+".hwp"); - int effected= fileService.create(fileInfo); - newFileId = fileInfo.getId(); - } - } - } - - //4.다운로드 - HashMap result = form.andDownload(); - mav.addAllObjects(result); - return mav; + return partitions; } + //------------------------------------------------------------------------------------------------- // 보고 문서 관리 //------------------------------------------------------------------------------------------------- From daa15731097a5b0db5ec8109462c7a703e52bae4 Mon Sep 17 00:00:00 2001 From: Leeyh1121 <130335980+Leeyh1121@users.noreply.github.com> Date: Tue, 9 Jul 2024 10:26:21 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fit=20:=20=EC=88=98=EC=A0=95=20=EB=98=90?= =?UTF-8?q?=EB=8A=94=20=EC=83=81=EC=84=B8=ED=99=94=EB=A9=B4=20=ED=98=B8?= =?UTF-8?q?=EC=B6=9C=20=EB=92=A4=20=EA=B8=B0=EC=A1=B4=EC=97=90=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=EB=90=9C=20=EC=9E=90=EB=A3=8C=20=EC=9E=AC=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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..0d0875a 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 @@ -353,7 +353,7 @@ , title : dialogTitle , content : resp , size : "xxl" - , onClose : () => { $P.fnRefreshList(); } + , onClose : () => { $P.control.reload(); } }); } }); 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..a0a481e 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 @@ -339,7 +339,7 @@ , title : dialogTitle , content : resp , size : $P.control.infoSize - , onClose : () => { $P.fnSearchList(); } + , onClose : () => { $P.control.reload(); } }); } }); 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..709c28b 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 @@ -320,7 +320,7 @@ , title : dialogTitle , content : resp , size : $P.control.infoSize - , onClose : () => { $P.fnRefreshList(); } + , onClose : () => { $P.control.reload(); } }); } }); From cbd6901b543c8d2c1aff66c244332d3fc47af24d Mon Sep 17 00:00:00 2001 From: Leeyh1121 <130335980+Leeyh1121@users.noreply.github.com> Date: Tue, 9 Jul 2024 11:14:30 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fit=20:=20=EB=A6=AC=EB=A1=9C=EB=93=9C?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EC=97=90=20=EC=98=A4=EB=A5=98=EB=A1=9C=20?= =?UTF-8?q?=EC=9B=90=EB=B3=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 0d0875a..a3a5d3c 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 @@ -353,7 +353,7 @@ , title : dialogTitle , content : resp , size : "xxl" - , onClose : () => { $P.control.reload(); } + , onClose : () => { $P.fnRefreshList(); } }); } }); 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 a0a481e..9af8cf2 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 @@ -339,7 +339,7 @@ , title : dialogTitle , content : resp , size : $P.control.infoSize - , onClose : () => { $P.control.reload(); } + , onClose : () => { $P.fnSearchList(); } }); } }); 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 709c28b..b6dea03 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 @@ -320,7 +320,7 @@ , title : dialogTitle , content : resp , size : $P.control.infoSize - , onClose : () => { $P.control.reload(); } + , onClose : () => { $P.fnRefreshList(); } }); } });