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 76534374..8372bc4a 100644 --- a/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java +++ b/src/main/java/cokr/xit/fims/sprt/web/Sprt02Controller.java @@ -365,7 +365,7 @@ public class Sprt02Controller extends ApplicationController { // 단속 납부자 이력(TB_CRDN_PAYER_HSTRY) 조회 CrdnPayerHstryQuery crdnPayerHstryQuery = new CrdnPayerHstryQuery(); crdnPayerHstryQuery.setCrdnId(req.getCrdnId()); - crdnPayerHstryQuery.setOrderBy("CPH.REG_DT DESC, CPH.CHG_HSTRY_ID DESC"); + crdnPayerHstryQuery.setOrderBy("PH.REG_DT DESC, PH.RTPYR_ID DESC, PH.HSTRY_SN DESC"); List crdnPayerHstry = crdnPayerHstryService.getCrdnPayerHstrys(crdnPayerHstryQuery); diff --git a/src/main/resources/sql/mapper/fims/cmmn/crdnPayerHstry-mapper.xml b/src/main/resources/sql/mapper/fims/cmmn/crdnPayerHstry-mapper.xml index 091e8a07..c0a1a66d 100644 --- a/src/main/resources/sql/mapper/fims/cmmn/crdnPayerHstry-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cmmn/crdnPayerHstry-mapper.xml @@ -26,6 +26,9 @@ , PH.RTPYR_NM /* 납부자 명 */ , PH.ZIP /* 우편번호 */ , PH.WHOL_ADDR /* 전체 주소 */ + , PH.REG_DT AS PH_REG_DT /* 등록 일시 */ + , PH.RGTR AS PH_RGTR /* 등록자 */ + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = PH.RGTR) AS PH_RGTR_NM /* 등록자 명 */ FROM TB_CRDN_PAYER_HSTRY CPH INNER JOIN TB_PAYER_HSTRY PH ON (CPH.RTPYR_ID = PH.RTPYR_ID) diff --git a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml index 181ea6fb..ff3631dd 100644 --- a/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml +++ b/src/main/resources/sql/mapper/fims/sprt/totalInfo-mapper.xml @@ -21,7 +21,7 @@ LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N') /* 부과 대장 */ - /* 개별총정보 조회(sprt02Mapper.selectCrdnInfo) */ WHERE C.CRDN_ID = #{crdnId} /* 단속 ID */ @@ -116,6 +116,9 @@ , P.ZIP /* 우편번호 */ , P.ADDR /* 주소 */ , P.DTL_ADDR /* 상세 주소 */ + , P.WHOL_ADDR /* 전체 주소 */ + , P.MDFCN_DT AS P_MDFCN_DT /* 수정 일시 */ + , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = P.MDFR) AS P_MDFR_NM /* 수정자 명 */ , CC.CVLCPT_APLY_SE_CD /* 민원 신청 구분 코드 */ , CC.DSTRBNC_YN /* 1면 방해 여부 */ , CC.CVLCPT_RCPT_YMD /* 민원 접수 일자 */ diff --git a/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp index 55f3af0f..634cb3eb 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp @@ -177,6 +177,8 @@ let create = isEmpty(info.rtpyrId); + info.rtpyrInptSeCd = "01"; // 납부자 입력 구분 코드 + ajax.post({ url : !create ? ${pageName}Control.urls.update : ${pageName}Control.urls.create , data : info diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp index 0fb8fc99..d0ca3265 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp @@ -243,18 +243,28 @@
- +
- -
- - - + +
+ + +
+ +
+ + +
+ +
+ +
- +
- - + + +
@@ -263,13 +273,13 @@
- - + +
- - + +
@@ -335,6 +345,7 @@ , SUM_AMT : numberFormat // 합계 금액 , CRDN_BGNG_TM : timeFormat , CRDN_END_TM : timeFormat + , P_MDFCN_DT : datetimeFormat } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp index fd148cbd..0e857baa 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp @@ -150,28 +150,30 @@