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

Merge branch 'tolag3'

Browse Source 
Conflicts:
	src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java
This commit is contained in:
LJH 2022-12-06 14:10:22 +09:00
commit 7b90490b38
12 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java
View File

@ -150,12 +150,12 @@ public class AdjReqMgrPastController {
model.addAttribute("adrVO", adjReqMgrPastVO);
}
model.addAttribute("prtclSize", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO).size());
// 조정부 / 조사관 정보
model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqMgrPastVO));
model.addAttribute("reqPerTotCnt", reqPerTotCnt);
if(StringUtil.isNotEmpty(adjReqMgrPastVO.getAdrSeq())) {
model.addAttribute("prtclSize", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO).size());
// 조정부 / 조사관 정보
model.addAttribute("memAss", adjReqMgrPastService.selectMemAss(adjReqMgrPastVO));
model.addAttribute("reqPerTotCnt", reqPerTotCnt);
}
return "kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist";
}

2
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp
View File

@ -223,7 +223,7 @@
}
function sendDlvInfoUrlPop() {
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '800', '600', "dlvInfoUrlPop", $('#dlvpop'));
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '1300', '600', "dlvInfoUrlPop", $('#dlvpop'));
}

2
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp
View File

@ -171,7 +171,7 @@ $(document).ready(function() {
}
function sendDlvInfoUrlPop() {
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '800', '600', "dlvInfoUrlPop", $('#dlvpop'));
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '1300', '600', "dlvInfoUrlPop", $('#dlvpop'));
}
function sendDlvInfo() {

2
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp
View File

@ -313,7 +313,7 @@
}
function sendDlvInfoUrlPop() {
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '800', '600', "dlvInfoUrlPop", $('#dlvpop'));
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '1300', '600', "dlvInfoUrlPop", $('#dlvpop'));
}

2
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp
View File

@ -217,7 +217,7 @@
}
function sendDlvInfoUrlPop() {
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '800', '600', "dlvInfoUrlPop", $('#dlvpop'));
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '1300', '600', "dlvInfoUrlPop", $('#dlvpop'));
}
function sendDlvInfo() {

31
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.jsp
View File

@ -41,7 +41,12 @@
opener.parent.document.getElementById("dlvrySelect").innerHTML = regNm + "/" + dlvrySeq;
opener.parent.document.dlvpop.dlvrySeq.value = dlvrySeq;
window.close();
}
}
//송달정보 조회
function fnPostChk(regNm){
commonPopWindowopenForm("/web/kccadr/kccadrCom/postCheckLink.do?sid=" + regNm, "1200", "1000", "postChkPop", $('#listForm'));
}
</script>
</head>
@ -65,13 +70,14 @@
<table>
<caption>송달정보 목록 : 송달일자, 조정번호, 구분, 당사자, 등기번호, 송달서류, 발송일, 송달일</caption>
<colgroup>
<col style="width: 10%;">
<col style="width: 18%;">
<col style="width: 10%;">
<col style="width: 10%;">
<col style="width: 18%;">
<col style="width: 10%;">
<col style="width: 8%;">
<col style="width: 16%;">
<col style="width: 8%;">
<col style="width: 12%;">
<col style="width: 18%;">
<col style="width: 10%;">
<col style="width: 8%;">
<col style="width: 8%;">
<col style="width: 12%;">
</colgroup>
<thead>
@ -96,6 +102,9 @@
송달완료일자
<!-- <button class="sort btn_sort" id="sort_recDeDay">▲</button> -->
</th>
<th>
송달조회
</th>
</tr>
</thead>
<tbody>
@ -127,7 +136,9 @@
<td>
<c:out value="${item.recDeDay}" />
</td>
<td>
<button type="button" class="btnType03" onclick="fnPostChk('<c:out value="${item.regNm}" />');">송달조회</button>
</td>
</tr>
</c:forEach>
<c:if test="${empty list}">
@ -140,6 +151,10 @@
</tbody>
</table>
</div>
<!-- <div class="btn_wrap btn_layout02">
<button type="button" class="btnType03" onclick="fnPostChk();">송달조회</button>
</div> -->
<!-- //list -->
<!-- 페이지 네비게이션 시작 -->
<c:if test="${!empty list}">

2
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp
View File

@ -307,7 +307,7 @@
}
function sendDlvInfoUrlPop() {
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '800', '600', "dlvInfoUrlPop", $('#dlvpop'));
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '900', '600', "dlvInfoUrlPop", $('#dlvpop'));
}
function sendDlvInfo() {

4
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp
View File

@ -62,8 +62,8 @@
oz.sendToActionScript("pdf.fontembedding", "true");
oz.sendToActionScript("pdf.fontembedding_subset", "true");
oz.sendToActionScript("print.externalmodule","oz.viewer.export.OZAppletPrintBarcode_MarkAny");
oz.sendToActionScript("connection.extraparam","PropertiesFilePath=%OZCONF%/ozmarkany.properties,UserPassword=a,PdfCreator=MarkAny");
// oz.sendToActionScript("print.externalmodule","oz.viewer.export.OZAppletPrintBarcode_MarkAny");
// oz.sendToActionScript("connection.extraparam","PropertiesFilePath=%OZCONF%/ozmarkany.properties,UserPassword=a,PdfCreator=MarkAny");
return true;
}

2
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp
View File

@ -287,7 +287,7 @@
}
function sendDlvInfoUrlPop() {
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '800', '600', "dlvInfoUrlPop", $('#dlvpop'));
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '1300', '600', "dlvInfoUrlPop", $('#dlvpop'));
}
function sendDlvInfo() {

2
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp
View File

@ -288,7 +288,7 @@
}
function sendDlvInfoUrlPop() {
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '800', '600', "dlvInfoUrlPop", $('#dlvpop'));
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '1300', '600', "dlvInfoUrlPop", $('#dlvpop'));
}
function sendDlvInfo() {

2
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp
View File

@ -155,7 +155,7 @@
}
function sendDlvInfoUrlPop() {
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '800', '600', "dlvInfoUrlPop", $('#dlvpop'));
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '1300', '600', "dlvInfoUrlPop", $('#dlvpop'));
}

2
src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp
View File

@ -229,7 +229,7 @@
}
function sendDlvInfoUrlPop() {
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '800', '600', "dlvInfoUrlPop", $('#dlvpop'));
commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoUrlPop.do", '1300', '600', "dlvInfoUrlPop", $('#dlvpop'));
}
function sendDlvInfo() {