From 409686923f0341f99396a2f4b209d9f41d46193e Mon Sep 17 00:00:00 2001 From: minuk926 Date: Fri, 27 Jan 2023 20:49:11 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EB=8B=A8=EC=86=8D=ED=98=84=ED=99=A9=20?= =?UTF-8?q?-=20=EC=9C=84=EB=B0=98=EC=A0=95=EB=B3=B4=20=ED=95=AD=EB=AA=A9?= =?UTF-8?q?=20=EC=A7=84=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 23 ++ db/FIMS_v0.2.erwin | Bin 472875 -> 473311 bytes src/main/java/kr/xit/fims/biz/FimsConst.java | 13 + .../fims/biz/cmm/model/FimsCrackdownDTO.java | 43 ++-- .../fims/biz/ec/model/CctvCrackdownDTO.java | 1 + .../ec/service/EcCctvCrackdownService.java | 1 + .../ec/service/EcNatlNewspaperService.java | 1 + .../java/kr/xit/fims/biz/rt/model/RtDTO.java | 13 +- .../biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml | 2 + .../ec/ec-extrl-reglt-cntc-mysql-mapper.xml | 2 + .../biz/rt/rt-reglt-and-erpp-mysql-mapper.xml | 4 + .../fims/biz/cmm/cmmFimsCrackdownMgtPopup.jsp | 227 ++++------------- .../cmm/cmmFimsCrackdownMgtPopup_backup.jsp | 237 ++++++------------ .../biz/cmm/cmmFimsCrackdownMgtPopup_tab0.jsp | 108 ++------ 14 files changed, 236 insertions(+), 439 deletions(-) diff --git a/README.md b/README.md index 61d10dd6..c1cb365b 100644 --- a/README.md +++ b/README.md @@ -278,3 +278,26 @@ let gridInfo = ${gridInfo}; keyColumn="extrlRegltCntcId,regltId" keyProperty="extrlRegltCntcId,regltId" --> ``` + +## 상속 구조의 lombok builder 사용 -> @SuperBuilder 사용해야 한다 +```java + + @Data + @NoArgsConstructor + @AllArgsConstructor // 반드시 필요 + @SuperBuilder + public static class Parents { + private String regltId; + private String vhcleNo; + } + + @Data + @EqualsAndHashCode(callSuper = true) + @NoArgsConstructor + @AllArgsConstructor + @SuperBuilder + public static class Child extends Parents { + private String regltId; + private String vhcleNo; + } +``` diff --git a/db/FIMS_v0.2.erwin b/db/FIMS_v0.2.erwin index 36cecb6aafc300d5db6262d69905200d81428603..5990d5f11216a66e8222c550c2add21f67ce46ce 100644 GIT binary patch delta 384 zcmZ4ePUikcnGGI{jFyu<88tQ485kItvX!b*mi0I^?ClU$)Z6U|6k>Q$dD7H(f|~o< zF0Dly3|${GEG}kb)&{Bmj!pS@4E38!SeElJCU2Gz?3%!+G5PPJepLm21_l8}1_m)8 zmH=WYApUkuTfyNs1A{jMg9gy>)eMt2ER>pDxTrw@r21Qf4qO&w1d{^)=B~wCjM!Nj z6db-O@J}w>FFn0pmq|)M=g96EDq5FZo5jM7n9gdNP8NJBH+`)KixRsc$Q%X!=@aEx z)a1;K8NL}XGJtGkW?(40p|BzLqNLA4j}3Frtds4XzR{hnn9RBg+aR6>RP+i zHAWz2+HQ4?d0Pe#7to0tejI&$iB}T^S^J>`&w?C_9bKMO93#5O( delta 166 zcmccrQD*f!nGGI{jDnLr88sPI7tdy7W>npLjAc0wW8&sK!LA96>XUyi?4R7TNSaNZ zfq`K)!{mg;Qj?D_YT)_SprhdMn}NZbfdQ;$^Q*<1jG9kfZ$EXN5r~<#pSsSxDT9v( zsB6QIqpy$L+WOSfWqXGMOMn=o%J#-^mP)4S2H`Aq(|<*>^e}DZZtsX<0b AND trr.reglt_se_code = #{regltSeCode} + + + AND trr.regist_se_code = #{registSeCode} diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownMgtPopup.jsp index 9b5b8162..03ed2cc1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownMgtPopup.jsp @@ -38,125 +38,56 @@ Date Author Description

위반정보

- <%-- - +
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
위반정보 상세
등록구분"> - 자료출처
단속일 - - - 차량번호
단속구분 - - 위반내역 - -
단속장소
등록일시 - - -
- - - + - - - - + + + + - - - - - - - - + + + + + - + - - + + + - - - + - + - - - - - - - - +
위반횟수 - - 시군구 - - 법정동등록구분자료출처단속일시 - + +
사전통지금액차량번호 - + 부과금액 - + 단속자 + + 위반장소
감액금액 - - 총수납액발행번호 - + 잔액견인지시 - -
특이사항 - -
처리상태 - +
- --%> + - + @@ -167,116 +98,64 @@ Date Author Description - - - - - - - - - + - + - + - - - - - + - - - - - - - + - - - - - - - - - + - + - - - - - - - + - + - - - - + - + -<%-- --%> -<%-- --%>
상세위반정보 상세2
기관코드과태료코드단속구분
차량번호차종 - + 단속일시군구 - - + 위반횟수법정동 - +
단속장소단속시작시간 - - - 단속종료시간사전통지금액 - - +
위반법규위반내역처리상태부과금액 - +
감경금액 감경후 금액 - - 수납금액 - -
감액 - - 가산금총수납액 - + 입력구분잔액 - +
특이사항
차량명 - - 차종분류코드특기사항 - + 차종종별코드처리상태 - + + +
등록일시 - - - 최종처리일시특별단속구역 - - + 최종처리자위반내용 - + 등록자
diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownMgtPopup_backup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownMgtPopup_backup.jsp index 90607e8d..41d5e557 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownMgtPopup_backup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownMgtPopup_backup.jsp @@ -38,132 +38,15 @@ Date Author Description

위반정보

- <%-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
등록구분"> - 자료출처
단속일 - - - 차량번호
단속구분 - - 위반내역 - -
단속장소
등록일시 - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
위반횟수 - - 시군구 - - 법정동 - -
사전통지금액 - - 부과금액 - -
감액금액 - - 총수납액 - - 잔액 - -
특이사항 - -
처리상태 - -
- --%> - - - - - - + + + + + + @@ -182,25 +65,25 @@ Date Author Description + + - - - + @@ -208,59 +91,75 @@ Date Author Description - - + + + - - - - + + + + + - - + + + - + + <%-- --%> + <%-- --%>
상세
단속일 - + + 위반횟수 + 입력구분
단속장소 단속시작시간 -<%-- --%> -<%-- --%> - + 단속종료시간 - +
위반내역 위반횟수 - + 처리상태 +
감경금액 - + 감경후 금액 - + 수납금액 - +
감액 - + 가산금 - + + 입력구분 +
특이사항
처리상태등록일시차량명 - - + + 차종분류코드 + + 차종종별코드 + 등록자
등록일시 + + + 최종처리일시 - + 최종처리자 + + 등록자
@@ -547,7 +446,11 @@ Date Author Description