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

# WARNING: head commit changed in the meantime

Browse Source 
Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
2024-12-27 12:51 기안문 수정 사항 적용
This commit is contained in:
myname 2024-12-27 12:52:05 +09:00
parent 3826e7c8e8
commit 06801bbb57
4 changed files with 956 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

880
src/main/java/seed/com/gtm/base/GwBaseController.java
View File

File diff suppressed because one or more lines are too long

16
src/main/resources/egovframework/sqlmap/config/mappers/common/common_sql.xml
View File

@ -542,10 +542,10 @@
<!-- 기안문 불러오기 -->
<select id="commonnanumHisDelSel" parameterType="egovMap" resultType="egovMap">
SELECT
(SELECT C.CODE_NAME FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO) AS DOC_NAME,
(SELECT C.CODE_DC FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO) AS ORGIN_NAME,
(SELECT C.CODE_IDX5 FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO) AS DOC_NO,
(SELECT C.CODE_ORDER FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO) AS CODE_ORDER,
(SELECT C.CODE_NAME FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO AND rownum=1) AS DOC_NAME,
(SELECT C.CODE_DC FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO AND rownum=1) AS ORGIN_NAME,
(SELECT C.CODE_IDX5 FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO AND rownum=1) AS DOC_NO,
(SELECT C.CODE_ORDER FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO AND rownum=1) AS CODE_ORDER,
A.CASE_NO,
A.CODE_NO
FROM
@ -569,10 +569,10 @@
A.RESULT,
A.REG_DT,
(SELECT C.CODE_NAME FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO) AS DOC_NAME,
(SELECT C.CODE_DC FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO) AS ORGIN_NAME,
(SELECT C.CODE_IDX5 FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO) AS DOC_NO,
(SELECT C.CODE_ORDER FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO) AS CODE_ORDER
(SELECT C.CODE_NAME FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO AND rownum=1) AS DOC_NAME,
(SELECT C.CODE_DC FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO AND rownum=1) AS ORGIN_NAME,
(SELECT C.CODE_IDX5 FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO AND rownum=1) AS DOC_NO,
(SELECT C.CODE_ORDER FROM C_CODE C WHERE C.CODE_IDXS = A.CODE_NO AND rownum=1) AS CODE_ORDER
FROM
C_SANCTNHISTORY A

62
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublcfrncmng/redyEdit.jsp
View File

