diff --git a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java index 65a278bd..600f31ba 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java @@ -123,8 +123,7 @@ public class Sprt02Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02010-main"); - return mav - .addObject("callControlName", req.getCallControlName()) + return mav.addObject("callControlName", req.getCallControlName()) .addObject("callPurpose", req.getCallPurpose()) .addObject("pageName", "sprt02010") // View(jsp)에서 사용할 id 뒤에 붙일 suffix .addObject("pageNameMain", "sprt02010") // 개별총정보 메인 화면명 @@ -147,8 +146,8 @@ public class Sprt02Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02020-info"); - mav.addObject("pageName", "sprt02020") - .addObject("pageNameMain", "sprt02010") + mav.addObject("pageNameMain", "sprt02010") + .addObject("pageName", "sprt02020") .addObject("crdnPayer", json ? crdnPayer : toJson(crdnPayer)) // 단속, 납부자 정보 ; @@ -173,10 +172,8 @@ public class Sprt02Controller extends ApplicationController { ModelAndView mav = new ModelAndView("jsonView"); - return mav - .addObject("callPurpose", req.getCallPurpose()) + return mav.addObject("pageNameMain", "sprt02010") .addObject("pageName", "sprt02020") - .addObject("pageNameMain", "sprt02010") .addObject("fileList", fileList) // 파일 리스트 ; } @@ -250,7 +247,7 @@ public class Sprt02Controller extends ApplicationController { * } */ public ModelAndView getOpnnSbmsnInfo(SprtQuery req) { - // 의견제출(TB_OPNN_SBMSN) 대장 조회 + // 의견제출 정보 LevyExclQuery exclQuery = new LevyExclQuery(); if (req.getCallPurpose() == null) { @@ -268,8 +265,8 @@ public class Sprt02Controller extends ApplicationController { ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02030-info"); - mav.addObject("pageName", "sprt02030") - .addObject("pageNameMain", "sprt02010") + mav.addObject("pageNameMain", "sprt02010") + .addObject("pageName", "sprt02030") .addObject("opnnSbmsn", json ? opnnSbmsn : toJson(opnnSbmsn)) // 의견제출 정보 ; @@ -282,7 +279,7 @@ public class Sprt02Controller extends ApplicationController { return mav; } - /**지정하는 단속 ID의 발송 정보를 반환한다. + /**지정하는 단속 ID의 발송상세 정보를 반환한다. * @param crdnId 단속ID * @return fims/sprt/sprt02040-main 또는 jsonView *
{
@@ -290,7 +287,7 @@ public class Sprt02Controller extends ApplicationController {
* }
*/
public ModelAndView getSndngInfo(SprtQuery req) {
- // 발송반송 정보
+ // 발송상세 정보
SndbQuery sndbQuery = new SndbQuery();
if (req.getCallPurpose() == null) {
@@ -315,11 +312,9 @@ public class Sprt02Controller extends ApplicationController {
ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02040-info");
- mav.addObject("pageName", "sprt02040")
- .addObject("pageNameMain", "sprt02010")
- .addObject("infoPrefix", "sndng") // prefix
+ mav.addObject("pageNameMain", "sprt02010")
+ .addObject("pageName", "sprt02040")
.addObject("sndngDtl", json ? sndngDtl : toJson(sndngDtl)) // 발송 정보
- .addObject("pageDataName2", "Svbtc") // dataset2
.addObject("svbtc", json ? svbtc : toJson(svbtc)) // 공시송달 정보
;
@@ -386,16 +381,11 @@ public class Sprt02Controller extends ApplicationController {
ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02050-info");
- mav
+ mav.addObject("pageNameMain", "sprt02010")
.addObject("pageName", "sprt02050")
- .addObject("pageNameMain", "sprt02010")
- .addObject("pageDataName1", "Rduct") // dataset1
.addObject("rduct", json ? rduct : toJson(rduct)) // 과태료 감경 정보
- .addObject("pageDataName2", "LevyExcl") // dataset2
.addObject("levyExcl", json ? levyExcl : toJson(levyExcl)) // 부과 제외 정보
- .addObject("pageDataName3", "CrdnSttsHstry") // dataset3
.addObject("crdnSttsHstry", json ? crdnSttsHstry : toJson(crdnSttsHstry)) // 단속 상태 이력
- .addObject("pageDataName4", "PayerHstry") // dataset4
.addObject("payerHstry", json ? payerHstry : toJson(payerHstry)) // 납부자 변경 이력
;
@@ -416,6 +406,7 @@ public class Sprt02Controller extends ApplicationController {
* }
*/
public ModelAndView getLevyNpmntInfo(SprtQuery req) {
+ // 부과 정보
LevyQuery levyQuery = new LevyQuery();
if (req.getCallPurpose() == null) {
@@ -433,8 +424,8 @@ public class Sprt02Controller extends ApplicationController {
ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02060-info");
- mav.addObject("pageName", "sprt02060")
- .addObject("pageNameMain", "sprt02010")
+ mav.addObject("pageNameMain", "sprt02010")
+ .addObject("pageName", "sprt02060")
.addObject("levy", json ? levy : toJson(levy)) // 부과 정보
;
@@ -455,19 +446,26 @@ public class Sprt02Controller extends ApplicationController {
* }
*/
public ModelAndView getRcvmtInfo(SprtQuery req) {
- //
- List {
@@ -488,10 +486,14 @@ public class Sprt02Controller extends ApplicationController {
* }
*/
public ModelAndView getCvlcptDscsnInfo(SprtQuery req) {
- //
+ // 민원 상담 정보
CvlcptDscsnQuery cvlcptDscsnQuery = new CvlcptDscsnQuery();
- cvlcptDscsnQuery.setCallPurpose(req.getCallPurpose());
+ if (req.getCallPurpose() == null) {
+ cvlcptDscsnQuery.setCallPurpose("view");
+ } else {
+ cvlcptDscsnQuery.setCallPurpose(req.getCallPurpose());
+ }
cvlcptDscsnQuery.setInquiryCondition(req.getInquiryCondition());
cvlcptDscsnQuery.setSggCd(req.getSggCd());
cvlcptDscsnQuery.setTaskSeCd(req.getTaskSeCd());
@@ -504,9 +506,8 @@ public class Sprt02Controller extends ApplicationController {
ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/sprt/sprt02080-info");
- mav.addObject("pageName", "sprt02080")
- .addObject("pageNameMain", "sprt02010")
- .addObject("infoPrefix", "cvlcptDscsn") // prefix
+ mav.addObject("pageNameMain", "sprt02010")
+ .addObject("pageName", "sprt02080")
.addObject("cvlcptDscsn", json ? cvlcptDscsn : toJson(cvlcptDscsn)) // 민원상담내용 정보
;
diff --git a/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml b/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml
index 2f54c1f8..0349076f 100644
--- a/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml
@@ -173,7 +173,7 @@