diff --git a/src/main/java/cokr/xit/fims/cmmn/service/CrdnPayerHstryService.java b/src/main/java/cokr/xit/fims/cmmn/service/CrdnPayerAddrHstryService.java similarity index 85% rename from src/main/java/cokr/xit/fims/cmmn/service/CrdnPayerHstryService.java rename to src/main/java/cokr/xit/fims/cmmn/service/CrdnPayerAddrHstryService.java index cbea61bf..64f72b4b 100644 --- a/src/main/java/cokr/xit/fims/cmmn/service/CrdnPayerHstryService.java +++ b/src/main/java/cokr/xit/fims/cmmn/service/CrdnPayerAddrHstryService.java @@ -3,7 +3,6 @@ package cokr.xit.fims.cmmn.service; import java.util.List; import cokr.xit.fims.cmmn.CrdnPayerAddrHstry; -import cokr.xit.fims.cmmn.CrdnPayerHstry; import cokr.xit.fims.cmmn.CrdnPayerHstryQuery; import cokr.xit.foundation.data.DataObject; @@ -14,11 +13,11 @@ import cokr.xit.foundation.data.DataObject; * 
  * ============ 변경 이력 ============
  * 2023-08-16	leebj 최초 작성
- * 2024-11-05   JoJH 납부자 주소이력 수정
+ * 2024-11-05   JoJH 단속 납부자 주소 이력 테이블 변경으로 인한 수정
  * ================================
  *
