From 9d5772e798e76c7fe4653ce24d8383ba17622f5c Mon Sep 17 00:00:00 2001 From: JIWOO Date: Mon, 7 Apr 2025 16:06:20 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EB=82=B4?= =?UTF-8?q?=EB=B6=80=EA=B2=B0=EC=9E=AC=20=EC=B2=A8=EB=B6=80=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=88=98=EB=8F=99=20=EB=93=B1=EB=A1=9D=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gtm/seedfile/SeedFileService.java | 17 +++++ .../config/mappers/trublend/trublend_sql.xml | 4 +- .../trublprocessmng/trublprocessmng_sql.xml | 4 +- .../_extra/gtm/trublprocessmng/rceptEdit.jsp | 63 ++++++++++++++++++- .../views/_common/_js/commonFileUtil.js | 3 +- 5 files changed, 85 insertions(+), 6 deletions(-) diff --git a/src/main/java/seed/com/gtm/seedfile/SeedFileService.java b/src/main/java/seed/com/gtm/seedfile/SeedFileService.java index 3e0137cb..6a6137e8 100644 --- a/src/main/java/seed/com/gtm/seedfile/SeedFileService.java +++ b/src/main/java/seed/com/gtm/seedfile/SeedFileService.java @@ -190,6 +190,7 @@ public class SeedFileService { siteIdx = SeedUtils.setReplaceNull(request.getParameter("siteIdx")); } String fileFuncType = (String)paramMap.get("fileFuncType"); + String fileFuncTypeOri = fileFuncType; SeedProperties seedProperties = new SeedProperties(); @@ -237,6 +238,21 @@ public class SeedFileService { copyContractYn = copyContractYnList[i]; } + + /*250407 - 내부결재 첨부파일 처리 추가 */ + if("4840000000".equals(fileGubunData)) { + fileFuncType = "x-1"; + SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+ "/" +fileFuncType); + }else if("4841000000".equals(fileGubunData)) { + fileFuncType = "x-2"; + SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+ "/" +fileFuncType); + }else if("4842000000".equals(fileGubunData)) { + fileFuncType = "x-3"; + SeedUtils.setSeedMkDirs(rootPath + "/"+siteIdx+ "/" +fileFuncType); + }else { + fileFuncType = fileFuncTypeOri; + } + String fileType = uploadFileNameData.substring(uploadFileNameData.lastIndexOf(".")+1, uploadFileNameData.length()); String reFileName = renameDate + "_" + SeedUtils.getSeedMD5Code(String.valueOf(SeedUtils.getRandom(999,1))); @@ -258,6 +274,7 @@ public class SeedFileService { paramMap.put("copyContractYn", copyContractYn); paramMap.put("fileGubun", fileGubunData); paramMap.put("fileMemo", fileMemoData); + paramMap.put("fileFuncType", fileFuncType); //파일타입에 따라서 sql분기 /*if(fileFuncType.equals("mediation")){ dao.caseInsert(paramMap); diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml index 104b4289..19092b19 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublend/trublend_sql.xml @@ -1029,12 +1029,12 @@ FROM C_CASEFILE CF WHERE FILE_NO = #{rceptNo} AND DEL_GUBUN = 'N' - AND FILE_MEMO IN ( + AND (FILE_MEMO IS NULL OR FILE_MEMO IN ( SELECT DOC_ID FROM C_SANCTNHISTORY WHERE CASE_NO = #{caseNo} AND RESULT IS NOT NULL - ) + )) diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml index 4bfc719b..6ab13718 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml @@ -3728,12 +3728,12 @@ FROM C_CASEFILE CF WHERE FILE_NO = #{rceptNo} AND DEL_GUBUN = 'N' - AND FILE_MEMO IN ( + AND (FILE_MEMO IS NULL OR FILE_MEMO IN ( SELECT DOC_ID FROM C_SANCTNHISTORY WHERE CASE_NO = #{caseNo} AND RESULT IS NOT NULL - ) + )) diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp index 8cdf1407..8c7dc2f2 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp @@ -6367,13 +6367,34 @@ function docOpen(obj) { + +
+ + +
+ + + + +
+
@@ -6391,6 +6412,17 @@ function docOpen(obj) {
+ +
+ + +
+ + + + +
+
@@ -6408,6 +6440,17 @@ function docOpen(obj) {
+ +
+ + +
+ + + + +
+ @@ -10050,6 +10093,24 @@ function docOpen(obj) { +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
diff --git a/src/main/webapp/WEB-INF/views/_common/_js/commonFileUtil.js b/src/main/webapp/WEB-INF/views/_common/_js/commonFileUtil.js index 9ad82ad9..e2e107c5 100644 --- a/src/main/webapp/WEB-INF/views/_common/_js/commonFileUtil.js +++ b/src/main/webapp/WEB-INF/views/_common/_js/commonFileUtil.js @@ -83,11 +83,12 @@ function jf_upload_set(fileName, reFileName, fileSize, fileType, copyContractYn, //홈페이지에서 등록하는 파일은 메모 박스가 없게... + //250404 - 내부결재 첨부파일은 메모에 DOCID 사용하여 메모 제외 var isFileMemo = true; if(reFileName != null && reFileName !="" && reFileName != undefined){ var arrReName = reFileName.split("_"); if(arrReName.length > 0){ - if(arrReName[0] == 'mediation'){ + if(arrReName[0] == 'mediation' || arrReName[0] == 'x-1' || arrReName[0] == 'x-2' || arrReName[0] == 'x-3'){ isFileMemo = false; } }