diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java
index 892fb7c4..acd1d9f6 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/CrdnBean.java
@@ -135,7 +135,7 @@ public class CrdnBean extends AbstractBean {
throw new RuntimeException("단속자료 등록 중 단속상태 이력 등록에 실패하였습니다.");
//단속납부자이력(TB_CRDN_PAYER_HSTRY) 대장 등록
- if(!ifEmpty(crdn.getRtpyrId(), () -> "").equals("")) {
+ if(!isEmpty(crdn.getRtpyrId())) {
CrdnPayerAddrHstry crdnPayerAddrHstry = new CrdnPayerAddrHstry();
crdnPayerAddrHstry.setCrdnId(crdn.getCrdnId());
crdnPayerAddrHstry.setRtpyrId(crdn.getRtpyrId());
diff --git a/src/main/java/cokr/xit/fims/payer/service/PayerService.java b/src/main/java/cokr/xit/fims/payer/service/PayerService.java
index 9df80708..3bb20389 100644
--- a/src/main/java/cokr/xit/fims/payer/service/PayerService.java
+++ b/src/main/java/cokr/xit/fims/payer/service/PayerService.java
@@ -71,13 +71,13 @@ public interface PayerService {
* @param req 자동차 기본정보 조회 조건
* @return 차량 및 소유자(납부자) 정보
*/
- Payer getVehicleOwner(BasicInfoRequest req);
+ Payer findVehicleOwner(BasicInfoRequest req);
/**주어진 조건의 차량 및 소유자(납부자) 정보를 반환한다.
* @param req 자동차 기본정보 조회 조건
* @return 차량 및 소유자(납부자) 정보
*/
- Payer getVehicleOwner(BasicInfoExtRequest req);
+ Payer findVehicleOwner(BasicInfoExtRequest req);
/**지정한 조건에 따라 납부자 대장 정보를 반환한다.
* @param req 납부자 대장 조회 조건
diff --git a/src/main/java/cokr/xit/fims/payer/service/bean/PayerServiceBean.java b/src/main/java/cokr/xit/fims/payer/service/bean/PayerServiceBean.java
index 5c5bba24..1a38418b 100644
--- a/src/main/java/cokr/xit/fims/payer/service/bean/PayerServiceBean.java
+++ b/src/main/java/cokr/xit/fims/payer/service/bean/PayerServiceBean.java
@@ -62,13 +62,13 @@ public class PayerServiceBean extends AbstractServiceBean implements PayerServic
}
@Override
- public Payer getVehicleOwner(BasicInfoRequest req) {
+ public Payer findVehicleOwner(BasicInfoRequest req) {
List payers = payerBean.getVehicleOwners(List.of(req));
return !payers.isEmpty() ? payers.get(0) : null;
}
@Override
- public Payer getVehicleOwner(BasicInfoExtRequest req) {
+ public Payer findVehicleOwner(BasicInfoExtRequest req) {
return payerBean.getVehicleOwner(req);
}
diff --git a/src/main/java/cokr/xit/fims/payer/web/PayerController.java b/src/main/java/cokr/xit/fims/payer/web/PayerController.java
index f60087a2..5b810f60 100644
--- a/src/main/java/cokr/xit/fims/payer/web/PayerController.java
+++ b/src/main/java/cokr/xit/fims/payer/web/PayerController.java
@@ -127,7 +127,7 @@ public class PayerController extends ApplicationController {
req.setLevy_stdde(hreq.getParameter("levy_stdde"));
req.setVhrno(hreq.getParameter("vhrno"));
req.setVin(hreq.getParameter("vin"));
- payer = payerService.getVehicleOwner(req);
+ payer = payerService.findVehicleOwner(req);
} else {
BasicInfoRequest req = new BasicInfoRequest();
req.setSggCd(hreq.getParameter("sggCd"));
@@ -136,17 +136,16 @@ public class PayerController extends ApplicationController {
req.setOwner_mber_no(hreq.getParameter("owner_mber_no"));
req.setVhrno(hreq.getParameter("vhrno"));
req.setVin(hreq.getParameter("vin"));
- payer = payerService.getVehicleOwner(req);
+ payer = payerService.findVehicleOwner(req);
}
boolean found = payer != null;
- ModelAndView mav = new ModelAndView("jsonView");
- mav.addObject("found", found);
- mav.addObject("rtpyrId", found ? payer.getRtpyrId() : null);
- mav.addObject("addrSn", found ? payer.getAddrSn() : null);
- mav.addObject("vehicle", found ? payer.getVehicleInfo() : null);
- return mav;
+ return new ModelAndView("jsonView")
+ .addObject("found", found)
+ .addObject("rtpyrId", found ? payer.getRtpyrId() : null)
+ .addObject("addrSn", found ? payer.getAddrSn() : null)
+ .addObject("vehicle", found ? payer.getVehicleInfo() : null);
}
/**납부자 정보를 반환한다.
@@ -159,20 +158,17 @@ public class PayerController extends ApplicationController {
@Task("CMN")
@RequestMapping(name="납부자 정보 조회", value=METHOD_URL.getCrdnPayerInfo)
public ModelAndView getCrdnPayerInfo(HttpServletRequest hReq, PayerQuery req) {
- boolean json = jsonResponse();
- ModelAndView mav = new ModelAndView(json ? "jsonView" : "fims/payer/payer01020-info");
-
DataObject payerInfo = payerService.getCrdnPayerInfo(req);
-
// View(jsp)에서 사용할 공통코드를 조회
Map> commonCodes = getCodesOf("FIM011", "FIM014");
- return mav
- .addObject("pageName", "payer01020") // jsp pageName
- .addObject("prefixUrl", CLASS_URL) // prefixUrl
- .addObject("FIM011List", commonCodes.get("FIM011")) // 납부자 구분 코드(RTPYR_SE_CD)
- .addObject("FIM014List", commonCodes.get("FIM014")) // 납부자 상태 코드(RTPYR_STTS_CD)
- .addObject("Info", json ? payerInfo : toJson(payerInfo))
+ boolean json = jsonResponse();
+ return new ModelAndView(json ? "jsonView" : "fims/payer/payer01020-info")
+ .addObject("pageName", "payer01020") // jsp pageName
+ .addObject("prefixUrl", CLASS_URL) // prefixUrl
+ .addObject("FIM011List", commonCodes.get("FIM011")) // 납부자 구분 코드(RTPYR_SE_CD)
+ .addObject("FIM014List", commonCodes.get("FIM014")) // 납부자 상태 코드(RTPYR_STTS_CD)
+ .addObject("Info", json ? payerInfo : toJson(payerInfo))
;
}
@@ -186,18 +182,11 @@ public class PayerController extends ApplicationController {
@Task("CMN")
@RequestMapping(name="단속 납부자 등록", value=METHOD_URL.createCrdnPayer)
public ModelAndView createCrdnPayer(Payer payer) {
- boolean saved = false;
String rtnMsg = payerService.createCrdnPayer(payer);
- if (rtnMsg.contains("[S]")) {
- saved = true;
- } else {
- saved = false;
- }
-
return new ModelAndView("jsonView")
- .addObject("saved", saved)
- .addObject("rtnMsg", rtnMsg);
+ .addObject("saved", rtnMsg.contains("[S]"))
+ .addObject("rtnMsg", rtnMsg);
}
/**납부자 변경 이력을 조회하여 반환한다.
@@ -225,16 +214,10 @@ public class PayerController extends ApplicationController {
@Task("CMN")
@RequestMapping(name="납부자, 납부자 주소 정보 조회", value=METHOD_URL.getLastPayerAddressInfo)
public ModelAndView getLastPayerAddressInfo(HttpServletRequest hReq, PayerQuery req) {
- ModelAndView mav = new ModelAndView("jsonView");
-
DataObject payerInfo = payerService.getLastPayerAddrInfo(req);
- boolean found = payerInfo != null;
-
- mav.addObject("found", found);
- mav.addObject("info", found ? payerInfo : null);
-
- return mav;
+ return new ModelAndView("jsonView")
+ .addObject("found", payerInfo != null)
+ .addObject("info", payerInfo);
}
-
-}
+}
\ No newline at end of file