From 060a31815acf42209e699dbce94a8106dbb48d66 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 16 Feb 2024 14:03:43 +0900 Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cokr/xit/fims/crdn/CrdnQuery.java | 10 +++++----- .../cokr/xit/fims/crdn/service/CrdnService.java | 4 ++-- .../fims/crdn/service/bean/CrdnServiceBean.java | 4 ++-- .../cokr/xit/fims/crdn/web/Crdn06Controller.java | 6 +++--- .../cokr/xit/fims/cvlc/dao/CrdnCvlcptMapper.java | 4 ++-- .../xit/fims/cvlc/service/CrdnCvlcptService.java | 8 ++++---- .../cvlc/service/bean/CrdnCvlcptServiceBean.java | 10 +++++----- .../cokr/xit/fims/cvlc/web/Cvlc02Controller.java | 10 +++++----- src/main/java/cokr/xit/fims/sprt/SprtQuery.java | 13 +++++++------ .../service/bean/IntegrationSearchServiceBean.java | 14 +++++++------- .../java/cokr/xit/fims/task/web/BpvController.java | 8 ++++---- .../java/cokr/xit/fims/task/web/DpvController.java | 8 ++++---- .../java/cokr/xit/fims/task/web/EcaController.java | 4 ++-- .../java/cokr/xit/fims/task/web/PvsController.java | 8 ++++---- .../sql/mapper/fims/crdn/crdn-list-mapper.xml | 6 +++--- .../sql/mapper/fims/crdn/crdn-updt-mapper.xml | 2 +- .../sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml | 2 +- .../mapper/fims/sprt/integrationSearch-mapper.xml | 4 ++-- .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp | 2 +- .../WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp | 4 ++-- 20 files changed, 66 insertions(+), 65 deletions(-) diff --git a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java index 6cf851c0..a81bf30c 100644 --- a/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java +++ b/src/main/java/cokr/xit/fims/crdn/CrdnQuery.java @@ -27,7 +27,7 @@ public class CrdnQuery extends CmmnQuery { //ID private String crdnId; - private String[] crdnIDs; + private String[] crdnIds; private String amtDcsnCdGroupId; private String dtlAmtDcsnGroupId; private String fileLayoutId; @@ -127,12 +127,12 @@ public class CrdnQuery extends CmmnQuery { return self(); } - public String[] getCrdnIDs() { - return ifEmpty(crdnIDs, () -> null); + public String[] getCrdnIds() { + return ifEmpty(crdnIds, () -> null); } - public T setCrdnIDs(String... crdnIDs) { - this.crdnIDs = crdnIDs; + public T setCrdnIds(String... crdnIds) { + this.crdnIds = crdnIds; return self(); } diff --git a/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java b/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java index b042ad76..93874a4c 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java +++ b/src/main/java/cokr/xit/fims/crdn/service/CrdnService.java @@ -98,9 +98,9 @@ public interface CrdnService { int countCrdn(CrdnQuery crdnQuery); /** 단속자료를 압축파일로 생성하여 세외수입으로 전송한다. - * @param crdnIDs 단속ID 목록 + * @param crdnIds 단속ID 목록 * @return 결과메시지 */ - String sendCrdn(String[] crdnIDs); + String sendCrdn(String[] crdnIds); } diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java index 5f5a6f1a..d8433a05 100644 --- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java +++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnServiceBean.java @@ -365,7 +365,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService } @Override - public String sendCrdn(String[] crdnIDs) { + public String sendCrdn(String[] crdnIds) { String rtnMsg = "[F]"; List fimsVltnCodes = codeBean.getCodes("FIM004"); @@ -374,7 +374,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService DataObject deptStng = stngBean.getStng("dept"); String gujesi = deptStng.string("NXRP_RGN_SE_CD"); - for(String crdnID : crdnIDs) { + for(String crdnID : crdnIds) { DataObject crdnInfo = crdnInfoMapper.selectCrdnInfo(crdnID); if(crdnInfo.string("NXRP_CRDN_LINK_YN").equals("Y")) { 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 c649c09d..08c3813e 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -233,17 +233,17 @@ public class Crdn06Controller extends ApplicationController { } /**단속자료를 압축파일로 생성하여 세외수입으로 전송한다. - * @param CrdnIDs 단속ID 목록 + * @param crdnIds 단속ID 목록 * @return jsonView * 
 {
 	 *     "affected": 저장된 정보수
 	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
 	 * }
*/ - public ModelAndView sendCrdn(String... crdnIDs) { + public ModelAndView sendCrdn(String... crdnIds) { ModelAndView mav = new ModelAndView("jsonView"); boolean saved = false; - String rtnMsg = crdnService.sendCrdn(crdnIDs); + String rtnMsg = crdnService.sendCrdn(crdnIds); if(rtnMsg.contains("[S]")) { saved = true; } diff --git a/src/main/java/cokr/xit/fims/cvlc/dao/CrdnCvlcptMapper.java b/src/main/java/cokr/xit/fims/cvlc/dao/CrdnCvlcptMapper.java index cdff9d4b..7c542e30 100644 --- a/src/main/java/cokr/xit/fims/cvlc/dao/CrdnCvlcptMapper.java +++ b/src/main/java/cokr/xit/fims/cvlc/dao/CrdnCvlcptMapper.java @@ -86,10 +86,10 @@ public interface CrdnCvlcptMapper extends AbstractMapper { int updateAnswerContent(CrdnCvlcpt crdnCvlcpt); /**답변대상목록을 단속ID목록으로 조회한다. - * @param crdnIDs 단속ID 목록 + * @param crdnIds 단속ID 목록 * @return 단속민원정보 */ - List selectAnswerTargetList(String[] crdnIDs); + List selectAnswerTargetList(String[] crdnIds); /**답변대상의 민원전송 상태를 변경한다. * @param crdnCvlcpt 단속민원정보 diff --git a/src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java b/src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java index 47dc539c..5f51757d 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java @@ -68,10 +68,10 @@ public interface CrdnCvlcptService { boolean updateAnswerContent(CrdnCvlcpt crdnCvlcpt); /** 민원답변대상의 처리 상태를 변경한다. - * @param processType 처리 유형, crdnIDs 단속ID목록 + * @param processType 처리 유형, crdnIds 단속ID목록 * @return 저장여부 */ - boolean updateAnswerTargetProcessStatus(String processType, String currentUserInstitute, String currentUserAcnt, String[] crdnIDs); + boolean updateAnswerTargetProcessStatus(String processType, String currentUserInstitute, String currentUserAcnt, String[] crdnIds); /** 민원답변 문구 설정 정보를 조회한다. * @param crdnQuery 조회 조건 @@ -127,8 +127,8 @@ public interface CrdnCvlcptService { boolean removeDmndDataInfo(String... indivIds); /** 지정한 단속자료에 대해 표지정보조회 실행 후 장애인차량이 아닌 건은 서손 처리한다. - * @param crdnIDs 단속 ID 목록 + * @param crdnIds 단속 ID 목록 * @return 저장여부 */ - boolean executeDisabledTagInfoInquire(String... crdnIDs); + boolean executeDisabledTagInfoInquire(String... crdnIds); } diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java index b05ad4c8..55945d17 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java @@ -470,9 +470,9 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } @Override - public boolean updateAnswerTargetProcessStatus(String processType, String currentUserInstitute, String currentUserAcnt, String[] crdnIDs) { + public boolean updateAnswerTargetProcessStatus(String processType, String currentUserInstitute, String currentUserAcnt, String[] crdnIds) { - List targetDataList = crdnCvlcptMapper.selectAnswerTargetList(crdnIDs); + List targetDataList = crdnCvlcptMapper.selectAnswerTargetList(crdnIds); for(int i=0; i < targetDataList.size(); i++) { @@ -583,14 +583,14 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv } @Override - public boolean executeDisabledTagInfoInquire(String... crdnIDs) { + public boolean executeDisabledTagInfoInquire(String... crdnIds) { int i=0; HashMap vehicleResultMap = new HashMap(); - for(; i "").equals("")) { diff --git a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java index fbfd104e..e184773e 100644 --- a/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java +++ b/src/main/java/cokr/xit/fims/cvlc/web/Cvlc02Controller.java @@ -226,29 +226,29 @@ public class Cvlc02Controller extends ApplicationController { * "saved": 저장되었으면 true, 그렇지 않으면 false * } */ - public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIDs) { + public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIds) { boolean saved = false; String currentInstitute = currentUser().getInstitute(); String currentUserAcnt = currentUser().getAccount(); - saved = crdnCvlcptService.updateAnswerTargetProcessStatus(processType, currentInstitute, currentUserAcnt, crdnIDs); + saved = crdnCvlcptService.updateAnswerTargetProcessStatus(processType, currentInstitute, currentUserAcnt, crdnIds); return new ModelAndView("jsonView") .addObject("saved", saved); } /**지정한 단속자료에 대해 표지정보조회 실행 후 장애인차량이 아닌 건은 서손 처리한다. - * @param crdnIDs 단속ID 목록 + * @param crdnIds 단속ID 목록 * @return jsonView * 
 {
 	 *     "affected": 저장된 정보수
 	 *     "saved": 저장되었으면 true, 그렇지 않으면 false
 	 * }
*/ - public ModelAndView executeDisabledTagInfoInquire(String... crdnIDs) { + public ModelAndView executeDisabledTagInfoInquire(String... crdnIds) { boolean saved = false; - saved = crdnCvlcptService.executeDisabledTagInfoInquire(crdnIDs); + saved = crdnCvlcptService.executeDisabledTagInfoInquire(crdnIds); return new ModelAndView("jsonView") .addObject("saved", saved); diff --git a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java index d6499eab..d6431b23 100644 --- a/src/main/java/cokr/xit/fims/sprt/SprtQuery.java +++ b/src/main/java/cokr/xit/fims/sprt/SprtQuery.java @@ -10,11 +10,12 @@ public class SprtQuery extends CmmnQuery { // 필수 private String callControlName; // 호출한 페이지의 Control 이름 - // IDs + // ID 목록 private String[] cvlcptDscsnIDs; + private String[] crdnIds; // 단속 ID 목록 + // ID private String crdnId; // 단속 ID - private String[] crdnIDs; // 단속 IDs private String rtpyrId; // 납부자 ID private String levyExclId; // 부과 제외 ID @@ -64,12 +65,12 @@ public class SprtQuery extends CmmnQuery { return self(); } - public String[] getCrdnIDs() { - return ifEmpty(crdnIDs, () -> null); + public String[] getCrdnIds() { + return ifEmpty(crdnIds, () -> null); } - public T setCrdnIDs(String... crdnIDs) { - this.crdnIDs = crdnIDs; + public T setCrdnIds(String... crdnIds) { + this.crdnIds = crdnIds; return self(); } diff --git a/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java b/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java index 59ac355c..7129abaf 100644 --- a/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java +++ b/src/main/java/cokr/xit/fims/sprt/service/bean/IntegrationSearchServiceBean.java @@ -144,11 +144,11 @@ public class IntegrationSearchServiceBean extends AbstractServiceBean implements if(formatName.equals("crdnList")) { CrdnQuery query = new CrdnQuery(); - query.setCrdnIDs(crdnIds); + query.setCrdnIds(crdnIds); dataObjectList = crdnListMapper.selectCrackdownList(query); } else if(formatName.equals("crdnConfirm")) { CrdnQuery query = new CrdnQuery(); - query.setCrdnIDs(crdnIds); + query.setCrdnIds(crdnIds); dataObjectList = crdnListMapper.selectCrackdownList(query); for(int i=0; i < dataObjectList.size(); i++) { @@ -172,7 +172,7 @@ public class IntegrationSearchServiceBean extends AbstractServiceBean implements } } else if(formatName.equals("requestForDelivery")) { SprtQuery sprtQuery = new SprtQuery(); - sprtQuery.setCrdnIDs(crdnIds); + sprtQuery.setCrdnIds(crdnIds); dataObjectList = integrationSearchMapper.selectIntegrationDataList(sprtQuery); Map globalVariable = printOption.getGlobalVariable(); @@ -185,7 +185,7 @@ public class IntegrationSearchServiceBean extends AbstractServiceBean implements } else if(formatName.equals("reportOnClaims")) { SprtQuery sprtQuery = new SprtQuery(); - sprtQuery.setCrdnIDs(crdnIds); + sprtQuery.setCrdnIds(crdnIds); dataObjectList = integrationSearchMapper.selectIntegrationDataList(sprtQuery); Map globalVariable = printOption.getGlobalVariable(); @@ -200,7 +200,7 @@ public class IntegrationSearchServiceBean extends AbstractServiceBean implements printOption.setGlobalVariable(globalVariable); } else if(formatName.equals("rcvmtConfirm")) { SprtQuery sprtQuery = new SprtQuery(); - sprtQuery.setCrdnIDs(crdnIds); + sprtQuery.setCrdnIds(crdnIds); dataObjectList = integrationSearchMapper.selectIntegrationDataList(sprtQuery); } @@ -336,7 +336,7 @@ public class IntegrationSearchServiceBean extends AbstractServiceBean implements dataObjectList.add(sample); } else { SprtQuery sprtQuery = new SprtQuery(); - sprtQuery.setCrdnIDs(crdnIds); + sprtQuery.setCrdnIds(crdnIds); dataObjectList = integrationSearchMapper.selectIntegrationDataList(sprtQuery); for(int i=0; i < dataObjectList.size(); i++) { @@ -643,7 +643,7 @@ public class IntegrationSearchServiceBean extends AbstractServiceBean implements try { SprtQuery sprtQuery = new SprtQuery(); - sprtQuery.setCrdnIDs(crdnIds); + sprtQuery.setCrdnIds(crdnIds); List dataObjectList = integrationSearchMapper.selectIntegrationDataList(sprtQuery); String imagesFolderName = yyyymmdd + printKorName; diff --git a/src/main/java/cokr/xit/fims/task/web/BpvController.java b/src/main/java/cokr/xit/fims/task/web/BpvController.java index 370f09ad..1aec4d62 100644 --- a/src/main/java/cokr/xit/fims/task/web/BpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/BpvController.java @@ -107,8 +107,8 @@ public class BpvController { @Override @RequestMapping(name="전용차로과태료업무 답변 내용 저장", value=METHOD_URL.updateAnswerTargetProcessStatus) - public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIDs) { - return super.updateAnswerTargetProcessStatus(processType, crdnIDs); + public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIds) { + return super.updateAnswerTargetProcessStatus(processType, crdnIds); } } @@ -299,8 +299,8 @@ public class BpvController { @Override @RequestMapping(name="전용차로과태료업무 단속자료압축파일 세외수입 전송", value=METHOD_URL.sendCrdn) - public ModelAndView sendCrdn(String... crdnIDs) { - return super.sendCrdn(crdnIDs); + public ModelAndView sendCrdn(String... crdnIds) { + return super.sendCrdn(crdnIds); } @Override 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 e96eeb1f..cb46e1e9 100644 --- a/src/main/java/cokr/xit/fims/task/web/DpvController.java +++ b/src/main/java/cokr/xit/fims/task/web/DpvController.java @@ -118,14 +118,14 @@ public class DpvController { @Override @RequestMapping(name="장애인과태료업무 답변 내용 저장", value=METHOD_URL.updateAnswerTargetProcessStatus) - public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIDs) { - return super.updateAnswerTargetProcessStatus(processType, crdnIDs); + public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIds) { + return super.updateAnswerTargetProcessStatus(processType, crdnIds); } @Override @RequestMapping(name="장애인과태료업무 표지정보조회 실행", value=METHOD_URL.executeDisabledTagInfoInquire) - public ModelAndView executeDisabledTagInfoInquire(String... crdnIDs) { - return super.executeDisabledTagInfoInquire(crdnIDs); + public ModelAndView executeDisabledTagInfoInquire(String... crdnIds) { + return super.executeDisabledTagInfoInquire(crdnIds); } } diff --git a/src/main/java/cokr/xit/fims/task/web/EcaController.java b/src/main/java/cokr/xit/fims/task/web/EcaController.java index 94125ff3..fccae81e 100644 --- a/src/main/java/cokr/xit/fims/task/web/EcaController.java +++ b/src/main/java/cokr/xit/fims/task/web/EcaController.java @@ -105,8 +105,8 @@ public class EcaController { @Override @RequestMapping(name="전기차과태료업무 답변 내용 저장", value=METHOD_URL.updateAnswerTargetProcessStatus) - public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIDs) { - return super.updateAnswerTargetProcessStatus(processType, crdnIDs); + public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIds) { + return super.updateAnswerTargetProcessStatus(processType, crdnIds); } } diff --git a/src/main/java/cokr/xit/fims/task/web/PvsController.java b/src/main/java/cokr/xit/fims/task/web/PvsController.java index d918f7dd..a62c1e11 100644 --- a/src/main/java/cokr/xit/fims/task/web/PvsController.java +++ b/src/main/java/cokr/xit/fims/task/web/PvsController.java @@ -106,8 +106,8 @@ public class PvsController { @Override @RequestMapping(name="주정차과태료업무 답변 내용 저장", value=METHOD_URL.updateAnswerTargetProcessStatus) - public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIDs) { - return super.updateAnswerTargetProcessStatus(processType, crdnIDs); + public ModelAndView updateAnswerTargetProcessStatus(String processType, String... crdnIds) { + return super.updateAnswerTargetProcessStatus(processType, crdnIds); } } @@ -311,8 +311,8 @@ public class PvsController { @Override @RequestMapping(name="주정차과태료업무 단속자료압축파일 세외수입 전송", value=METHOD_URL.sendCrdn) - public ModelAndView sendCrdn(String... crdnIDs) { - return super.sendCrdn(crdnIDs); + public ModelAndView sendCrdn(String... crdnIds) { + return super.sendCrdn(crdnIds); } @Override diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml index e08dc282..ae4d1b9b 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml @@ -116,8 +116,8 @@ WHERE C.DEL_YN = 'N' AND C.SGG_CD = #{sggCd} AND C.CRDN_ID = #{crdnId} - - AND C.CRDN_ID IN (#{CRDN_ID}) + + AND C.CRDN_ID IN (#{CRDN_ID}) AND C.TASK_SE_CD = #{taskSeCd} AND C.VHRNO LIKE CONCAT('%', #{vhrno}, '%') @@ -380,7 +380,7 @@ SELECT C.CRDN_ID WHERE C.DEL_YN = 'N' AND C.SGG_CD = #{sggCd} AND C.TASK_SE_CD = #{taskSeCd} - AND C.CRDN_ID IN (#{CRDN_ID}) + AND C.CRDN_ID IN (#{CRDN_ID}) diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml index f44a9922..7ee7a237 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-updt-mapper.xml @@ -164,7 +164,7 @@ , DLTR = #{removedBy} , DEL_RSN = #{delRsn} WHERE CRDN_ID IN ( - #{crdnId} + #{crdnId} ) AND DEL_YN = 'N' diff --git a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml index ed6e41e5..fa0ed739 100644 --- a/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cvlc/crdnCvlcpt-mapper.xml @@ -520,7 +520,7 @@ SELECT C.CRDN_ID , CC.CVLCPT_PRCS_RSLT_CN FROM TB_CRDN C INNER JOIN TB_CRDN_CVLCPT CC ON (C.CVLCPT_LINK_YN = 'Y' AND C.LINK_ID = CC.CVLCPT_LINK_ID) - WHERE C.CRDN_ID IN (#{crdnId}) + WHERE C.CRDN_ID IN (#{crdnId}) AND C.DEL_YN = 'N' AND C.CRDN_STTS_CD IN ('21','81','83') AND C.CRDN_REG_SE_CD = '02' diff --git a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml index f0b60a87..f2437c7a 100644 --- a/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/integrationSearch-mapper.xml @@ -161,8 +161,8 @@ LEFT OUTER JOIN TB_PAYER P ON (C.RTPYR_ID = P.RTPYR_ID) LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N') /* 부과 대장 */ LEFT OUTER JOIN TB_RCVMT R ON (L.LEVY_ID = R.LEVY_ID AND R.DEL_YN = 'N') /* 수납 대장 */ WHERE C.DEL_YN = 'N' - - AND C.CRDN_ID IN (#{CRDN_ID}) + + AND C.CRDN_ID IN (#{CRDN_ID}) AND C.SGG_CD = #{sggCd} 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 c3bc19ee..1dca88a7 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 @@ -513,7 +513,7 @@ $(document).ready(function(){ ajax.post({ url : wctx.url("/"+taskSeCd+"/crdn/crdn06/010/sendCrdn.do"), - data : { "crdnIDs" : keys.join(",") }, + data : { "crdnIds" : keys.join(",") }, success : (resp) => { if(resp.saved){ dialog.alert({ diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp index 2af7a506..845a48dc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp @@ -560,7 +560,7 @@ $(document).ready(function(){ url : $P.crdnControl.urls.update, data : { "processType" : processType, - "crdnIDs" : $P.crdnControl.dataset.getKeys("selected").join(",") + "crdnIds" : $P.crdnControl.dataset.getKeys("selected").join(",") }, success : (resp) => { if(resp.saved){ @@ -614,7 +614,7 @@ $(document).ready(function(){ ajax.get({ url : wctx.url("/DPV/cvlc/cvlc02/040/update.do"), data : { - "crdnIDs" : keys.join(",") + "crdnIds" : keys.join(",") }, success : (resp) => { dialog.alert({