Merge branch 'JIWOO'

This commit is contained in:
JIWOO 2024-12-30 17:06:30 +09:00
commit 2d8bab5700
10 changed files with 403 additions and 17 deletions

View File

@ -231,7 +231,7 @@ public class SocialCertController {
returnData.put("msg", "인증되었습니다.");
//세션 등록
FairnetUtils.setCertSession(reqeust, nDecrypt(result.getReceiverName()), nDecrypt(result.getReceiverHP()));
FairnetUtils.setCertSession(reqeust, nDecrypt(result.getReceiverName()), nDecrypt(result.getReceiverHP()), "");
certVO.setPhone(nDecrypt(result.getReceiverHP()));
certVO.setName(nDecrypt(result.getReceiverName()));
@ -302,7 +302,7 @@ public class SocialCertController {
returnData.put("msg", "인증되었습니다.");
//세션 등록
FairnetUtils.setCertSession(reqeust, kDecrypt(result.getReceiverName()), kDecrypt(result.getReceiverHP()));
FairnetUtils.setCertSession(reqeust, kDecrypt(result.getReceiverName()), kDecrypt(result.getReceiverHP()), "");
certVO.setPhone(kDecrypt(result.getReceiverHP()));
certVO.setName(kDecrypt(result.getReceiverName()));

View File

@ -419,7 +419,7 @@ public class WebUserCheckController {
e.printStackTrace();
}
FairnetUtils.setCertSession(req, hpName, hpCellNo);
FairnetUtils.setCertSession(req, hpName, hpCellNo, hpDi);
CertVO certVO = new CertVO();
certVO.setName(hpName);

View File

@ -2970,7 +2970,7 @@ public class WebMediationController {
caseAuthVO.setCertId(certVO.getCertId());
//등록자 승인 완료 설정
caseAuthVO.setCaseAuthType("REG");
caseAuthVO.setCaseAuthType("reg");
caseAuthVO.setCaseAuthYn("Y");
caseAuthService.insertCaseAuth(caseAuthVO);

View File

@ -461,6 +461,7 @@ private Logger log = Logger.getLogger(this.getClass());
//페이지용 추가 1
try {
paramMap.put("hpDi", session.getAttribute("hpDi"));
paramMap.put("certDi", session.getAttribute("certDi"));
}catch(Exception ex) {
paramMap.put("hpDi", "hpDi");
ex.printStackTrace();
@ -480,8 +481,8 @@ private Logger log = Logger.getLogger(this.getClass());
PageMaker pageMaker = new PageMaker();
pageMaker.setCri(cri);
//2025년 1월 1일 데이터부터 조회
pageMaker.setTotalCount(service.myPageListCnt(paramMap));
map.put("myPageList", service.myPageList(paramMap));
map.put("pageMaker", pageMaker);
}catch(Exception ex) {
@ -503,6 +504,236 @@ private Logger log = Logger.getLogger(this.getClass());
return new ModelAndView("/_extra/web/user/myPage/myMediationList");
}
// /user/mypage/case/01/169/myMediationList.do
@RequestMapping("/web/user/mypage/{siteIdx}/01/{siteMenuIdx}/myPastMediationList.do")
public ModelAndView myPastMediationList(ModelMap map, HttpSession session, HttpServletRequest req, @RequestParam Map<String,Object> paramMap, Criteria cri,
@PathVariable(value="siteIdx") String siteIdx,
@PathVariable(value="siteMenuIdx") Integer siteMenuIdx
){
/*
if(SeedUtils.setReplaceNull(session.getAttribute("hpName")).equals("")){
map.put("siteIdx", "case");
map.put("url", "/web/user/mypage/case/01/168/myCheck.do");
map.put("message", "common.message.my.check");
map.put("opener", "");
map.put("append", "");
map.put("self", "");
return new ModelAndView("/_common/jsp/umessage");
}
*/
// CI 체크
if(!FairnetUtils.ciCheck(map, session)) {
return new ModelAndView("/_common/jsp/umessage");
}
System.out.println("1");
boolean b_ret_u = true;
map = FairnetUtils.myCheck(map, session);
b_ret_u = (boolean)map.get("b_ret");
if (!b_ret_u) {
return new ModelAndView("/_common/jsp/umessage");
}
setSessionMessageRemove(session);
/*----권한체크----*/
Integer memberIdx = Integer.valueOf(SeedUtils.setReplaceNull(session.getAttribute("memberIdx"),"0"));
String memberGrant = (memberIdx == 0) ? "N" : SeedUtils.setReplaceNull(managerMemberService.getMemberMapForm(memberIdx, new String[] {"memberGrant"}).get("_memberGrant"), "N");
boolean memberAuthM = managerSiteManagerService.getSiteManagerListCnt(siteIdx, memberIdx);
boolean memberAuth = managerSiteMenuManagerService.getSiteMenuManagerListCnt(siteMenuIdx, memberIdx);
System.out.println("12");
//메뉴 권한설정
/*
if(!memberGrant.equals("S") && !memberAuthM && !memberAuth &&
!managerSiteMenuAuthService.getSiteMenuAuthChk(siteMenuIdx, memberIdx)){
map.put("message", "common.message.no.grant");
if(memberIdx.equals(0)){
map.put("url", "/"+siteIdx+"/index.do");
}else{
map.put("self", "history");
}
return new ModelAndView("/_common/jsp/umessage");
}
*/
boolean b_ret = true;
b_ret = FairnetUtils.hasUserAuth(memberIdx, memberGrant, memberAuth, session, map);
if (!b_ret) {
return new ModelAndView("/_common/jsp/message");
}
Map<Object, Object> tSiteMenuDB = managerSiteMenuService.getSiteMenuMapForm(siteMenuIdx,
new String[] {"siteMenuName", "siteMenuParentTitle", "siteMenuStatus", "siteMenuType", "siteMenuLinkUrl", "siteMenuCharge", "siteMenuCharge", "siteMenuSNS",
"siteMenuTitle", "siteMenuRegDate", "siteMenuModDate", "siteMenuNameType", "siteMenuIdxs", "siteMenuDepth", "siteMenuSatisfaction", "siteMenuIdx1",
"tSite.siteActiveMenuWidth", "tSite.siteService", "tSite.siteServiceSdate", "tSite.siteServiceSdate"});
System.out.println("13");
/*
if(!memberGrant.equals("S") && !memberAuthM && !memberAuth){
if(!SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuStatus")).equals("U")){
map.put("message", "common.message.no.siteMenu");
map.put("self", "history");
return new ModelAndView("/_common/jsp/umessage");
}
}
*/
if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteService")).equals("Y")){
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
try{
Date getDate = new Date();
Date sDate = formatter.parse(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteServiceSdate")));
Date eDate = formatter.parse(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteServiceEdate")));
if((sDate.compareTo(formatter.parse(formatter.format(getDate))) > 0 && eDate.compareTo(formatter.parse(formatter.format(getDate))) > 0) ||
(sDate.compareTo(formatter.parse(formatter.format(getDate))) < 0 && eDate.compareTo(formatter.parse(formatter.format(getDate))) < 0)){
return new ModelAndView("redirect:/user/common/service/"+siteIdx+".do");
}
}catch(ParseException e){
log.error("CHECK ERROR:",e);
}
}
System.out.println("14");
if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuType")).equals("F") ||
SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuType")).equals("L")){
return new ModelAndView("redirect:"+SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuLinkUrl")));
}
String siteMenuManager = "N";
StringBuffer siteMenuManagerIdx = new StringBuffer();
String siteMenuCharge = SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuCharge"), "N");
List<Map<Object, Object>> siteMenuManagerList =
managerSiteMenuManagerService.getSiteMenuManagerMapList(siteMenuIdx, new String[] {"siteMenuManagerStatus", "tMember.memberIdx"});
System.out.println("15");
for(int i=0; i<siteMenuManagerList.size(); i++){
Map<Object, Object> tSiteMenuManagerDB = siteMenuManagerList.get(i);
if(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_siteMenuManagerStatus")).equals("U")){
if(!memberIdx.equals(0) &&
memberIdx.equals(Integer.parseInt(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_memberIdx"), "0"))) &&
siteMenuManager.equals("N")){
siteMenuManager = "Y";
}
siteMenuManagerIdx.append(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_memberIdx")).toString());
siteMenuManagerIdx.append(",");
}
}
if(memberGrant.equals("S") || memberAuthM){
siteMenuManager = "Y";
}
System.out.println("16");
//편집 권한
map.put("siteMenuManager", siteMenuManager);
//담당자 보기 설정
map.put("siteMenuCharge", siteMenuCharge);
//담당자 이름
map.put("siteMenuManagerIdx", siteMenuManagerIdx.toString());
//만족도 설정
map.put("siteMenuSatisfaction", SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuSatisfaction"), "N"));
map.put("siteMenuSubTitle", managerSiteMenuService.getSiteMenuSubTitleForm(siteIdx, SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuIdx1"))));
String siteMenuTitle = managerSiteMenuService.getSiteMenuParentName(siteIdx, SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuIdxs")), "edit").replaceAll("", "|") +
" | " + SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuName"));
map.put("siteMenuTitle", siteMenuTitle);
System.out.println("157");
//부모메뉴 타이틀 설정한 경우 해당 글의 부모 타이틀을 가져옴
if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuParentTitle") ,"N").equals("Y")){
String[] siteMenuTitles = siteMenuTitle.split("\\|");
tSiteMenuDB.put("_siteMenuName", siteMenuTitles[Integer.parseInt(tSiteMenuDB.get("_siteMenuDepth").toString())-1]);
}
map.put("tSiteMenuDB", tSiteMenuDB);
map.put("memberAuthM", memberAuthM);
map.put("seedMenuAuth", managerGroupService.getGroupList(siteIdx, memberIdx, memberMerge, memberMergeSiteIdx));
/*----권한체크 종료----*/
System.out.println("158");
//여기서부터 작업할거
//페이징 관련
paramMap.put("pageStart", cri.getPageStart());
paramMap.put("perPageNum", cri.getPerPageNum());
//페이지용 추가 1
try {
paramMap.put("hpDi", session.getAttribute("hpDi"));
paramMap.put("certDi", session.getAttribute("certDi"));
}catch(Exception ex) {
paramMap.put("hpDi", "hpDi");
ex.printStackTrace();
}
//사건권한 설정
try {
CertVO certVO = certService.selectCert(FairnetUtils.getCertSession(req));
paramMap.put("certName", certVO.getName());
paramMap.put("certPhone", certVO.getPhone());
}catch(Exception ex) {
ex.printStackTrace();
}
//페이지용 추가 2
try {
PageMaker pageMaker = new PageMaker();
pageMaker.setCri(cri);
//2025년 1월 1일 이전 데이터 조회
paramMap.put("viewPoint", "past");
pageMaker.setTotalCount(service.myPageListCnt(paramMap));
map.put("myPageList", service.myPageList(paramMap));
map.put("pageMaker", pageMaker);
}catch(Exception ex) {
ex.printStackTrace();
}
System.out.println("159");
System.out.println(paramMap);
System.out.println("160");
System.out.println(map);
System.out.println("161");
if ("temp".equals((String)paramMap.get("command"))) {
return new ModelAndView("/_extra/web/user/myPage/myMediationTempList");
}
return new ModelAndView("/_extra/web/user/myPage/myPastMediationList");
}
// /user/mypage/case/01/169/myMediationView.do
@RequestMapping("/web/user/mypage/{siteIdx}/01/{siteMenuIdx}/myMediationDetail.do")
public ModelAndView myMediationView(ModelMap map, HttpSession session, HttpServletRequest req, @RequestParam Map<String,Object> paramMap,
@ -659,8 +890,17 @@ private Logger log = Logger.getLogger(this.getClass());
CaseAuthVO caseAuthVO = new CaseAuthVO();
caseAuthVO.setCertId(certVO.getCertId());
caseAuthVO.setRceptNo(SeedUtils.setReplaceNull(paramMap.get("rceptNo")));
//등록자 이전사건조회에서 상세 넘어갈 권한 등록하기
caseAuthVO.setCaseAuthType("reg");
caseAuthVO.setCaseAuthYn("N");
caseAuthService.insertCaseAuth(caseAuthVO);
caseAuthVO = caseAuthService.selectCaseAuthExist(caseAuthVO);
map.put("caseAuthVO", caseAuthVO);//구분
}
}catch(Exception e) {
e.printStackTrace();
@ -1082,6 +1322,7 @@ private Logger log = Logger.getLogger(this.getClass());
req.getSession().removeAttribute("certNm");
req.getSession().removeAttribute("certHpNo");
req.getSession().removeAttribute("certDi");
return "redirect:/";
}

View File

@ -251,10 +251,14 @@ public class FairnetUtils {
HttpServletRequest reqeust
, String certNm
, String certHpNo
, String certDi
) {
HttpSession session = reqeust.getSession();
session.setAttribute("certNm", certNm);
session.setAttribute("certHpNo", certHpNo);
if(!"".equals(certDi)) {
session.setAttribute("certDi", certDi);
}
session.setMaxInactiveInterval(60*60*2);
}

View File

@ -69,15 +69,18 @@
WHERE UCA.RCEPT_NO = RCEPT_NO
AND UC.CERT_NAME = #{certName}
AND UC.CERT_PHONE = #{certPhone}
AND UCA.CASE_AUTH_YN = 'Y'
)
<if test="hpDi != null"> OR APPLCNT_DI = #{hpDi}</if>
<if test="certDi != null"> OR APPLCNT_DI = #{certDi}</if>
)
AND DEL_GUBUN = 'N'
<choose>
<when test="command == 'temp'">AND REQUEST_CHECK = '1601000000'</when>
<otherwise>AND REQUEST_CHECK = '1602000000'</otherwise>
</choose>
<choose>
<when test="viewPoint == 'past'">AND TO_DATE('2025-01-01', 'YYYY-MM-DD') > CASE_DATE</when>
<otherwise>AND CASE_DATE >= TO_DATE('2025-01-01', 'YYYY-MM-DD')</otherwise>
</choose>
ORDER BY RCEPT_NO DESC
) ROW_
)
@ -97,15 +100,18 @@
WHERE UCA.RCEPT_NO = RCEPT_NO
AND UC.CERT_NAME = #{certName}
AND UC.CERT_PHONE = #{certPhone}
AND UCA.CASE_AUTH_YN = 'Y'
)
<if test="hpDi != null"> OR APPLCNT_DI = #{hpDi}</if>
<if test="certDi != null"> OR APPLCNT_DI = #{certDi}</if>
)
AND DEL_GUBUN = 'N'
<choose>
<when test="command == 'temp'">AND REQUEST_CHECK = '1601000000'</when>
<otherwise>AND REQUEST_CHECK = '1602000000'</otherwise>
</choose>
<choose>
<when test="viewPoint == 'past'">AND TO_DATE('2025-01-01', 'YYYY-MM-DD') > CASE_DATE</when>
<otherwise>AND CASE_DATE >= TO_DATE('2025-01-01', 'YYYY-MM-DD')</otherwise>
</choose>
</select>
<!-- 접수마스터 -->

View File

@ -30,8 +30,12 @@
}
function goList(){
var viewPoint = '${param.viewPoint}';
if(viewPoint == 'past'){
location.href="/web/user/mypage/case/01/169/myPastMediationList.do?page=1";
}else{
location.href="/web/user/mypage/case/01/169/myMediationList.do?page=1";
}
}
</script>

View File

@ -0,0 +1,131 @@
<%@ page language='java' contentType='text/html; charset=UTF-8'%>
<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
<%@ taglib uri='http://www.springframework.org/tags/form' prefix='form'%>
<!-- css -->
<link rel="stylesheet" href="/kofair_case_seed/css/reset.css">
<link rel="stylesheet" href="/kofair_case_seed/css/font.css">
<link rel="stylesheet" href="/kofair_case_seed/usr/style/common.css">
<link rel="stylesheet" href="/kofair_case_seed/usr/style/layout.css">
<link rel="stylesheet" href="/kofair_case_seed/usr/style/popup.css">
<link rel="stylesheet" href="/kofair_case_seed/usr/style/style.css">
<link rel="stylesheet" href="/kofair_case_seed/usr/style/mypage.css">
<!-- js -->
<script src="/kofair_case_seed/script/lib/jquery-3.5.0.js"></script>
<script src="/kofair_case_seed/usr/scripts/common.js"></script>
<script src="/kofair_case_seed/usr/scripts/layout.js"></script>
<script src="/kofair_case_seed/usr/scripts/popup.js"></script>
<script src="/kofair_case_seed/usr/scripts/ui.js"></script>
<script src="/kofair_case_seed/usr/scripts/request.js"></script>
<style>
.tab_contents {
min-height: 290px;
margin: 0 0 80px 0;
}
</style>
<script type="text/javascript">
function goList(type){
if(type == 'app'){
location.href = "/web/user/mypage/case/01/169/myMediationList.do?command=app&page=1";
}else if(type == 'temp'){
location.href = "/web/user/mypage/case/01/169/myMediationList.do?command=temp&page=1";
}
}
function mediationPop(){
window.open('/web/user/mypage/case/01/169/mediationPop.do', 'mediationPop', 'width=710, height=350')
}
</script>
<div class="sub_content apl_status_content">
<!-- page_location -->
<ul class="page_location">
<li><i class="icon home"></i></li>
<li>마이페이지</li>
<li>이전사건조회</li>
</ul>
<!-- //page_location -->
<h3 class="sub_con_tit">이전사건조회</h3>
<ul class="tabs tab_02 blue_fill mt40 mb40">
</ul>
<div class="tab_contents active">
<div class="table_top">
<p class="list_total_number">전체 <span class="color_blue"><c:out value='${pageMaker.totalCount}'/></span>건 (<span class="color_blue">1</span>/1페이지)</p>
<button type="button" class="btn btn_text btn_35 orange_border" onclick="mediationPop();">사건조회</button>
</div>
<div class="table_type_cols">
<table>
<colgroup>
<col style="width:92px;">
<col style="width:18%;">
<col style="width:18%;">
<col style="width:18%;">
<col style="width:15%;">
<col style="width:15%;">
<col style="width:20%;">
</colgroup>
<thead>
<tr>
<th>상태</th>
<th>문서 등록번호</th>
<th>신청인</th>
<th>피신청인</th>
<th>사건번호</th>
<th>담당자</th>
<th>신청일</th>
</tr>
</thead>
<tbody>
<!--
<tr>
<td class="table_number">접수</td>
<td class="td_title"><a href="#none" class="color_333"><span class="pc_hide">문서 등록번호 : </span> 20240819-028</a></td>
<td class="td_hide">홍길동</td>
<td class="td_hide">홍길동, 정길동, 김길동, 정길동, 김길동</td>
<td class="td_case_number"><i class="icon hide td_icon td_case_number"></i>202408-145</td>
<td class="td_writer"><i class="icon hide td_icon td_writer"></i>김담당</td>
<td class="td_hide">2024-08-20</td>
</tr>
-->
<c:if test="${not empty myPageList}">
<c:forEach items="${myPageList}" var="list" varStatus="status">
<tr>
<td class="table_number">${list.STATE}</td>
<td class="td_title"><a href="/web/user/mypage/case/01/169/myMediationDetail.do?mediType=${list.CASE_GUBUN}&rceptNo=${list.RCEPT_NO}&fileGubun=4801000000&viewPoint=past" class="color_333"><span class="pc_hide">문서 등록번호 : </span> ${list.RCEPT_NO }</a></td>
<td class="td_hide">${list.APPLCNT_NM}</td>
<td class="td_hide">${list.RESPONDENT_CEO } 외${list.RES_CNT-1 }명</td>
<td class="td_case_number"><i class="icon hide td_icon td_case_number"></i>${list.CASE_NO}</td>
<td class="td_writer"><i class="icon hide td_icon td_writer"></i>${list.EXAMINER_ASSIGN_NAME}</td>
<td class="td_hide">${list.REG_DT}</td>
</tr>
</c:forEach>
</c:if>
<c:if test="${empty myPageList}">
<tr>
<td colspan="7" class="table_number">등록된 데이터가 없습니다.</td>
</tr>
</c:if>
</tbody>
</table>
</div>
<p class="cf_text">※ 사건접수 완료 후 진행상황은 홈페이지 메뉴 분쟁조정 사건조회에서 조회가 가능합니다.</p>
</div>
</div>

View File

@ -335,7 +335,7 @@ function fn_gwGo(fileKey){
<input type="hidden" name="limitCount" id="limitCount" value="1"/>
<input type="hidden" name="deleteYN" value="N" />
<input type="hidden" name="compSeq" value="1000" />
<input type="hidden" name="loginId" value="test04" />
<input type="hidden" name="loginId" value="${param.loginId}" />
<input type="hidden" name="type" id="type" value="" />
<div class="temp-file-area">

View File

@ -3347,10 +3347,10 @@ function atendReqPopOpen(caseNo){
window.open(popUrl, "", popOption);
}
function fileFirstPopOpen(p_caseNo, p_rceptNo, p_fileFuncType, p_approKey, fileGubun){
function fileFirstPopOpen(p_caseNo, p_rceptNo, p_gwId, p_fileFuncType, p_approKey, fileGubun){
//alert('작업중')
//return;
var popUrl = "/gtm/case/trublprocessmng/fileAtchPop/jsp/Page.do?caseNo="+p_caseNo+ "&rceptNo=" + p_rceptNo +"&fileFuncType="+p_fileFuncType+"&approKey="+p_approKey+"&fileGubun="+fileGubun;
var popUrl = "/gtm/case/trublprocessmng/fileAtchPop/jsp/Page.do?caseNo="+p_caseNo+ "&rceptNo=" + p_rceptNo + "&loginId=" + p_gwId + "&fileFuncType="+p_fileFuncType+"&approKey="+p_approKey+"&fileGubun="+fileGubun;
var popOption = "width=1024, height=750, resizable=no, scrollbars=no, status=no;";
window.open(popUrl, "", popOption);
}
@ -3772,17 +3772,17 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
if (jobID=='1-1'||jobID=='2-1'
||jobID=='3-1'||jobID=='4-1'
||jobID=='5-1'||jobID=='6-1'){
fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(),'x-1',r.data2.docId, '4840000000');
fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(), r.gwId, 'x-1',r.data2.docId, '4840000000');
}else if(jobID=='1-11'||jobID=='2-11'
||jobID=='3-11'||jobID=='4-11'
||jobID=='5-11'||jobID=='6-11'){
fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(),'x-2',r.data2.docId, '4841000000');
fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(), r.gwId, 'x-2',r.data2.docId, '4841000000');
}else if(jobID=='1-12'||jobID=='2-12'
||jobID=='3-12'||jobID=='4-12'
||jobID=='5-12'||jobID=='6-12'){
fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(),'x-3',r.data2.docId, '4842000000');
fileFirstPopOpen($("#caseNo").val(), $("#rceptNo").val(), r.gwId, 'x-3',r.data2.docId, '4842000000');
}else{
var f = document.nanumViewFrm;