From 35b21ce72c4ccdff0350a04fe906009602f8152c Mon Sep 17 00:00:00 2001 From: JIWOO Date: Fri, 29 Nov 2024 13:20:56 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EB=B6=84=EC=9F=81=EC=A1=B0=EC=A0=95=20?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=20=EB=B0=8F=20=EB=A7=88=EC=9D=B4=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mediation/WebMediationController.java | 96 ++++++++++++------- src/main/java/seed/utils/FairnetUtils.java | 22 ++++- .../mappers/mediation/mediation_sql.xml | 6 ++ .../config/mappers/mypage/mypage_sql.xml | 5 +- .../web/user/mediation/mediationStep04_1.jsp | 52 +++++----- .../web/user/mediation/mediationStep04_2.jsp | 42 +++++++- .../web/user/mediation/mediationStep04_3.jsp | 61 ++++++++---- .../web/user/mediation/mediationStep04_4.jsp | 15 +-- 8 files changed, 207 insertions(+), 92 deletions(-) diff --git a/src/main/java/seed/com/user/mediation/WebMediationController.java b/src/main/java/seed/com/user/mediation/WebMediationController.java index 5dffdbe9..dd8fac84 100644 --- a/src/main/java/seed/com/user/mediation/WebMediationController.java +++ b/src/main/java/seed/com/user/mediation/WebMediationController.java @@ -1,6 +1,7 @@ package seed.com.user.mediation; import java.text.ParseException; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -601,6 +602,7 @@ public class WebMediationController { paramMap.put("agreeCheck", agreeCheck); paramMap.put("personalCheck", personalCheck); + if(!rceptNo.equals("")){ map.put("recptmsData", service2.selectRecptms(paramMap));//사건마스터 map.put("applcntData", service2.selectApplcnt(paramMap));//신청인 @@ -612,12 +614,34 @@ public class WebMediationController { map.put("selectSubcntrsttusTotA", service2.selectSubcntrsttusTotA(paramMap));//A 하도급 소계 그룹바이 map.put("selectSubcntrsttusR", service2.selectSubcntrsttusR(paramMap));//R 하도급대급 내역 리스 map.put("selectSubcntrsttusTotR", service2.selectSubcntrsttusTotR(paramMap));//R 하도급 소계 그룹바이 - map.put("caseFileList", fileService.caseFileList(paramMap));//파일 리스트 + //map.put("caseFileList", fileService.caseFileList(paramMap));//파일 리스트 + + List> fileList = fileService.caseFileList(paramMap); + List> fileCopyYList = new ArrayList<>(); + for(Map fileCopyY : fileList) { + + if("Y".equals(fileCopyY.get("COPY_CONTRACT_YN"))){ + fileCopyYList.add(fileCopyY); + } + } + map.put("caseFileList", fileCopyYList);//파일 리스트 + + //이노릭스 수정화면 용 파일 값 넘겨주기 + String innorixFileListInfoStr = ""; + try { + innorixFileListInfoStr = FairnetUtils.innorixCaseFileListInfo(fileCopyYList); + }catch(Exception e){ + System.out.println("이노릭스 에러"); + } + map.put("innorixFileListInfoStr", innorixFileListInfoStr); + }else { map.put("message", "정상적이지 않은 사건번호입니다. 관리자에게 문의하세요."); map.put("self", "history"); return new ModelAndView("/_common/jsp/umessage"); } + + map.put("rceptNo", rceptNo); map.put("agreeCheck", agreeCheck); map.put("personalCheck", personalCheck); @@ -786,7 +810,27 @@ public class WebMediationController { map.put("selectSubcntrsttusTotA", service2.selectSubcntrsttusTotA(paramMap));//A 하도급 소계 그룹바이 map.put("selectSubcntrsttusR", service2.selectSubcntrsttusR(paramMap));//R 하도급대급 내역 리스 map.put("selectSubcntrsttusTotR", service2.selectSubcntrsttusTotR(paramMap));//R 하도급 소계 그룹바이 - map.put("caseFileList", fileService.caseFileList(paramMap));//파일 리스트 + //map.put("caseFileList", fileService.caseFileList(paramMap));//파일 리스트 + + List> fileList = fileService.caseFileList(paramMap); + List> fileCopyNList = new ArrayList<>(); + for(Map fileCopyN : fileList) { + + if(!"Y".equals(fileCopyN.get("COPY_CONTRACT_YN"))){ + fileCopyNList.add(fileCopyN); + } + } + map.put("caseFileList", fileCopyNList);//파일 리스트 + + //이노릭스 수정화면 용 파일 값 넘겨주기 + String innorixFileListInfoStr = ""; + try { + innorixFileListInfoStr = FairnetUtils.innorixCaseFileListInfo(fileCopyNList); + }catch(Exception e){ + System.out.println("이노릭스 에러"); + } + map.put("innorixFileListInfoStr", innorixFileListInfoStr); + }else { map.put("message", "정상적이지 않은 사건번호입니다. 관리자에게 문의하세요."); map.put("self", "history"); @@ -3427,7 +3471,12 @@ public class WebMediationController { String tel = tel1 + "-" + tel2 + "-" + tel3; paramMap.put("agentHp", tel); - service.agentInsert(paramMap); + + if(paramMap.get("appagentDataSeqNo").equals("") && !"Y".equals(paramMap.get("appagentDataYn"))) { + service.agentInsert(paramMap); + }else { + service.agentUpdate(paramMap); + } // 사건현황, 협의회별 상세 현황 INSERT @@ -3473,7 +3522,8 @@ public class WebMediationController { } // fileService.fileInsert(paramMap, request, session); fileService.caseFileDel(paramMap);*/ - + + fileService.caseFileDel(paramMap); //이노릭스 대용량 업로드 String innorixFileListStr = (String) paramMap.get("innorixFileListVO"); if(!"".equals(innorixFileListStr)) { @@ -3636,6 +3686,9 @@ public class WebMediationController { /*서비스 로직*/ try{ + //,제거하기 + paramMap.put("subCntrAmount", SeedUtils.setReplaceNull(paramMap.get("subCntrAmount")).toString().replaceAll(",", "")); + service.rceUpdate(paramMap); /*if(!"".equals(SeedUtils.setReplaceNull(paramMap.get("fileFuncType")))) { @@ -3644,6 +3697,7 @@ public class WebMediationController { // fileService.fileInsert(paramMap, request, session); fileService.caseFileDel(paramMap);*/ + fileService.caseFileDel(paramMap); //이노릭스 대용량 업로드 String innorixFileListStr = (String) paramMap.get("innorixFileListVO"); if(!"".equals(innorixFileListStr)) { @@ -3739,7 +3793,11 @@ public class WebMediationController { } } - service.reasonInsert(paramMap); + if("0".equals(paramMap.get("reaseonCnt")) && !"Y".equals(paramMap.get("reaseonYn"))) { + service.reasonInsert(paramMap); + }else { + service.reasonUpdate(paramMap); + } paramMap.put("sts", "success"); }catch (Exception e) { @@ -3894,34 +3952,6 @@ public class WebMediationController { service.rceptmstUpdate(paramMap); // 사건현황, 협의회별 상세 현황 INSERT - - //콤마 제거하기 -// paramMap.put("rceCapital", paramMap.get("rceCapital").toString().replaceAll(",", "")); -// paramMap.put("rceTotAssets", paramMap.get("rceTotAssets").toString().replaceAll(",", "")); -// paramMap.put("rceTotSales", paramMap.get("rceTotSales").toString().replaceAll(",", "")); -// paramMap.put("rceBp", paramMap.get("rceBp").toString().replaceAll(",", "")); - - if(paramMap.get("rceCapital") != null) { - paramMap.put("rceCapital", paramMap.get("rceCapital").toString().replaceAll(",", "")); - } - if(paramMap.get("rceTotAssets") != null) { - paramMap.put("rceTotAssets", paramMap.get("rceTotAssets").toString().replaceAll(",", "")); - } - if(paramMap.get("rceTotSales") != null) { - paramMap.put("rceTotSales", paramMap.get("rceTotSales").toString().replaceAll(",", "")); - } - if(paramMap.get("rceBp") != null) { - paramMap.put("rceBp", paramMap.get("rceBp").toString().replaceAll(",", "")); - } - - paramMap.put("joiningAmount", SeedUtils.setReplaceNull(paramMap.get("joiningAmount")).toString().replaceAll(",", "")); - paramMap.put("joiningAmount", SeedUtils.setReplaceNull(paramMap.get("joiningAmount")).toString().replaceAll(",", "")); - - //하도급거래 - 시공능력 평가액, - paramMap.put("subCntrAmount", SeedUtils.setReplaceNull(paramMap.get("subCntrAmount")).toString().replaceAll(",", "")); - - paramMap.put("distbTotSales", SeedUtils.setReplaceNull(paramMap.get("distbTotSales")).toString().replaceAll(",", "")); - service.rceUpdate(paramMap); paramMap.put("sts", "success"); diff --git a/src/main/java/seed/utils/FairnetUtils.java b/src/main/java/seed/utils/FairnetUtils.java index 56b8270e..6069a66a 100644 --- a/src/main/java/seed/utils/FairnetUtils.java +++ b/src/main/java/seed/utils/FairnetUtils.java @@ -166,7 +166,7 @@ public class FairnetUtils { } - /*첨부파일 목록의 정보를 이노릭스 화면에서 사용하기 위한 정보로 리턴*/ + /*첨부파일 목록의 정보를 이노릭스 화면에서 사용하기 위한 정보로 리턴 - T-EXTRA_FILE*/ public static String innorixFileListInfo(List> fileList) throws Exception { List> innorixFileListInfo = new ArrayList<>(); @@ -184,6 +184,26 @@ public class FairnetUtils { return innorixFileListInfoStr; + + } + /*첨부파일 목록의 정보를 이노릭스 화면에서 사용하기 위한 정보로 리턴 - C_CASEFILE*/ + public static String innorixCaseFileListInfo(List> fileList) throws Exception { + + List> innorixFileListInfo = new ArrayList<>(); + for (Map file : fileList) { + Map innorixFileInfo = new HashMap<>(); + innorixFileInfo.put("printFileName", file.get("FILE_NAME")); + innorixFileInfo.put("fileSize", file.get("FILE_SIZE")); + innorixFileInfo.put("dataIdx", file.get("SEQ_NO")); + innorixFileInfo.put("downloadUrl", "notUse"); //해당 값 없으면 목록이 안나와 임시로 사용 + innorixFileListInfo.add(innorixFileInfo); + } + + ObjectMapper objectMapper = new ObjectMapper(); + String innorixFileListInfoStr = objectMapper.writeValueAsString(innorixFileListInfo); + + return innorixFileListInfoStr; + } /** diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/mediation/mediation_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/mediation/mediation_sql.xml index 8ed7e026..071e88cb 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/mediation/mediation_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/mediation/mediation_sql.xml @@ -601,6 +601,12 @@ FTC_NOTE = #{rceFtcInvestigationNote, jdbcType=VARCHAR}, + + PAR_AGREEMENT = #{rceParAgreement, jdbcType=VARCHAR}, + + + LAWSUIT_CHECKSAME = #{rceLawCheckSame, jdbcType=VARCHAR}, + RCEPT_NO = #{rceptNo} WHERE RCEPT_NO = #{rceptNo} diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml index f3aa7590..7dee5716 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml @@ -315,7 +315,10 @@ P_CONTACT_HP, P_CONTACT_FAX, P_CONTACT_OFCPS, - P_CONTACT_EMAIL + P_CONTACT_EMAIL, + LAWSUT_CASENUM, + LAWSUIT_CHECKSAME, + PAR_AGREEMENT FROM C_RCEPTSTTUS WHERE RCEPT_NO = #{rceptNo} diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_1.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_1.jsp index 231f2d1f..54aed3c5 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_1.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_1.jsp @@ -14,7 +14,7 @@