tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'JIWOO'

Browse Source
This commit is contained in:
JIWOO 2025-01-13 16:53:20 +09:00
commit a11cdfd554
4 changed files with 67 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/java/seed/com/user/mediation/WebMediationController.java
View File

@ -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 <Map <String, Object>> 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 <Map <String, Object>> list = service2.selectApplcnt(paramMap);
//알림 발송
try {
SendSmsVO sendSmsVO = sendService.selectSendSet();
if("Y".equals(sendSmsVO.getAtYn())) {
List <Map <String, Object>> 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");

3
src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml
View File

@ -166,7 +166,8 @@
BIZR_NO,
CPR_NO,
FILE_NO,
EMAIL
EMAIL,
EMAIL_AGREE
FROM C_APPLCNT
WHERE RCEPT_NO = #{rceptNo}
ORDER BY

1
src/main/resources/egovframework/sqlmap/config/mappers/trublcfrncmng/trublcfrncmng_sql.xml
View File

@ -353,6 +353,7 @@
FROM C_TRUBLMFCMM
<where>
USE_CHECK = 'Y'
AND DEL_YN = 'N'
<if test='memberPosition neq "0915000000"'>
<if test='memberDept eq "1004000000" or memberDept eq "1040000000"'><!-- 공정거래팀, 플랫폼팀 -->
<!-- AND CASE_GUBUN = '0201000000' -->

6
src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep02.jsp
View File

@ -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 @@
<input type="hidden" name="commandCode" id="commandCode" value="medi">
<input type="hidden" name="agreeCheck" value="${agreeCheck}">
<input type="hidden" name="mediType" id="mediType" value="${mediType}">
<input type="hidden" name="emailAgree" id="emailAgree" value="">
<input type="hidden" name="nextUrl" value="/user/mediation/${siteIdx}/04/${siteMenuIdx}/mediationStep03.do">
<div class="sub_content apl03_info_content apl01">