diff --git a/src/main/java/cokr/xit/fims/crdn/Crdn.java b/src/main/java/cokr/xit/fims/crdn/Crdn.java
index b76695ec..5be6df67 100644
--- a/src/main/java/cokr/xit/fims/crdn/Crdn.java
+++ b/src/main/java/cokr/xit/fims/crdn/Crdn.java
@@ -202,41 +202,6 @@ public class Crdn extends AbstractEntity {
*/
private String useFuelCd;
- /**
- * 용도 구분 코드
- */
- private String usgSeCd;
-
- /**
- * 최대 적재 량
- */
- private String mxmmLoadQy;
-
- /**
- * 승차 정원 수
- */
- private String tkcarPsncpaCnt;
-
- /**
- * 차종 종별 명
- */
- private String carmdlAsortNm;
-
- /**
- * 차종 유형 명
- */
- private String carmdlTypeNm;
-
- /**
- * 차종 분류 명
- */
- private String carmdlClsfNm;
-
- /**
- * 말소 일자
- */
- private String ersrYmd;
-
/**
* 과태료 차종 코드
*/
@@ -257,26 +222,6 @@ public class Crdn extends AbstractEntity {
*/
private String ovtimeYn;
- /**
- * 검토 구분 코드
- */
- private String rvwSeCd;
-
- /**
- * 검토 처리 화면 명
- */
- private String rvwPrcsScrnNm;
-
- /**
- * 검토 일시
- */
- private String rvwDt;
-
- /**
- * 검토자
- */
- private String rvwr;
-
/**
* 과태료 금액
*/
diff --git a/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java b/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java
index 9b13edb2..9b40e4e2 100644
--- a/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java
+++ b/src/main/java/cokr/xit/fims/crdn/dao/Crdn05Mapper.java
@@ -31,10 +31,20 @@ public interface Crdn05Mapper extends AbstractMapper {
*/
int insertCrdn(Crdn crdn);
+ /**단속 부가 정보를 등록한다.
+ * @param params 파라미터
+ *
- "crdn" - 단속 부가 정보
+ * - "currentUser" - 현재 접속한 사용자
+ *
+ * @return 저장된 정보수
+ */
+ int insertCrdnAddition(Crdn crdn);
+
/**기본금액을 조회한다.
* {@link cokr.xit.fims.crdn.service.bean.Crdn05Bean#getBasicAmt(CrdnQuery)} 참고
* @param query 단속자료 정보
* @return 기본금액
*/
int selectBasicAmt(CrdnQuery query);
+
}
diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java
index 0fedc724..173bb338 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn05Bean.java
@@ -34,7 +34,19 @@ public class Crdn05Bean extends AbstractComponent {
*
*/
public boolean insertCrdn(Crdn crdn) {
- return crdn05Mapper.insertCrdn(crdn) == 1 ? true : false;
+
+ int effected = crdn05Mapper.insertCrdn(crdn);
+ if(effected != 1) {
+ return false;
+ }
+
+ effected = crdn05Mapper.insertCrdnAddition(crdn);
+ if(effected != 1) {
+ return false;
+ }
+
+ return true;
+
}
public int[] getBasicAmt(Crdn crdn) {
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
index 5455733c..328158ac 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn01-mapper.xml
@@ -32,17 +32,6 @@ SELECT C.CRDN_ID
, C.VIN
, C.VHCL_NM
, C.VHCL_COLOR
- , C.USG_SE_CD
- , C.MXMM_LOAD_QY
- , C.TKCAR_PSNCPA_CNT
- , C.CARMDL_ASORT_NM
- , C.CARMDL_TYPE_NM
- , C.CARMDL_CLSF_NM
- , C.ERSR_YMD
- , C.RVW_SE_CD
- , C.RVW_PRCS_SCRN_NM
- , C.RVW_DT
- , C.RVWR
, C.FFNLG_AMT
, C.FFNLG_RDUCT_RT
, C.LEVY_AMT
@@ -426,10 +415,10 @@ INSERT INTO TB_CRDN_CVLCPT (
/* 민원정보 수정(crdn01Mapper.updateCvlcpt) */
- UPDATE TB_CRDN
+ UPDATE TB_CRDN_CVLCPT
SET MDFCN_DT = /* 수정일시 */
, MDFR = #{modifiedBy} /* 수정자 */
- WHERE CRDN_ID = #{crdnId} /* 단속 ID */
+ WHERE CVLCPT_LINK_ID = #{linkId} /* 연계 ID */
\ No newline at end of file
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml
index 2b6dd636..e48eef47 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn05-mapper.xml
@@ -42,8 +42,9 @@ INSERT INTO TB_CRDN (
, SGG_CD
, CRDN_REG_SE_CD
, CRDN_INPT_SE_CD
+ , TASK_SE_CD
+ , LINK_NM
, LINK_ID
- , CRDN_SE_CD
, RTPYR_ID
, CRDN_YMD
, CRDN_TM
@@ -51,38 +52,13 @@ INSERT INTO TB_CRDN (
, CRDN_STDG_NM
, CRDN_ROAD_NM
, CRDN_PLC
- , DTL_CRDN_PLC
- , TEAM_ID
, VLTN_ID
- , CRDN_SPAREA_CD
- , CRDN_BGNG_TM
- , CRDN_END_HR
- , CRDN_SN
, GPS_X
, GPS_Y
- , MOSC_X
- , MOSC_Y
- , TOWNG_YN
, ATCH_FILE_CNT
, VIN
, VHCL_NM
, VHCL_COLOR
- , USE_FUEL_CD
- , USG_SE_CD
- , MXMM_LOAD_QY
- , TKCAR_PSNCPA_CNT
- , CARMDL_ASORT_NM
- , CARMDL_TYPE_NM
- , CARMDL_CLSF_NM
- , ERSR_YMD
- , FFNLG_CARMDL_CD
- , PARKNG_PSBLTY_RSLT_CD
- , VLTN_NMTM
- , OVTIME_YN
- , RVW_SE_CD
- , RVW_PRCS_SCRN_NM
- , RVW_DT
- , RVWR
, FFNLG_AMT
, FFNLG_RDUCT_RT
, LEVY_AMT
@@ -106,15 +82,14 @@ INSERT INTO TB_CRDN (
, DEL_DT
, DLTR
, DEL_RSN
- , TASK_SE_CD
- , LINK_NM
) VALUES (
#{crdnId}
, (SELECT SGG_CD FROM TB_SGG_INFO WHERE INST_CD = #{institute})
, #{crdnRegSeCd}
, #{crdnInptSeCd}
+ , #{taskSeCd}
+ , #{linkNm}
, #{linkId}
- , #{crdnSeCd}
, #{rtpyrId}
, #{crdnYmd}
, #{crdnTm}
@@ -122,8 +97,6 @@ INSERT INTO TB_CRDN (
, #{crdnStdgNm}
, #{crdnRoadNm}
, #{crdnPlc}
- , #{dtlCrdnPlc}
- , #{teamId}
, (SELECT B.VLTN_ID
FROM TB_SGG_INFO A
INNER JOIN TB_VLTN_INFO B
@@ -131,35 +104,12 @@ INSERT INTO TB_CRDN (
AND A.INST_CD = #{institute}
AND B.TASK_SE_CD = #{taskSeCd}
AND B.VLTN_CD = #{vltnCd})
- , #{crdnSpareaCd}
- , #{crdnBgngTm}
- , #{crdnEndHr}
- , #{crdnSn}
, #{gpsX}
, #{gpsY}
- , #{moscX}
- , #{moscY}
- , #{towngYn}
, #{atchFileCnt}
, #{vin}
, #{vhclNm}
, #{vhclColor}
- , #{useFuelCd}
- , #{usgSeCd}
- , #{mxmmLoadQy}
- , #{tkcarPsncpaCnt}
- , #{carmdlAsortNm}
- , #{carmdlTypeNm}
- , #{carmdlClsfNm}
- , #{ersrYmd}
- , #{ffnlgCarmdlCd}
- , #{parkngPsbltyRsltCd}
- , #{vltnNmtm}
- , #{ovtimeYn}
- , #{rvwSeCd}
- , #{rvwPrcsScrnNm}
- , #{rvwDt}
- , #{rvwr}
, #{ffnlgAmt}
, #{ffnlgRductRt}
, #{levyAmt}
@@ -183,8 +133,61 @@ INSERT INTO TB_CRDN (
, #{removedAt}
, #{removedBy}
, #{delRsn}
- , #{taskSeCd}
- , #{linkNm}
+)
+
+
+
+/* 단속 부가 정보 등록(crdn05Mapper.insertCrdnAddition) */
+INSERT INTO TB_CRDN (
+ CRDN_ID
+ , CRDN_SE_CD
+ , DTL_CRDN_PLC
+ , CRDN_SPAREA_CD
+ , CRDN_BGNG_TM
+ , CRDN_END_HR
+ , CRDN_SN
+ , MOSC_X
+ , MOSC_Y
+ , TOWNG_YN
+ , USE_FUEL_CD
+ , FFNLG_CARMDL_CD
+ , PARKNG_PSBLTY_RSLT_CD
+ , VLTN_NMTM
+ , OVTIME_YN
+ , TEAM_ID
+ , DEL_YN
+ , REG_DT
+ , RGTR
+ , MDFCN_DT
+ , MDFR
+ , DEL_DT
+ , DLTR
+ , DEL_RSN
+) VALUES (
+ #{crdnId}
+ , #{crdnSeCd}
+ , #{dtlCrdnPlc}
+ , #{crdnSpareaCd}
+ , #{crdnBgngTm}
+ , #{crdnEndHr}
+ , #{crdnSn}
+ , #{moscX}
+ , #{moscY}
+ , #{towngYn}
+ , #{useFuelCd}
+ , #{ffnlgCarmdlCd}
+ , #{parkngPsbltyRsltCd}
+ , #{vltnNmtm}
+ , #{ovtimeYn}
+ , #{teamId}
+ , 'N'
+ , #{createdAt}
+ , #{createdBy}
+ , #{lastModified}
+ , #{modifiedBy}
+ , #{removedAt}
+ , #{removedBy}
+ , #{delRsn}
)
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
index 99251e4d..68fe408c 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
@@ -34,21 +34,10 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -122,17 +111,6 @@ SELECT C.CRDN_ID
, C.VIN
, C.VHCL_NM
, C.VHCL_COLOR
- , C.USG_SE_CD
- , C.MXMM_LOAD_QY
- , C.TKCAR_PSNCPA_CNT
- , C.CARMDL_ASORT_NM
- , C.CARMDL_TYPE_NM
- , C.CARMDL_CLSF_NM
- , C.ERSR_YMD
- , C.RVW_SE_CD
- , C.RVW_PRCS_SCRN_NM
- , C.RVW_DT
- , C.RVWR
, C.FFNLG_AMT
, C.FFNLG_RDUCT_RT
, C.LEVY_AMT