diff --git a/src/main/java/seed/com/user/mediation/WebMediationController.java b/src/main/java/seed/com/user/mediation/WebMediationController.java index 4baa9ede..9a26d5ab 100644 --- a/src/main/java/seed/com/user/mediation/WebMediationController.java +++ b/src/main/java/seed/com/user/mediation/WebMediationController.java @@ -4102,12 +4102,6 @@ public class WebMediationController { service.rceUpdate(paramMap); paramMap.put("sts", "success"); - - - //신청인 뉴스레터 INSERT - service2.selectApplcnt(paramMap); - - }catch (Exception e) { log.error("CHECK ERROR:",e); @@ -4389,7 +4383,7 @@ public class WebMediationController { session.setAttribute("isGubun", "app"); session.setAttribute("isSeq", applCnt.get(i).get("SEQ_NO")); status = true; - authType = "APP"; + authType = "app"; } } } @@ -4401,7 +4395,7 @@ public class WebMediationController { session.setAttribute("isGubun", "res"); session.setAttribute("isSeq", respondentCnt.get(i).get("SEQ_NO")); status = true; - authType = "RES"; + authType = "res"; } } } diff --git a/src/main/java/seed/com/user/mypage/WebMyPageController.java b/src/main/java/seed/com/user/mypage/WebMyPageController.java index ba75b5ad..dc06c45b 100644 --- a/src/main/java/seed/com/user/mypage/WebMyPageController.java +++ b/src/main/java/seed/com/user/mypage/WebMyPageController.java @@ -1431,7 +1431,7 @@ private Logger log = Logger.getLogger(this.getClass()); @PathVariable(value="siteIdx") String siteIdx, @PathVariable(value="siteMenuIdx") Integer siteMenuIdx){ - if(SeedUtils.setReplaceNull(session.getAttribute("certName")).equals("")){ + /*if(SeedUtils.setReplaceNull(session.getAttribute("certName")).equals("")){ map.put("siteIdx", "case"); map.put("url", "/web/user/mypage/case/01/168/myCheck.do"); map.put("message", "common.message.my.check"); @@ -1439,13 +1439,17 @@ private Logger log = Logger.getLogger(this.getClass()); map.put("append", ""); map.put("self", ""); + return new ModelAndView("/_common/jsp/umessage"); + }*/ + + if(!FairnetUtils.ciCheck(map, session)) { return new ModelAndView("/_common/jsp/umessage"); } service.delReq(paramMap); map.put("siteIdx", "case"); - map.put("url", "/user/mypage/case/01/169/myMediationList.do"); + map.put("url", "/web/user/mypage/case/01/169/myMediationList.do"); map.put("message", "user.message.mod"); map.put("opener", ""); map.put("append", ""); 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 a0947dfe..a343134b 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 @@ -139,7 +139,8 @@ CASE_REASON3, (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CR.CONSIGNMENT_GUBUN) AS CONSIGNMENT_GUBUN_NAME, CONSIGNMENT_GUBUN, - DEL_GUBUN + DEL_GUBUN, + EXAMINER_ASSIGN FROM C_RCEPTMST CR WHERE RCEPT_NO = #{rceptNo} diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/checkMediationStep01.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/checkMediationStep01.jsp index f362be4a..08155875 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/checkMediationStep01.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/checkMediationStep01.jsp @@ -33,9 +33,6 @@ - -
- diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/checkMediationStep03.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/checkMediationStep03.jsp index df124804..ab0b2294 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/checkMediationStep03.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/checkMediationStep03.jsp @@ -261,6 +261,26 @@
+ +
+ 피신청인 공개자료 +
+
+ +
+
신청인 제출자료
@@ -307,7 +327,6 @@
조정안 수락 여부 제출
-
@@ -319,14 +338,24 @@
-
@@ -400,7 +429,6 @@
조정안 수락 여부 제출
-
@@ -412,14 +440,24 @@
-
diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp index 074534c1..bca9119b 100644 --- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp +++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/myPage/myMediationView.jsp @@ -844,7 +844,7 @@
- + 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 774f6e84..43ff39ba 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 @@ -4820,7 +4820,6 @@ function docOpen(obj) { var value = obj.value; var seqNo = $(obj).parent().parent().find('input[class^="fileSeq_"]').val(); - alert(seqNo); if(confirm("공개여부를 변경 하시겠습니까?")){ $("#seqNo").val(seqNo); $("#docOpen").val(value);