*/ -public interface CrdnPayerHstryService { +public interface CrdnPayerAddrHstryService { /**지정한 조건에 따라 단속 납부자 이력 목록을 조회하여 반환한다. * @param req 단속 납부자 이력 조회 조건 @@ -30,7 +29,7 @@ public interface CrdnPayerHstryService { * @param req 단속 납부자 이력 조회 조건 * @return 단속 납부자 이력 객체 목록 */ - List getCrdnPayerHstrys(CrdnPayerHstryQuery req); + List getCrdnPayerHstrys(CrdnPayerHstryQuery req); /**단속 납부자 이력 정보를 등록한다. * @param crdnPayerHstry 단속 납부자 이력 @@ -39,7 +38,7 @@ public interface CrdnPayerHstryService { *
  • 그렇지 않으면 false
    • * */ - boolean create(CrdnPayerHstry crdnPayerHstry); + boolean create(CrdnPayerAddrHstry crdnPayerAddrHstry); /**단속 납부자 이력 정보를 등록하고, 단속 대장의 납부자 정보를 수정한다. * @param crdnPayerHstry 단속 납부자 이력 diff --git a/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerAddrHstryServiceBean.java b/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerAddrHstryServiceBean.java new file mode 100644 index 00000000..e8814a79 --- /dev/null +++ b/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerAddrHstryServiceBean.java @@ -0,0 +1,53 @@ +package cokr.xit.fims.cmmn.service.bean; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import cokr.xit.fims.cmmn.CrdnPayerAddrHstry; +import cokr.xit.fims.cmmn.CrdnPayerHstryQuery; +import cokr.xit.fims.cmmn.service.CrdnPayerAddrHstryService; +import cokr.xit.foundation.component.AbstractServiceBean; +import cokr.xit.foundation.data.DataObject; + +/**단속 납부자 이력 서비스 구현체. + * + *

    상세 설명: + * + * 

    + * ============ 변경 이력 ============
+ * 2023-08-16	leebj 최초 작성
+ * 2024-11-05   JoJH 단속 납부자 주소 이력 테이블 변경으로 인한 수정
+ * ================================
+ *
    + */ +@Service("crdnPayerAddrHstryService") +public class CrdnPayerAddrHstryServiceBean extends AbstractServiceBean implements CrdnPayerAddrHstryService { + + /** 단속 납부자 주소 이력 정보 Bean */ + @Resource(name = "crdnPayerAddrHstryBean") + private CrdnPayerAddrHstryBean crdnPayerAddrHstryBean; + + @Override + public List getCrdnPayerHstryList(CrdnPayerHstryQuery req) { + return crdnPayerAddrHstryBean.getCrdnPayerHstryList(req); + } + + @Override + public List getCrdnPayerHstrys(CrdnPayerHstryQuery req) { + return crdnPayerAddrHstryBean.getCrdnPayerHstrys(req); + } + + @Override + public boolean create(CrdnPayerAddrHstry crdnPayerAddrHstry) { + return crdnPayerAddrHstryBean.create(crdnPayerAddrHstry); + } + + @Override + public boolean createHstryUpdateCrdnPayerAddr(CrdnPayerAddrHstry crdnPayerAddrHstry) { + return crdnPayerAddrHstryBean.createHstryUpdateCrdnPayerAddr(crdnPayerAddrHstry); + } + +} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerHstryServiceBean.java b/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerHstryServiceBean.java deleted file mode 100644 index 9ddf8ede..00000000 --- a/src/main/java/cokr/xit/fims/cmmn/service/bean/CrdnPayerHstryServiceBean.java +++ /dev/null @@ -1,54 +0,0 @@ -package cokr.xit.fims.cmmn.service.bean; - -import java.util.List; - -import javax.annotation.Resource; - -import org.springframework.stereotype.Service; - -import cokr.xit.fims.cmmn.CrdnPayerAddrHstry; -import cokr.xit.fims.cmmn.CrdnPayerHstry; -import cokr.xit.fims.cmmn.CrdnPayerHstryQuery; -import cokr.xit.fims.cmmn.service.CrdnPayerHstryService; -import cokr.xit.foundation.component.AbstractServiceBean; -import cokr.xit.foundation.data.DataObject; - -/**단속 납부자 이력 서비스 구현체. - * - *

    상세 설명: - * - * 

    - * ============ 변경 이력 ============
- * 2023-08-16	leebj 최초 작성
- * 2024-11-05   JoJH 납부자 주소이력 수정
- * ================================
- *
    - */ -@Service("crdnPayerHstryService") -public class CrdnPayerHstryServiceBean extends AbstractServiceBean implements CrdnPayerHstryService { - - /** 단속 납부자 이력 정보 Bean */ - @Resource(name = "crdnPayerHstryBean") - private CrdnPayerHstryBean crdnPayerHstryBean; - - @Override - public List getCrdnPayerHstryList(CrdnPayerHstryQuery req) { - return crdnPayerHstryBean.getCrdnPayerHstryList(req); - } - - @Override - public List getCrdnPayerHstrys(CrdnPayerHstryQuery req) { - return crdnPayerHstryBean.getCrdnPayerHstrys(req); - } - - @Override - public boolean create(CrdnPayerHstry crdnPayerHstry) { - return crdnPayerHstryBean.createCrdnPayerHstry(crdnPayerHstry); - } - - @Override - public boolean createHstryUpdateCrdnPayerAddr(CrdnPayerAddrHstry crdnPayerAddrHstry) { - return crdnPayerHstryBean.createHstryUpdateCrdnPayerAddr(crdnPayerAddrHstry); - } - -} \ No newline at end of file diff --git a/src/main/java/cokr/xit/fims/cmmn/web/CrdnPayerHstryController.java b/src/main/java/cokr/xit/fims/cmmn/web/CrdnPayerHstryController.java index bdc0b107..82d44231 100644 --- a/src/main/java/cokr/xit/fims/cmmn/web/CrdnPayerHstryController.java +++ b/src/main/java/cokr/xit/fims/cmmn/web/CrdnPayerHstryController.java @@ -9,10 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import cokr.xit.foundation.web.AbstractController; - -import cokr.xit.fims.cmmn.CrdnPayerHstry; +import cokr.xit.fims.cmmn.CrdnPayerAddrHstry; import cokr.xit.fims.cmmn.CrdnPayerHstryQuery; -import cokr.xit.fims.cmmn.service.CrdnPayerHstryService; +import cokr.xit.fims.cmmn.service.CrdnPayerAddrHstryService; /**단속 납부자 이력 서비스의 웹 컨트롤러 * @@ -26,9 +25,10 @@ import cokr.xit.fims.cmmn.service.CrdnPayerHstryService; */ @RequestMapping(name = "단속 납부자 이력", value = "/crdnPayerHstry") public class CrdnPayerHstryController extends AbstractController { + /**단속 납부자 이력 서비스*/ - @Resource(name = "crdnPayerHstryService") - private CrdnPayerHstryService crdnPayerHstryService; + @Resource(name = "crdnPayerAddrHstryService") + private CrdnPayerAddrHstryService crdnPayerAddrHstryService; /**단속 납부자 이력 관리 메인화면(crdnPayerHstry/crdnPayerHstry-main)을 연다. * 조건없는 {@link #getCrdnPayerHstryList(CrdnPayerHstryQuery) 단속 납부자 이력 조회 결과}를 포함시킨다. @@ -42,7 +42,7 @@ public class CrdnPayerHstryController extends AbstractController { } /**단속 납부자 이력 목록을 조회하여 반환한다.
    - * {@link CrdnPayerHstryService#getCrdnPayerHstryList(CrdnPayerHstryQuery)} 참고 + * {@link CrdnPayerAddrHstryService#getCrdnPayerHstryList(CrdnPayerHstryQuery)} 참고 * @param req 단속 납부자 이력 조회 조건 * @return jsonView * 
     {
@@ -54,7 +54,7 @@ public class CrdnPayerHstryController extends AbstractController {
 	 */
 	@RequestMapping(name = "단속 납부자 이력 조회", value = "/list.do")
 	public ModelAndView getCrdnPayerHstryList(CrdnPayerHstryQuery req) {
-		List result = crdnPayerHstryService.getCrdnPayerHstryList(setFetchSize(req));
+		List result = crdnPayerAddrHstryService.getCrdnPayerHstryList(setFetchSize(req));
 		return setCollectionInfo(new ModelAndView("jsonView"), result, "crdnPayerHstry");
 	}
 
@@ -66,8 +66,9 @@ public class CrdnPayerHstryController extends AbstractController {
 	 * }
    */ @PostMapping(name = "단속 납부자 이력 등록", value = "/create.do") - public ModelAndView create(CrdnPayerHstry crdnPayerHstry) { - boolean saved = crdnPayerHstryService.create(crdnPayerHstry); + public ModelAndView create(CrdnPayerAddrHstry crdnPayerAddrHstry) { + boolean saved = crdnPayerAddrHstryService.create(crdnPayerAddrHstry); + return new ModelAndView("jsonView") .addObject("saved", saved); } 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 8346daef..15aff814 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 @@ -14,7 +14,7 @@ import cokr.xit.base.file.FileInfo; import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.fims.cmmn.CmmnUtil; -import cokr.xit.fims.cmmn.service.bean.CrdnPayerHstryBean; +import cokr.xit.fims.cmmn.service.bean.CrdnPayerAddrHstryBean; import cokr.xit.fims.cmmn.service.bean.CrdnSttsHstryBean; import cokr.xit.fims.cmmn.service.bean.StngBean; import cokr.xit.fims.crdn.Crdn; @@ -88,12 +88,6 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService @Resource(name="crdnBean") private CrdnBean crdnBean; - @Resource(name="crdnSttsHstryBean") - private CrdnSttsHstryBean crdnSttsHstryBean; - - @Resource(name="crdnPayerHstryBean") - private CrdnPayerHstryBean crdnPayerHstryBean; - @Override public List getCrackdownList(CrdnQuery query) { 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 ddf8e183..6d0ae02b 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 @@ -20,7 +20,6 @@ import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.fims.cmmn.CmmnUtil; import cokr.xit.fims.cmmn.CrdnSttsHstry; -import cokr.xit.fims.cmmn.dao.CrdnPayerHstryMapper; import cokr.xit.fims.cmmn.dao.CrdnSttsHstryMapper; import cokr.xit.fims.cmmn.service.bean.CrdnSttsHstryBean; import cokr.xit.fims.crdn.Crdn; @@ -83,9 +82,6 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv @Resource(name = "crdnSttsHstryBean") private CrdnSttsHstryBean crdnSttsHstryBean; - @Resource(name = "crdnPayerHstryMapper") - private CrdnPayerHstryMapper crdnPayerHstryMapper; - @Resource(name="crdnInfoMapper") private CrdnInfoMapper crdnInfoMapper; diff --git a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java index 7eeeeebc..fc906438 100644 --- a/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java +++ b/src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptSubBean.java @@ -19,9 +19,8 @@ import cokr.xit.base.file.service.FileQuery; import cokr.xit.base.file.service.bean.FileBean; import cokr.xit.base.file.web.FileInfoFactory; import cokr.xit.fims.cmmn.CrdnPayerAddrHstry; -import cokr.xit.fims.cmmn.CrdnPayerHstry; import cokr.xit.fims.cmmn.CrdnSttsHstry; -import cokr.xit.fims.cmmn.dao.CrdnPayerHstryMapper; +import cokr.xit.fims.cmmn.dao.CrdnPayerAddrHstryMapper; import cokr.xit.fims.cmmn.dao.CrdnSttsHstryMapper; import cokr.xit.fims.crdn.Crdn; import cokr.xit.fims.crdn.CrdnQuery; @@ -72,8 +71,8 @@ public class CrdnCvlcptSubBean extends AbstractBean { @Resource(name = "answerWordsMapper") private AnswerWordsMapper answerWordsMapper; - @Resource(name = "crdnPayerHstryMapper") - private CrdnPayerHstryMapper crdnPayerHstryMapper; + @Resource(name = "crdnPayerAddrHstryMapper") + private CrdnPayerAddrHstryMapper crdnPayerAddrHstryMapper; @Resource(name = "crdnSttsHstryMapper") private CrdnSttsHstryMapper crdnSttsHstryMapper; @@ -254,7 +253,7 @@ public class CrdnCvlcptSubBean extends AbstractBean { crdnPayerAddrHstry.setRtpyrId(crdn.getRtpyrId()); crdnPayerAddrHstry.setAddrSn(crdn.getAddrSn()); - int rtnNocs = crdnPayerHstryMapper.insertCrdnPayerAddrHstry(crdnPayerAddrHstry); + int rtnNocs = crdnPayerAddrHstryMapper.insertCrdnPayerAddrHstry(crdnPayerAddrHstry); if(rtnNocs != 1) { throw new RuntimeException("단속민원답변 수정 중 단속납부자변경 이력 등록에 실패하였습니다."); } diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java index 4571b954..609f0455 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java @@ -190,8 +190,6 @@ public class Excl01Controller extends ApplicationController { boolean json = jsonResponse(); ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/excl/excl01020-info"); - mav.addObject("info", json ? levyExclInfo : toJson(levyExclInfo)); - // View(jsp)에서 사용할 공통코드를 조회 Map> commonCodes = getCodesOf("FIM021", "FIM022"); addCodes(commonCodes, mav, "FIM021", "FIM022"); @@ -202,6 +200,7 @@ public class Excl01Controller extends ApplicationController { .addObject("prefixUrl", CLASS_URL) // prefixUrl .addObject("FIM021List", commonCodes.get("FIM021")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) + .addObject("info", json ? levyExclInfo : toJson(levyExclInfo)) .addObject("saveCallbackFuncName", hReq.getParameter("saveCallbackFuncName")) .addObject("savedCallbackFuncName", hReq.getParameter("savedCallbackFuncName")) ;