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 c3a8043b..086e3149 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
@@ -878,6 +878,8 @@
A.CASE_NO,
CASE_GUBUN,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_GUBUN) AS CASE_GUBUN_NM,
+ A.OFFICE_GUBUN,
+ (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = A.OFFICE_GUBUN AND ROWNUM = 1) AS OFFICE_GUBUN_NM,
STATE_PRO,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = STATE_PRO) AS STATE_PRO_NM,
DECODE((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = STATE_PRO), '접수', '통지', '통지', '조사', '조사', '보고', '보고', '종료통지', '종료통지', '-') AS STATE_PRO_NEXT,
@@ -901,6 +903,9 @@
WHERE
TRANSFER_CHECK = 'N'
AND A.CASE_NO = D.CASE_NO
+
+ AND A.OFFICE_GUBUN = #{officeGubun2}
+
ORDER BY A.CASE_NO DESC
@@ -910,6 +915,8 @@
A.CASE_NO,
CASE_GUBUN,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_GUBUN) AS CASE_GUBUN_NM,
+ A.OFFICE_GUBUN,
+ (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = A.OFFICE_GUBUN AND ROWNUM = 1) AS OFFICE_GUBUN_NM,
STATE_PRO,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = STATE_PRO) AS STATE_PRO_NM,
DECODE((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = STATE_PRO), '접수', '통지', '통지', '조사', '조사', '보고', '보고', '종료통지', '종료통지', '-') AS STATE_PRO_NEXT,
@@ -935,6 +942,9 @@
AND A.CASE_NO = B.CASE_NO
+
+ AND A.OFFICE_GUBUN = #{officeGubun2}
+
ORDER BY CASE_NO DESC
@@ -944,6 +954,8 @@
A.CASE_NO,
CASE_GUBUN,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = CASE_GUBUN) AS CASE_GUBUN_NM,
+ A.OFFICE_GUBUN,
+ (SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = A.OFFICE_GUBUN AND ROWNUM = 1) AS OFFICE_GUBUN_NM,
STATE_PRO,
(SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = STATE_PRO) AS STATE_PRO_NM,
DECODE((SELECT CODE_NAME FROM C_CODE WHERE CODE_IDXS = STATE_PRO), '접수', '통지', '통지', '조사', '조사', '보고', '보고', '종료통지', '종료통지', '-') AS STATE_PRO_NEXT,
@@ -964,6 +976,9 @@
WHERE
TRANSFER_CHECK = 'N'
AND A.CASE_NO = D.CASE_NO
+
+ AND A.OFFICE_GUBUN = #{officeGubun2}
+
ORDER BY A.CASE_NO DESC
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp
index 5eb61e46..d4c1468a 100644
--- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeEdit.jsp
@@ -49,6 +49,7 @@ $(document).ready(function(){
loadFileData10();
loadCfrncexpensData();
nanumHisDelSel();
+ officeGubunCombo(); //사무실구분
}, 0);
$("#caseGubun").change(function(){
@@ -57,6 +58,10 @@ $(document).ready(function(){
fileList();
});
//협의회관리 협의회일련번호 미리 따놓기
+
+ $("#officeGubun2").change(function(){
+ loadSimData();
+ });
});
var conferenceNames ="";
@@ -153,6 +158,7 @@ function loadSimData(){
html += '
'+v.mediationBig+' | ';
html += ''+v.mediationSmall+' | ';
html += ''+v.caseExaminer+' | ';
+ html += ''+v.officeGubunNm+' | ';
html += '';
list.push(v.caseNo);
@@ -165,7 +171,7 @@ function loadSimData(){
}else{
html += '';
- html += '| 선택된 심의안건이 없습니다. | ';
+ html += '선택된 심의안건이 없습니다. | ';
html += '
';
$("#sim").html(html);
}
@@ -825,6 +831,20 @@ function caseGubunCombo(){
});
}
+//사무실구분
+function officeGubunCombo(){
+ var url = "";
+ $("#type").val("L");
+ var param = jQuery('#frm').serialize();
+ url = "/gtm/case/common/ajax/Institution.do";
+ XHR2(url, param, function(r){
+ $("#officeGubun2").append('');
+ var objList = $("#officeGubun2");
+ var sel = "";
+ ajaxCombo(r.data, objList, sel);
+ });
+}
+
//회의명 생성
/* function caseConferenceNames(){
var url = "";
@@ -2142,7 +2162,16 @@ function nanumCallGeneral(p_jobID, nanumSubject){
- | 심의안건 상정 |
+
+
+
+
+ 심의안건 상정
+
+
+
+ |
| 순번 |
@@ -2152,16 +2181,19 @@ function nanumCallGeneral(p_jobID, nanumSubject){
조정결과(대분류) |
조정결과(소분류) |
담당자 |
+ 담당 |
- | 선택된 심의안건이 없습니다. |
+
+ 선택된 심의안건이 없습니다.
+ |
- |
+ |
|
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp
index d47c382b..0389f36f 100644
--- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/endNticeView.jsp
@@ -51,6 +51,7 @@ $(document).ready(function(){
loadFileData9();
loadFileData10();
loadCfrncexpensData();
+ officeGubunCombo(); //사무실구분
}, 0);
$("#caseGubun").change(function(){
@@ -58,6 +59,10 @@ $(document).ready(function(){
fileList();
});
+ $("#officeGubun2").change(function(){
+ loadSimData();
+ });
+
//협의회관리 협의회일련번호 미리 따놓기
});
@@ -143,6 +148,7 @@ function loadSimData(){
html += ''+v.mediationBig+' | ';
html += ''+v.mediationSmall+' | ';
html += ''+v.caseExaminer+' | ';
+ html += ''+v.officeGubunNm+' | ';
html += '';
list.push(v.caseNo);
@@ -154,7 +160,7 @@ function loadSimData(){
$("#arrListsim").val(list);
}else{
html += '';
- html += '| 선택된 심의안건이 없습니다. | ';
+ html += '선택된 심의안건이 없습니다. | ';
html += '
';
$("#sim").html(html);
}
@@ -764,6 +770,20 @@ function caseGubunCombo(){
});
}
+//사무실구분
+function officeGubunCombo(){
+ var url = "";
+ $("#type").val("L");
+ var param = jQuery('#frm').serialize();
+ url = "/gtm/case/common/ajax/Institution.do";
+ XHR2(url, param, function(r){
+ $("#officeGubun2").append('');
+ var objList = $("#officeGubun2");
+ var sel = "";
+ ajaxCombo(r.data, objList, sel);
+ });
+}
+
//회의안건 등록
function regData(){
//수정된 파일 메모 저장
@@ -1617,7 +1637,18 @@ function nanumCallGeneral(p_jobID, nanumSubject){
- | 심의안건 상정 |
+
+
+
+
+
+ 심의안건 상정
+
+
+
+
+ |
| 순번 |
@@ -1627,16 +1658,17 @@ function nanumCallGeneral(p_jobID, nanumSubject){
조정결과(대분류) |
조정결과(소분류) |
담당자 |
+ 담당 |
- | 선택된 심의안건이 없습니다. |
+ 선택된 심의안건이 없습니다. |
- |
+ |
|
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp
index fea1273f..29b25831 100644
--- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp
@@ -41,12 +41,17 @@ $(document).ready(function(){
loadJosuData();
loadChamData();
loadFileData();
+ officeGubunCombo(); //사무실구분
//loadFileData2();
//loadFileData3();
//loadFileData4();
//loadCfrncexpensData();
//loadFileData11();
}, 0);
+
+ $("#officeGubun2").change(function(){
+ loadSimData();
+ });
$("#simAllcheck").click(function(){
var checkArr = $("input:checkbox[name=simCheck]");
@@ -208,6 +213,7 @@ function loadSimData(){
html += ''+v.mediationBig+' | ';
html += ''+v.mediationSmall+' | ';
html += ''+v.caseExaminer+' | ';
+ html += ''+v.officeGubunNm+' | ';
html += ' | ';
html += '';
list.push(v.caseNo);
@@ -218,7 +224,7 @@ function loadSimData(){
$("#arrListsim").val(list);
}else{
html += '';
- html += '| 선택된 심의안건이 없습니다. | ';
+ html += '선택된 심의안건이 없습니다. | ';
html += '
';
$("#sim").html(html);
}
@@ -791,7 +797,7 @@ function setData(parentId){
html += '';
}else if(parentId == 'sim'){
html += '';
- html += '| 선택된 심의안건이 없습니다. | ';
+ html += '선택된 심의안건이 없습니다. | ';
html += '
';
}else if(parentId == 'josu'){
html += '';
@@ -834,6 +840,20 @@ function caseGubunCombo(){
});
}
+//사무실구분
+function officeGubunCombo(){
+ var url = "";
+ $("#type").val("L");
+ var param = jQuery('#frm').serialize();
+ url = "/gtm/case/common/ajax/Institution.do";
+ XHR2(url, param, function(r){
+ $("#officeGubun2").append('');
+ var objList = $("#officeGubun2");
+ var sel = "";
+ ajaxCombo(r.data, objList, sel);
+ });
+}
+
//회의명 생성
/* function caseConferenceNames(){
var url = "";
@@ -3407,17 +3427,27 @@ function nanumApiView(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
-
-
-
-
-
-
+
+
+
+
+
+
+
- | 심의안건 상정 |
+
+
+
+
+ 심의안건 상정
+
+
+
+ |
|
@@ -3428,17 +3458,18 @@ function nanumApiView(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
조정결과(대분류) |
조정결과(소분류) |
담당자 |
+ 담당 |
출석요구 |
- | 선택된 심의안건이 없습니다. |
+ 선택된 심의안건이 없습니다. |
- |
+ |
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp
index 0ff51f49..c89cd08f 100644
--- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyView.jsp
@@ -43,6 +43,7 @@ $(document).ready(function(){
loadJosuData();
loadChamData();
loadFileData();
+ officeGubunCombo(); //사무실구분
//loadFileData2();
//loadFileData3();
//loadFileData4();
@@ -54,6 +55,10 @@ $(document).ready(function(){
fileList();
});
+ $("#officeGubun2").change(function(){
+ loadSimData();
+ });
+
$("#simAdd, #bogoAdd, #chamAdd, #josuAdd").click(function(){
var conferenceGubun = $("#conferenceGubun").val();
if(conferenceGubun.length == 0 && this.id == 'chamAdd'){
@@ -172,6 +177,7 @@ function loadSimData(){
html += ' | '+v.mediationBig+' | ';
html += ''+v.mediationSmall+' | ';
html += ''+v.caseExaminer+' | ';
+ html += ''+v.officeGubunNm+' | ';
html += '
';
list.push(v.caseNo);
});
@@ -179,7 +185,7 @@ function loadSimData(){
$("#arrListsim").val(list);
}else{
html += '';
- html += '| 선택된 심의안건이 없습니다. | ';
+ html += '선택된 심의안건이 없습니다. | ';
html += '
';
$("#sim").html(html);
}
@@ -574,6 +580,20 @@ function caseGubunCombo(){
});
}
+//사무실구분
+function officeGubunCombo(){
+ var url = "";
+ $("#type").val("L");
+ var param = jQuery('#frm').serialize();
+ url = "/gtm/case/common/ajax/Institution.do";
+ XHR2(url, param, function(r){
+ $("#officeGubun2").append('');
+ var objList = $("#officeGubun2");
+ var sel = "";
+ ajaxCombo(r.data, objList, sel);
+ });
+}
+
//회의자료 등록
function regData(){
//기본정보 입력
@@ -1290,7 +1310,16 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
- | 심의안건 상정 |
+
+
+
+
+ 심의안건 상정
+
+
+
+ |
| 순번 |
@@ -1300,16 +1329,17 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
조정결과(대분류) |
조정결과(소분류) |
담당자 |
+ 담당 |
- | 선택된 심의안건이 없습니다. |
+ 선택된 심의안건이 없습니다. |
- |
+ |
|
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp
index 5a9d90f7..9a2fa573 100644
--- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/reportEdit.jsp
@@ -42,6 +42,7 @@ $(document).ready(function(){
loadFileData4();
loadCfrncexpensData();
nanumHisDelSel();
+ officeGubunCombo(); //사무실구분
}, 0);
$("#caseGubun").change(function(){
@@ -50,6 +51,10 @@ $(document).ready(function(){
fileList();
});
+ $("#officeGubun2").change(function(){
+ loadSimData();
+ });
+
$("#simAdd, #bogoAdd, #chamAdd, #josuAdd").click(function(){
var conferenceGubun = $("#conferenceGubun").val();
if(conferenceGubun.length == 0 && this.id == 'chamAdd'){
@@ -177,6 +182,7 @@ function loadSimData(){
html += ' | ';
html += ' | ';
html += ''+v.caseExaminer+' | ';
+ html += ''+v.officeGubunNm+' | ';
html += ''+''+' | ';
html += '';
simlist.push(v.caseNo);
@@ -191,7 +197,7 @@ function loadSimData(){
$("#arrListsim").val(simlist);
}else{
html += '';
- html += '| 선택된 심의안건이 없습니다. | ';
+ html += '선택된 심의안건이 없습니다. | ';
html += '
';
$("#sim").html(html);
}
@@ -749,7 +755,7 @@ function setData(parentId){
html += '';
}else if(parentId == 'sim'){
html += '';
- html += '| 선택된 심의안건이 없습니다. | ';
+ html += '선택된 심의안건이 없습니다. | ';
html += '
';
}
$("#"+parentId).html(html);
@@ -789,6 +795,20 @@ function caseGubunCombo(){
});
}
+//사무실구분
+function officeGubunCombo(){
+ var url = "";
+ $("#type").val("L");
+ var param = jQuery('#frm').serialize();
+ url = "/gtm/case/common/ajax/Institution.do";
+ XHR2(url, param, function(r){
+ $("#officeGubun2").append('');
+ var objList = $("#officeGubun2");
+ var sel = "";
+ ajaxCombo(r.data, objList, sel);
+ });
+}
+
//회의명 생성
/* function caseConferenceNames(){
var url = "";
@@ -3801,11 +3821,21 @@ function nanumHisDel(){
+