@ -2009,6 +2009,7 @@ function nanumCall(no, nanumSubject){
//문서 기안작성 및 결제상신
function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15){
//alert(jobID);
if(jobID != '')$("#jobID").val(jobID);
if(codeNo != '')$("#codeNo").val(codeNo);
if(nanumSubject != '')$("#nanumSubject").val(encodeURIComponent(nanumSubject));
@ -2079,12 +2080,71 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
if (!r.gwId){
alert('G/W 연동 기안문 작성을 위해서는 G/W아이디가 필요합니다.\n담당자 관리 개인정보 수정 화면에서 G/W아이디를 넣어주세요! ');
}else {
if (jobID=='1-120' //회의안건상정
){
$("#nanumViewFrm #formIdView").val('340'); //공정 관인
}else if (jobID=='2-120' //회의안건상정
){
$("#nanumViewFrm #formIdView").val('341'); //가맹 관인
}else if (jobID=='3-120' //회의안건상정
){
$("#nanumViewFrm #formIdView").val('342'); //가맹 관인
}else if (jobID=='4-120' //회의안건상정
){
$("#nanumViewFrm #formIdView").val('343'); //가맹 관인
}else if (jobID=='5-120' //회의안건상정
){
$("#nanumViewFrm #formIdView").val('344'); //가맹 관인
}else if (jobID=='6-120' //회의안건상정
){
$("#nanumViewFrm #formIdView").val('345'); //가맹 관인
}else{//관인이 없는 경우
if (jobID.indexOf('1-')>-1){
$("#nanumViewFrm #formIdView").val('389');
}else if (jobID.indexOf('2-')>-1){
$("#nanumViewFrm #formIdView").val('390');
}else if (jobID.indexOf('3-')>-1){
$("#nanumViewFrm #formIdView").val('391');
}else if (jobID.indexOf('4-')>-1){
$("#nanumViewFrm #formIdView").val('392');
}else if (jobID.indexOf('5-')>-1){
$("#nanumViewFrm #formIdView").val('393');
}else if (jobID.indexOf('6-')>-1){
$("#nanumViewFrm #formIdView").val('394');
}else{
$("#nanumViewFrm #formIdView").val('336');
}
}
//$("#nanumViewFrm #formIdView").val('336');
$("#nanumViewFrm #compSeqView").val('1000');
$("#nanumViewFrm #approKeyView").val(r.data2.docId);
//$("#approKeyView").val('H20241120063050');
//$("#docIdImsi").val(r.data.docId);
$("#nanumViewFrm #formIdView").val('336');
$("#nanumViewFrm #modView").val('w'); //작성 고정
//$("#approKeyImsi").val(r.data2.docId); //외부시스템 연동키 외부시스템 연동키

37
src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
View File

@ -3573,6 +3573,10 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
if(r.data.sanctnhistoryCnt == 0){
if(confirm("등록된 결재정보가 없습니다. 등록하시겠습니까?")){
var url = "";
$('#applcntNoStr').val($('#applcntNo').val());
$('#respondentNoStr').val($('#respondentNo').val());
$("#typeNanum").val("S");
$("#nanumCaseGubun").val('${masterData.caseGubun}');
var param = jQuery('#nanumFrm').serialize();
@ -3723,10 +3727,33 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
}else{ //관인이 없는 경우
//alert("336");
$("#nanumViewFrm #formIdView").val('336');
$("#nanumViewFrm #subjectStrView").val(r.title); //그룹웨어로그인아이디
if (jobID.indexOf('1-')>-1){
$("#nanumViewFrm #formIdView").val('389');
}else if (jobID.indexOf('2-')>-1){
$("#nanumViewFrm #formIdView").val('390');
}else if (jobID.indexOf('3-')>-1){
$("#nanumViewFrm #formIdView").val('391');
}else if (jobID.indexOf('4-')>-1){
$("#nanumViewFrm #formIdView").val('392');
}else if (jobID.indexOf('5-')>-1){
$("#nanumViewFrm #formIdView").val('393');
}else if (jobID.indexOf('6-')>-1){
$("#nanumViewFrm #formIdView").val('394');
}else{
$("#nanumViewFrm #formIdView").val('336');
}
//$("#nanumViewFrm #subjectStrView").val(r.title); //연동기안 제목을 넘겨준다.(no 관인)
}
$("#nanumViewFrm #subjectStrView").val(r.title); //연동기안 제목을 넘겨준다.(no 관인 또는 관인)
$("#nanumViewFrm #modView").val('w'); //작성 고정
@ -3804,7 +3831,7 @@ function nanumCallGeneral(p_jobID, nanumSubject){
//$("#docIdImsi").val(r.data.docId);
$("#nanumViewFrm #formIdView").val(r.data0.docId);
alert(r.data0.docId);
//alert(r.data0.docId);
//$("#nanumViewFrm #modView").val('w'); //작성 고정
//$("#approKeyImsi").val(r.data2.docId); //외부시스템 연동키 외부시스템 연동키
@ -9700,6 +9727,8 @@ function docOpen(obj) {
<input type="hidden" id="subjectStr" name="subjectStr" value=""/>
<input type="hidden" id="contentsStr" name="contentsStr" value=""/>
<input type="hidden" id="applcntNoStr" name="applcntNoStr" />
<input type="hidden" id="respondentNoStr" name="respondentNoStr" />
</form>
<!-- 비즈박스 그룹웨어 연동 폼 -->