diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
index 067a5313..06d80884 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn01Controller.java
@@ -109,11 +109,7 @@ public class Crdn01Controller extends ApplicationController {
public ModelAndView getCivilComplaintReceiptDataList(CrdnQuery req) {
req.setGrid("receiptData");
setFetchSize(req);
- return setCollectionInfo(
- new ModelAndView("jsonView"),
- crdn01Service.getCrackdownList(req),
- "crdn"
- );
+ return setCollectionInfo(new ModelAndView("jsonView"),crdn01Service.getCrackdownList(req),"");
}
/**민원접수 초기자료 상세조회 팝업 화면을 연다.
@@ -151,11 +147,7 @@ public class Crdn01Controller extends ApplicationController {
public ModelAndView selectCivilComplaintAnswerTargetDataList(CrdnQuery req) {
req.setGrid("answerTargetData");
setFetchSize(req);
- return setCollectionInfo(
- new ModelAndView("jsonView"),
- crdn01Service.getCrackdownList(req),
- "crdn"
- );
+ return setCollectionInfo(new ModelAndView("jsonView"), crdn01Service.getCrackdownList(req), "");
}
/**민원자료 목록을 조회한다.
@@ -172,11 +164,7 @@ public class Crdn01Controller extends ApplicationController {
@RequestMapping(name="민원자료 목록", value="/040/list.do")
public ModelAndView getCivilComplaintList(CrdnQuery req) {
setFetchSize(req);
- return setCollectionInfo(
- new ModelAndView("jsonView"),
- crdn01Service.getCrackdownList(req),
- "crdn"
- );
+ return setCollectionInfo(new ModelAndView("jsonView"),crdn01Service.getCrackdownList(req),"");
}
/**지정한 민원자료를 제거한다.
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
index e598f93c..180bbc25 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn05Controller.java
@@ -65,11 +65,7 @@ public class Crdn05Controller extends ApplicationController {
@RequestMapping(name="당일 입력 단속자료 목록 조회", value="/010/list.do")
public ModelAndView getTodayCrdnDataList(CrdnQuery req) {
setFetchSize(req);
- return setCollectionInfo(
- new ModelAndView("jsonView"),
- crdn05Service.getCrackdownList(req),
- "crdn"
- );
+ return setCollectionInfo(new ModelAndView("jsonView"),crdn05Service.getCrackdownList(req),"");
}
/**단속자료 수기 등록 팝업화면을 반환한다.
diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
index 1fad9544..c7e6f446 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
@@ -99,11 +99,7 @@ public class Crdn06Controller extends ApplicationController {
@RequestMapping(name="단속자료 목록", value="/010/list.do")
public ModelAndView getCrackdownList(CrdnQuery req) {
setFetchSize(req);
- return setCollectionInfo(
- new ModelAndView("jsonView"),
- crdn06Service.getCrackdownList(req),
- "crdn"
- );
+ return setCollectionInfo(new ModelAndView("jsonView"),crdn06Service.getCrackdownList(req),"");
}
/**검사자료 목록을 조회한다.
@@ -125,11 +121,7 @@ public class Crdn06Controller extends ApplicationController {
case "sameVehicleSub" -> req.setGrid("sameVehicleSub");
}
setFetchSize(req);
- return setCollectionInfo(
- new ModelAndView("jsonView"),
- crdn06Service.getCrackdownList(req),
- "crdn"
- );
+ return setCollectionInfo(new ModelAndView("jsonView"),crdn06Service.getCrackdownList(req),"");
}
/**감경자료 목록을 조회한다.
@@ -147,10 +139,6 @@ public class Crdn06Controller extends ApplicationController {
public ModelAndView getFineReductionDataList(CrdnQuery req) {
req.setGrid("fineReductionData");
setFetchSize(req);
- return setCollectionInfo(
- new ModelAndView("jsonView"),
- crdn06Service.getCrackdownList(req),
- "crdn"
- );
+ return setCollectionInfo(new ModelAndView("jsonView"),crdn06Service.getCrackdownList(req),"");
}
}
diff --git a/src/main/java/cokr/xit/fims/task/web/DpvController.java b/src/main/java/cokr/xit/fims/task/web/DpvController.java
index 13b24c38..12e9c279 100644
--- a/src/main/java/cokr/xit/fims/task/web/DpvController.java
+++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java
@@ -47,11 +47,7 @@ public class DpvController {
public ModelAndView getTagInformationUndefinedDataList(CrdnQuery req) {
req.setGrid("tagInformationUndefinedData");
setFetchSize(req);
- return setCollectionInfo(
- new ModelAndView("jsonView"),
- crdn06Service.getCrackdownList(req),
- "crdn"
- );
+ return setCollectionInfo(new ModelAndView("jsonView"),crdn06Service.getCrackdownList(req),"");
}
/**표지정보 미확인 자료를 수정한다.
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
index fa3a30b2..7dd61604 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp
@@ -179,9 +179,9 @@ $(document).ready(function(){
* DatasetControl
**************************************************************************/
$P.crdnControl = new DatasetControl({
- size:"xxl",
urls : { load : "", getInfo : "", remove : "" },
- keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:true,
+ dataGetter : obj => obj["List"], appendData:true,
+ keymapper : info => info ? info.CRDN_ID : "",
formats : {
CRDN_REG_SE_CD : FIM026,
CVLCPT_RCPT_YMD : dateFormat,
@@ -194,16 +194,15 @@ $(document).ready(function(){
* DatasetControl.on
**************************************************************************/
$P.crdnControl.onDatasetChange = (obj) => {
- var prefix = obj.infoPrefix;
- $P.renderCrdnList(obj[prefix+"Total"]);
+ $P.renderCrdnList(obj["Total"]);
$("#crdnPaging--${pageName}").setPagingInfo({
list: $P.crdnControl.dataset,
prefix: "crdnPaging--${pageName}",
- start: obj[prefix+"Start"],
- totalSize: obj[prefix+"Total"],
- fetchSize: obj[prefix+"Fetch"],
+ start: obj["Start"],
+ totalSize: obj["Total"],
+ fetchSize: obj["Fetch"],
func: "pageObject['${pageName}'].crdnControl.load({index})"
});
@@ -486,6 +485,8 @@ $(document).ready(function(){
//보안모드
fn_securityModeToggle($("#securityMode--top").is(":checked"));
+
+
});
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp
index c078858f..a0e19f33 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp
@@ -176,7 +176,8 @@ $(document).ready(function(){
**************************************************************************/
$P.crdnControl = new DatasetControl({
urls : { load : "", getInfo : "" },
- keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:true,
+ dataGetter : obj => obj["List"], appendData:true,
+ keymapper : info => info ? info.CRDN_ID : "",
formats : {
CRDN_REG_SE_CD : FIM026,
CVLCPT_RCPT_YMD : dateFormat,
@@ -190,16 +191,15 @@ $(document).ready(function(){
* DatasetControl.on
**************************************************************************/
$P.crdnControl.onDatasetChange = (obj) => {
- var prefix = obj.infoPrefix;
- $P.renderCrdnList(obj[prefix+"Total"]);
+ $P.renderCrdnList(obj["Total"]);
$("#crdnPaging--${pageName}").setPagingInfo({
list: $P.crdnControl.dataset,
prefix: "crdnPaging--${pageName}",
- start: obj[prefix+"Start"],
- totalSize: obj[prefix+"Total"],
- fetchSize: obj[prefix+"Fetch"],
+ start: obj["Start"],
+ totalSize: obj["Total"],
+ fetchSize: obj["Fetch"],
func: "pageObject['${pageName}'].crdnControl.load({index})"
});
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp
index cf916885..5f053ded 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp
@@ -116,9 +116,8 @@ $(document).ready(function(){
**************************************************************************/
$P.crdnControl = new DatasetControl({
urls : { load : "" },
- keymapper:info => info ? info.CRDN_ID : "",
- dataGetter:obj => obj.crdnList,
- appendData:true,
+ dataGetter : obj => obj["List"], appendData:true,
+ keymapper : info => info ? info.CRDN_ID : "",
formats: {
CRDN_INPT_SE_CD : FIM003,
CRDN_REG_SE_CD : FIM026,
@@ -162,16 +161,14 @@ $(document).ready(function(){
**************************************************************************/
$P.crdnControl.onDatasetChange = (obj) => {
- var prefix = obj.infoPrefix;
-
- $P.renderCrdnList(obj[prefix+"Total"]);
+ $P.renderCrdnList(obj["Total"]);
$("#crdnPaging--${pageName}").setPagingInfo({
list: $P.crdnControl.dataset,
prefix: "crdnPaging--${pageName}",
- start: obj["crdnStart"],
- totalSize: obj["crdnTotal"],
- fetchSize: obj["crdnFetch"],
+ start: obj["Start"],
+ totalSize: obj["Total"],
+ fetchSize: obj["Fetch"],
func: "pageObject['${pageName}'].crdnControl.load({index})"
});
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
index 06ffc024..bfa2cb12 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp
@@ -276,11 +276,9 @@ $(document).ready(function(){
$P.uploadSet = uploadSupport("#uploadFileList--${pageName}");
$P.crdnControl = new DatasetControl({
- prefix:"crdn", prefixName:"단속", infoSize:"xxl",
urls : { load : "", create : wctx.url("/${taskSeCd}/crdn/crdn05/030/create.do") },
- keymapper:info => info ? info.CRDN_ID : "",
- dataGetter:obj => obj.crdnList,
- appendData:true,
+ keymapper : info => info ? info.CRDN_ID : "",
+ dataGetter : obj => obj["List"], appendData : true,
formats: {
}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
index 24a8fe94..4d094f2f 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
@@ -234,6 +234,8 @@ $(document).ready(function(){
load : "",
getInfo : ""
},
+ dataGetter : obj => obj["List"], appendData:true,
+ keymapper : info => info ? info.CRDN_ID : "",
formats: {
CRDN_INPT_SE_CD: FIM003,
CRDN_YMD_TM : datetimeFormat,
@@ -249,10 +251,7 @@ $(document).ready(function(){
CRDN_REG_SE_CD: FIM026,
LEVY_EXCL_YMD : dateFormat,
LEVY_EXCL_RSN_CD : FIM022
- },
- keymapper:info => info ? info.CRDN_ID : "",
- dataGetter:obj => obj.crdnList,
- appendData:true
+ }
});
/**************************************************************************
@@ -260,16 +259,14 @@ $(document).ready(function(){
**************************************************************************/
$P.crdnControl.onDatasetChange = obj => {
- var prefix = obj.infoPrefix;
-
- $P.renderCrdnList(obj[prefix+"Total"]);
+ $P.renderCrdnList(obj["Total"]);
$("#crdnPaging--${pageName}").setPagingInfo({
list: $P.crdnControl.dataset,
prefix: "crdnPaging--${pageName}",
- start: obj[prefix+"Start"],
- totalSize: obj[prefix+"Total"],
- fetchSize: obj[prefix+"Fetch"],
+ start: obj["Start"],
+ totalSize: obj["Total"],
+ fetchSize: obj["Fetch"],
func: "pageObject['${pageName}'].crdnControl.load({index})"
});
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
index 8036386c..8a3e3be6 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
@@ -337,7 +337,8 @@ $(document).ready(function(){
//단속사진검사 datasetControl 인스턴스
$P.photoInspectionControl = new DatasetControl({
urls : { load : "", getInfo : "" },
- keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:true,
+ dataGetter : obj => obj["List"], appendData:true,
+ keymapper : info => info ? info.CRDN_ID : "",
formats: {
CRDN_YMD_TM : datetimeFormat,
CRDN_INPT_SE_CD : FIM003,
@@ -350,12 +351,14 @@ $(document).ready(function(){
//동일차량검사 datasetControl 인스턴스
$P.sameVehicleControl = new InspectionControl({
urls : { load : "", getInfo : "" },
- keymapper:info => info ? info.CRDN_ID_LIST : "", dataGetter:obj => obj.crdnList, appendData:true,
+ dataGetter : obj => obj["List"], appendData:true,
+ keymapper : info => info ? info.CRDN_ID_LIST : "",
formats: { CRDN_CNT : numberFormat, FFNLG_AMT : numberFormat }
},
{
urls : { load : "", getInfo : "" },
- keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList,
+ dataGetter : obj => obj["List"],
+ keymapper : info => info ? info.CRDN_ID : "",
formats: {
CRDN_YMD_TM : datetimeFormat,
CRDN_INPT_SE_CD : FIM003,
@@ -379,29 +382,26 @@ $(document).ready(function(){
* DatasetControl.on
**************************************************************************/
$P.photoInspectionControl.onDatasetChange = (obj) => {
- var prefix = obj.infoPrefix;
- $P.renderInspectionDataList(obj[prefix+"Total"], "photoInspection");
+ $P.renderInspectionDataList(obj["Total"], "photoInspection");
- var prefix = obj.infoPrefix;
$("#photoInspectionPaging--${pageName}").setPagingInfo({
list: $P.photoInspectionControl.dataset,
prefix: "photoInspectionPaging--${pageName}",
- start: obj[prefix+"Start"], totalSize: obj[prefix+"Total"], fetchSize: obj[prefix+"Fetch"],
+ start: obj["Start"], totalSize: obj["Total"], fetchSize: obj["Fetch"],
func: "pageObject['${pageName}'].photoInspectionControl.load({index})"
});
};
$P.sameVehicleControl.main.onDatasetChange = (obj) => {
- var prefix = obj.infoPrefix;
- $P.renderInspectionDataList(obj[prefix+"Total"], "sameVehicleInspectionMain");
+ $P.renderInspectionDataList(obj["Total"], "sameVehicleInspectionMain");
$("#sameVehicleInspectionMainPaging--${pageName}").setPagingInfo({
list: $P.sameVehicleControl.main.dataset,
prefix: "sameVehicleInspectionMainPaging--${pageName}",
- start: obj[prefix+"Start"], totalSize: obj[prefix+"Total"], fetchSize: obj[prefix+"Fetch"],
+ start: obj["Start"], totalSize: obj["Total"], fetchSize: obj["Fetch"],
func: "pageObject['${pageName}'].sameVehicleControl.main.load({index})"
});
@@ -409,10 +409,7 @@ $(document).ready(function(){
$P.sameVehicleControl.sub.onDatasetChange = (obj) => {
- var prefix = obj.infoPrefix;
-
- $P.renderInspectionDataList(obj[prefix+"Total"], "sameVehicleInspectionSub");
-
+ $P.renderInspectionDataList(obj["Total"], "sameVehicleInspectionSub");
};
/**************************************************************************
@@ -584,7 +581,8 @@ $(document).ready(function(){
data : params || {},
success : resp => {
resp = resp.replace(/infoPrefix/g, levyExclPrefix)
- .replace(/prefixName/g, levyExclPrefixName)
+ .replace(/prefixName/g, levyExclPrefixName);
+
dialog.open({
id : "levyExcldialog--${pageName}",
title : "부과제외 정보",
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
index ad69ea42..6b67ad9f 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
@@ -139,30 +139,30 @@ $(document).ready(function(){
getInfo : wctx.url("/DPV/sprt/sprt01/020/info.do"),
update: wctx.url("/DPV/crdn/crdn06/030/update.do")
},
+ dataGetter : obj => obj["List"], appendData:true,
+ keymapper : info => info ? info.CRDN_ID : "",
formats: {
CRDN_INPT_SE_CD : FIM003,
CRDN_YMD_TM : datetimeFormat,
FFNLG_AMT : numberFormat,
CRDN_STTS_CD : FIM010,
BLNC : numberFormat
- },
- keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:true
+ }
});
/**************************************************************************
* DatasetControl.on
**************************************************************************/
$P.crdnControl.onDatasetChange = obj => {
- var prefix = obj.infoPrefix;
- $P.renderCrdnList(obj[prefix+"Total"]);
+ $P.renderCrdnList(obj["Total"]);
$("#crdnPaging--${pageName}").setPagingInfo({
list: $P.crdnControl.dataset,
prefix: "crdnPaging--${pageName}",
- start: obj[prefix+"Start"],
- totalSize: obj[prefix+"Total"],
- fetchSize: obj[prefix+"Fetch"],
+ start: obj["Start"],
+ totalSize: obj["Total"],
+ fetchSize: obj["Fetch"],
func: "pageObject['${pageName}'].crdnControl.load({index})"
});
};
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
index b367d223..ea27a31b 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
@@ -147,6 +147,8 @@ $(document).ready(function(){
**************************************************************************/
$P.crdnControl = new DatasetControl({
urls : { load : "", getInfo : "" },
+ dataGetter : obj => obj["List"], appendData:true,
+ keymapper : info => info ? info.CRDN_ID : "",
formats: {
RDUCT_RSN_CD : FIM019,
RDUCT_YMD : dateFormat,
@@ -155,24 +157,22 @@ $(document).ready(function(){
SUM_AMT : numberFormat,
CRDN_STTS_CD : FIM010,
BLNC : numberFormat
- },
- keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:true
+ }
});
/**************************************************************************
* DatasetControl.on
**************************************************************************/
$P.crdnControl.onDatasetChange = (obj) => {
- var prefix = obj.infoPrefix;
- $P.renderCrdnList(obj[prefix+"Total"]);
+ $P.renderCrdnList(obj["Total"]);
$("#crdnPaging--${pageName}").setPagingInfo({
list: $P.crdnControl.dataset,
prefix: "crdnPaging--${pageName}",
- start: obj["crdnStart"],
- totalSize: obj["crdnTotal"],
- fetchSize: obj["crdnFetch"],
+ start: obj["Start"],
+ totalSize: obj["Total"],
+ fetchSize: obj["Fetch"],
func: "pageObject['${pageName}'].crdnControl.load({index})"
});