From df2e028ee9336dc9a08b42c27607b424a76199c0 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Mon, 13 Jan 2025 16:52:13 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=ED=98=91?= =?UTF-8?q?=EC=9D=98=ED=9A=8C=20=EB=93=B1=EB=A1=9D=20=EC=8B=9C=20=EC=B0=B8?= =?UTF-8?q?=EC=97=AC=EC=9C=84=EC=9B=90=20=EC=A1=B0=ED=9A=8C=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=EC=97=90=20=EC=82=AD=EC=A0=9C=EC=97=AC=EB=B6=80=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80,=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=B6=84?= =?UTF-8?q?=EC=9F=81=EC=A1=B0=EC=A0=95=20=EC=8B=A0=EC=B2=AD=20=EC=8B=9C=20?= =?UTF-8?q?=EB=89=B4=EC=8A=A4=EB=A0=88=ED=84=B0=20=EC=84=9C=EB=B9=84?= =?UTF-8?q?=EC=8A=A4=20=EC=97=AC=EB=B6=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mediation/WebMediationController.java | 61 ++++++++++++++++++- .../config/mappers/mypage/mypage_sql.xml | 3 +- .../trublcfrncmng/trublcfrncmng_sql.xml | 1 + .../web/user/mediation/mediationStep02.jsp | 6 +- 4 files changed, 67 insertions(+), 4 deletions(-) diff --git a/src/main/java/seed/com/user/mediation/WebMediationController.java b/src/main/java/seed/com/user/mediation/WebMediationController.java index dbb8ec49..db9a62b9 100644 --- a/src/main/java/seed/com/user/mediation/WebMediationController.java +++ b/src/main/java/seed/com/user/mediation/WebMediationController.java @@ -39,6 +39,7 @@ import seed.com.gtm.util.JSPUtil; import seed.com.user.mypage.CaseAuthService; import seed.com.user.mypage.CaseAuthVO; import seed.com.user.mypage.MyPageService; +import seed.com.user.news.NewsService; import seed.common.service.InnorixFileService; import seed.manager.group.service.ManagerGroupService; import seed.manager.member.service.ManagerMemberService; @@ -94,6 +95,9 @@ public class WebMediationController { @Autowired private SendService sendService; + @Autowired + private NewsService newsService; + @Value("#{config['member.merge']}") private String memberMerge; @@ -269,8 +273,14 @@ public class WebMediationController { String personalCheck = SeedUtils.setReplaceNull(paramMap.get("personalCheck")); String rceptNo = SeedUtils.setReplaceNull(session.getAttribute("rceptNo")); + //신청단계에서 이전 단계로 이동 할 시 세션이 아닌 파라미터 사용 + if("".equals(rceptNo)){ + rceptNo = SeedUtils.setReplaceNull(paramMap.get("rceptNo")); + } + String mediType = SeedUtils.setReplaceNull(paramMap.get("mediType")); String fileGubun = SeedUtils.setReplaceNull(session.getAttribute("fileGubun")); + String emailAgree = SeedUtils.setReplaceNull(paramMap.get("emailAgree")); //마이페이지 통해서 온 경우 session의 조정유형 사용 if(!rceptNo.equals("") && mediType.equals("")) { mediType = SeedUtils.setReplaceNull(session.getAttribute("mediType")); @@ -283,7 +293,13 @@ public class WebMediationController { if(!rceptNo.equals("")){ map.put("recptmsData", service2.selectRecptms(paramMap));//사건마스터 - map.put("applcntData", service2.selectApplcnt(paramMap));//신청인 + /*250113 - 임시저장 데이터 호출 시 이메일 약관 동의 조회*/ + /*map.put("applcntData", service2.selectApplcnt(paramMap));//신청인*/ + List > appList = service2.selectApplcnt(paramMap); + if("Y".equals(SeedUtils.setReplaceNull(appList.get(0).get("EMAIL_AGREE")).toString())){ + emailAgree = "Y"; + }; + map.put("applcntData", appList); map.put("respondentData", service2.selectRespondent(paramMap));//피신청인 map.put("appagentData", service2.selectAppagent(paramMap));//신청인 대리인 map.put("selectRceptsttus", service2.selectRceptsttus(paramMap));//접수현황 @@ -297,6 +313,7 @@ public class WebMediationController { map.put("agreeCheck", agreeCheck); map.put("personalCheck", personalCheck); map.put("mediType", mediType); + map.put("emailAgree", emailAgree); session.setAttribute("siteIdx", siteIdx); @@ -4027,13 +4044,16 @@ public class WebMediationController { this.service.asSignUpdate(paramMap); this.service.deptConfirmUpdate(paramMap); + /*[민원인]온라인 분쟁조정시스템 조정신청 완료시*/ + //알림 발송, 뉴스레터 신청을 위한 신청일 조회 + List > list = service2.selectApplcnt(paramMap); + //알림 발송 try { SendSmsVO sendSmsVO = sendService.selectSendSet(); if("Y".equals(sendSmsVO.getAtYn())) { - List > list = service2.selectApplcnt(paramMap); list.stream().forEach(t -> { try { sendService.sendAt(t.get("TEL").toString().replaceAll("-", ""), "TEMPLATE_APP_JUBSU", null); @@ -4045,6 +4065,37 @@ public class WebMediationController { } catch (Exception e) { System.out.println("알림 발송 실패"); } + + //뉴스레터 등록 + try { + list.stream().forEach(t -> { + try { + if("Y".equals(t.get("EMAIL_AGREE"))) { + String clientName = t.get("COMPANY_CEO").toString(); + String clientEmail = t.get("EMAIL").toString(); + String ip = request.getHeader("X-FORWARDED-FOR"); + if(ip == null) { + ip = request.getRemoteAddr(); + } + if (clientName != null && !"".equals(clientName) && clientEmail != null && !"".equals(clientEmail)) { + paramMap.put("clientName", clientName); + paramMap.put("clientEmail", clientEmail); + paramMap.put("clientIp", ip); + paramMap.put("agreeCheck", "Y"); + int dupRs = this.newsService.newsDuplication(paramMap); + if(dupRs == 0) { + this.newsService.newsInsert(paramMap); + } + } + + } + } catch (Exception e) { + e.printStackTrace(); + } + }); + } catch (Exception e) { + System.out.println("뉴스레터 서비스 등록 실패"); + } } // 사건현황, 협의회별 상세 현황 INSERT @@ -4052,6 +4103,12 @@ public class WebMediationController { paramMap.put("sts", "success"); + + //신청인 뉴스레터 INSERT + service2.selectApplcnt(paramMap); + + + }catch (Exception e) { log.error("CHECK ERROR:",e); paramMap.put("sts", "fail"); 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 bb7ae257..a0947dfe 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 @@ -166,7 +166,8 @@ BIZR_NO, CPR_NO, FILE_NO, - EMAIL + EMAIL, + EMAIL_AGREE FROM C_APPLCNT WHERE RCEPT_NO = #{rceptNo} ORDER BY diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml index 50418f98..86a6e74f 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml @@ -353,6 +353,7 @@ FROM C_TRUBLMFCMM USE_CHECK = 'Y' + AND DEL_YN = 'N' diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep02.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep02.jsp index a5ea819b..806b04e1 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep02.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep02.jsp @@ -17,7 +17,10 @@ function nextPage(){ var isInfoAgree01YChecked = $('#infoAgree01_Y').is(':checked'); var isInfoAgree02YChecked = $('#infoAgree02_Y').is(':checked'); - + var isInfoAgree03YChecked = $('#infoAgree03_Y').is(':checked'); + if (isInfoAgree03YChecked) { + $("#emailAgree").val("Y"); + } if (isInfoAgree01YChecked && isInfoAgree02YChecked) { $("#personalCheck").val("Y"); document.frm.submit(); @@ -39,6 +42,7 @@ +