diff --git a/src/main/java/kcc/let/main/web/EgovMainController.java b/src/main/java/kcc/let/main/web/EgovMainController.java index bf12c845..d310ad02 100644 --- a/src/main/java/kcc/let/main/web/EgovMainController.java +++ b/src/main/java/kcc/let/main/web/EgovMainController.java @@ -66,6 +66,7 @@ import seed.com.gtm.join.MemberJoinService; import seed.com.gtm.service.BaseService; import seed.com.gtm.team.TeamBoardService; import seed.com.gtm.util.JSPUtil; +import seed.utils.SeedUtils; /** * 템플릿 메인 페이지 컨트롤러 클래스(Sample 소스) @@ -176,10 +177,21 @@ public class EgovMainController { //진행 중 사건목록 model.addAttribute("caseList", caseList(request, session)); - //진행 중 사건목록 + //분쟁조정 게시판 model.addAttribute("boardList", boardList(session)); + //분쟁조정협의회 + model.addAttribute("trublcfrncmngList", trublcfrncmngList(request, session)); + EgovMap params = JSPUtil.makeRequestParams(request, session, true); + + String searchMa = SeedUtils.setReplaceNull(request.getParameter("searchMa")) ; + if(searchMa.equals("")){ + searchMa = "N"; + } + params.put("searchMa", searchMa); + + model.addAttribute("params", params); return "main/EgovMainView"; } @@ -700,6 +712,7 @@ public class EgovMainController { ){ EgovMap params; params = JSPUtil.makeRequestParams(request, session, true); + params.put("pageStart", 0); params.put("perPageNum", 5); params.put("searchMa", "N"); @@ -722,7 +735,7 @@ public class EgovMainController { return JSPUtil.fixNull(bservice.list(params)); } - //진행 중 사건목록 + //분쟁조정 게시판 private List boardList( HttpSession session ){ @@ -747,7 +760,7 @@ public class EgovMainController { params = JSPUtil.makeRequestParams(request, session, true); params.put("pageStart", 0); params.put("perPageNum", 5); - params.put("sql", "trublcfrncmngTrublcfrncmngPagingList"); + params.put("sql", "trublcfrncmngTrublcfrncmngPagingListMain"); return JSPUtil.fixNull(bservice.list(params)); } diff --git a/src/main/java/seed/com/user/mediation/WebMediationController.java b/src/main/java/seed/com/user/mediation/WebMediationController.java index ebaf9668..8aadb2d8 100644 --- a/src/main/java/seed/com/user/mediation/WebMediationController.java +++ b/src/main/java/seed/com/user/mediation/WebMediationController.java @@ -4,6 +4,7 @@ import java.io.BufferedInputStream; import java.io.FileInputStream; import java.io.IOException; import java.io.OutputStream; +import java.lang.reflect.Field; import java.text.ParseException; import java.util.ArrayList; import java.util.Date; diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/join/join_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/join/join_sql.xml index e8ca4e20..f345eb3e 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/join/join_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/join/join_sql.xml @@ -81,7 +81,7 @@ #{joinClass}, #{editorParam_joinCont}, #{joinPh}, - '', + #{gwId}, '', '', '', 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 42bcbc4e..8082d8c2 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 @@ -1258,6 +1258,7 @@ THEN TO_CHAR((SELECT MEMBER_NAME FROM T_MEMBER WHERE MEMBER_ID = CF.REG_ID)) ELSE REG_ID END AS FILE_OWNER + , FILE_ADD1 FROM C_CASEFILE CF WHERE FILE_NO = #{rceptNo} AND DEL_GUBUN = 'N' 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 fdd8fc74..860694cc 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 @@ -1517,4 +1517,193 @@ AND cc.CFRNC_NO = #{cfrncNo} AND cd.MEDIATION_SMALL = '0616000000' + + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml index 9a702a76..3ece08cb 100644 --- a/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml +++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublprocessmng/trublprocessmng_sql.xml @@ -1129,6 +1129,7 @@ ELSE REG_ID END AS FILE_OWNER, FILE_MEMO + , FILE_ADD1 FROM C_CASEFILE CF WHERE FILE_NO = #{rceptNo} AND DEL_GUBUN = 'N' @@ -2300,4 +2301,14 @@ WHERE RCEPT_NO = #{rceptNo} ORDER BY CASE_AUTH_ID + + + + UPDATE C_CASEFILE + SET + FILE_ADD1 = #{docOpen} + WHERE + SEQ_NO = #{seqNo} + + \ No newline at end of file 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 31bec23f..f2c71adf 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 @@ -341,25 +341,36 @@
신청인 제출자료
-
+
-
+
+ + + + + + + +
피신청인 제출자료
-
+
-
+
조사관 추가자료
diff --git a/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp b/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp index 2bead866..c3656765 100644 --- a/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp +++ b/src/main/webapp/WEB-INF/jsp/main/EgovMainView.jsp @@ -18,6 +18,7 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ page import="java.util.Date" %> +<%@page import="seed.utils.SeedConstants"%> @@ -40,118 +41,142 @@
- -
-
-

최근 접수사건 (미배정)

- +

진행 중 사건목록 (오래된 순)

- +
- + 분쟁사건 처리관리 바로가기 - + 나의사건 통계 바로가기 - + 분쟁조정협의회 바로가기 - + 종료사건 조회 바로가기 @@ -159,101 +184,66 @@

분쟁조정 게시판

- +

분쟁조정협의회 (예정)

- +
-
- - -
-
- + + + + + + + + + + + + + + + - - diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp index e84f4bbb..ca857a3e 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/join/write.jsp @@ -63,6 +63,12 @@
+
+

* G/W아이디(기안문연동에 필요)

+
+ +
+

* 생년월일

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 30dffb24..67c2d32c 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 @@ -4227,8 +4227,31 @@ function clipCallTmp(){ f.submit(); f.target = "_self"; } + +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); + var param = jQuery('#docOpenForm').serialize(); + url = "/gtm/case/trublprocessmng/ajax/CaseDocOpen.do"; + XHR2(url, param, function(r){ + + }); + alert("완료 되었습니다"); + } else { + return false; + } +} +
+ + +
@@ -5572,6 +5595,12 @@ function clipCallTmp(){ [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) +
+ checked> + + checked> + +
@@ -5630,6 +5659,10 @@ function clipCallTmp(){ [${file.fileNo}-${file.seqNo}] ${file.fileName} (${file.regDt}, ${file.fileOwner}) +
+ checked> + checked> +