DBNT
/
FAICS
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.157:3000/DBNT/FAICS

master
강석 최 2022-04-20 09:57:32 +09:00
parent 12e5867ff9 bac8ab8220
commit 07830d7c57
3 changed files with 135 additions and 856 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/kcg/faics/arrest/service/impl/ArrestServiceImpl.java
View File

@ -74,7 +74,7 @@ public class ArrestServiceImpl implements ArrestService {
// //
if(!arrestVO.getShipProcType().equals("01")){ if(!arrestVO.getShipProcType().equals("01")){
arrestVO.setCommissionCost(""); arrestVO.setCommissionCost(0);
} }
if(arrestVO.getMarginPaymentYn().equals("N")){ if(arrestVO.getMarginPaymentYn().equals("N")){
@ -101,7 +101,7 @@ public class ArrestServiceImpl implements ArrestService {
HashMap<String, Object> result = new HashMap<String, Object>(); HashMap<String, Object> result = new HashMap<String, Object>();
if(!arrestVO.getShipProcType().equals("01")){ if(!arrestVO.getShipProcType().equals("01")){
arrestVO.setCommissionCost(""); arrestVO.setCommissionCost(0);
} }
if(arrestVO.getMarginPaymentYn().equals("N")){ if(arrestVO.getMarginPaymentYn().equals("N")){

900
src/main/java/kcg/faics/arrest/vo/ArrestVO.java
View File

File diff suppressed because it is too large Load Diff

75
src/main/resources/sqlmapper/mappers/arrest/arrest.xml
View File

@ -270,15 +270,12 @@
A.ADDR_DTL , A.ADDR_DTL ,
A.VLTN_TYPE , A.VLTN_TYPE ,
B.CODENM || ' (' || A.VLTN_DTL || ')' VLTN_DTL, B.CODENM || ' (' || A.VLTN_DTL || ')' VLTN_DTL,
DECODE(A.IVSN_TYPE, 'YRB2', '1', '') IVSN_TYPE1, case A.IVSN_TYPE when 'YRB2' then '1' else '' end IVSN_TYPE1,
DECODE(A.IVSN_TYPE, 'YRD1', '1', '') IVSN_TYPE2, case A.IVSN_TYPE when 'YRD1' then '1' else '' end IVSN_TYPE2,
DECODE(A.IVSN_TYPE, 'YRA1', '1', '') IVSN_TYPE3, case A.IVSN_TYPE when 'YRA1' then '1' else '' end IVSN_TYPE3,
DECODE(A.IVSN_TYPE, 'YRB1', '1', '') IVSN_TYPE4, case A.IVSN_TYPE when 'YRB1' then '1' else '' end IVSN_TYPE4,
case A.SPEC_BATL_YN when 'Y' then '1' else '' end SPEC_BATL_YN,
case A.NLL_YN when 'Y' then '1' else '' end NLL_YN,
DECODE(A.SPEC_BATL_YN, 'Y', '1' , '') SPEC_BATL_YN,
DECODE(A.NLL_YN, 'Y', '1' , '') NLL_YN,
A.AGENCY_TYPE , A.AGENCY_TYPE ,
A.AGENCY_GUARD , A.AGENCY_GUARD ,
G.CODENM AGENCY_GUARD_STR , G.CODENM AGENCY_GUARD_STR ,
@ -300,20 +297,21 @@
A.VIO_CNT , A.VIO_CNT ,
A.VIO_PRTD_AMT , A.VIO_PRTD_AMT ,
A.PROC_COND , A.PROC_COND ,
DECODE(A.PROC_COND, '02', '1', '') PROC_COND_Y, case A.PROC_COND when '02' then '1' else '' end PROC_COND_Y,
DECODE(A.PROC_COND, '01', '1', '') PROC_COND_N, case A.PROC_COND when '01' then '1' else '' end PROC_COND_N,
A.MRGN_PYMT_YN , A.MRGN_PYMT_YN ,
case when A.MRGN_PYMT_YN != null then 'Y' end MRGN_PYMT_AMT,
DECODE(A.MRGN_PYMT_YN, 'Y', A.MRGN_PYMT_AMT, '' ) MRGN_PYMT_AMT, case when A.MRGN_PYMT_AMT != null then '' end MRGN_PYMT_AMT,
DECODE(A.MRGN_PYMT_YN, 'N', A.MRGN_PYMT_AMT, '' ) NO_MRGN_PYMT_AMT, case when A.MRGN_PYMT_YN != null then 'N' end NO_MRGN_PYMT_AMT,
TO_CHAR(MRGN_PYMT_DATE, 'YYYY-MM-DD hh24:mi') MRGN_PYMT_DATE , case when A.MRGN_PYMT_AMT != null then '' end NO_MRGN_PYMT_AMT,
DECODE(A.MRGN_PYMT_YN, 'N', '1', '') NOT_PAYMENT, TO_CHAR(MRGN_PYMT_DATE, 'YYYY-MM-DD hh24:mi') MRGN_PYMT_DATE ,
A.SHIP_PROC_TYPE , case A.MRGN_PYMT_YN when 'N' then '1' else '' end NOT_PAYMENT,
DECODE(A.SHIP_PROC_TYPE, '01', '1', '') SHIP_PROC_TYPE_A, A.SHIP_PROC_TYPE ,
DECODE(A.SHIP_PROC_TYPE, '02', '1', '') SHIP_PROC_TYPE_B, case A.SHIP_PROC_TYPE when '01' then '1' else '' end SHIP_PROC_TYPE_A,
DECODE(A.SHIP_PROC_TYPE, '03', '1', '') SHIP_PROC_TYPE_C, case A.SHIP_PROC_TYPE when '02' then '1' else '' end SHIP_PROC_TYPE_B,
DECODE(A.SHIP_PROC_TYPE, '04', '1', '') SHIP_PROC_TYPE_D, case A.SHIP_PROC_TYPE when '03' then '1' else '' end SHIP_PROC_TYPE_C,
DECODE(A.SHIP_PROC_TYPE, '05', '1', '') SHIP_PROC_TYPE_E, case A.SHIP_PROC_TYPE when '04' then '1' else '' end SHIP_PROC_TYPE_D,
case A.SHIP_PROC_TYPE when '05' then '1' else '' end SHIP_PROC_TYPE_E,
A.SHIP_CMSN_COST, A.SHIP_CMSN_COST,
A.DTTN_CAP_CNT , A.DTTN_CAP_CNT ,
@ -325,7 +323,7 @@
F.CODENM WO_DTTN_STR, F.CODENM WO_DTTN_STR,
TO_CHAR(A.FIELD_ARST_DATE, 'YYYY-MM-DD hh24:mi') FIELD_ARST_DATE, TO_CHAR(A.FIELD_ARST_DATE, 'YYYY-MM-DD hh24:mi') FIELD_ARST_DATE,
TO_CHAR(A.FIELD_RLS_DATE, 'YYYY-MM-DD hh24:mi') FIELD_RLS_DATE , TO_CHAR(A.FIELD_RLS_DATE, 'YYYY-MM-DD hh24:mi') FIELD_RLS_DATE ,
DECODE(A.FIELD_ARST_DATE, NULL, '', '1') FIELD_CNT, case A.FIELD_ARST_DATE when NULL then '' else '1' end FIELD_CNT,
A.LEAD_DISTANCE , A.LEAD_DISTANCE ,
A.LEAD_HOUR , A.LEAD_HOUR ,
A.LEAD_MINUTE , A.LEAD_MINUTE ,
@ -337,22 +335,25 @@
A.REG_DATE , A.REG_DATE ,
A.REG_USER , A.REG_USER ,
A.REG_AGENCY A.REG_AGENCY
FROM T_CHN_ARREST_INFO A, FROM
TCODE B , -- 위반내용 T_CHN_ARREST_INFO A
(SELECT CODE, UP_CODE, CODE_NM FROM CD_CODE C WHERE GP_CODE = 'A001' ) C, -- 시군구 right outer join
TCODE D , -- 선적 (SELECT CODE1, CODE2, CODENM
TCODE E , -- 선종 FROM TCODE WHERE CODE1 = 'C001') G
(SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'T005' ) F , -- 무혐의불구속 on g.code2 = a.agency_guard,
(SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'C001' ) G , -- TCODE B ,
(SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'T004' ) H , -- 선질 (SELECT CODE, UP_CODE, CODE_NM FROM CD_CODE C WHERE GP_CODE = 'A001' ) C,
(SELECT CODE, UP_CODE, CODE_NM FROM CD_CODE C WHERE GP_CODE = 'A001' AND UP_CODE ='0000' ) I -- 특별광역시도 TCODE D ,
TCODE E ,
(SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'T005' ) F ,
(SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'T004' ) H ,
(SELECT CODE, UP_CODE, CODE_NM FROM CD_CODE C WHERE GP_CODE = 'A001' AND UP_CODE ='0000' ) I
WHERE A.DEL_YN = 'N' WHERE A.DEL_YN = 'N'
AND (A.VLTN_TYPE = B.CODE2 AND B.CODE1 = 'T003') AND (A.VLTN_TYPE = B.CODE2 AND B.CODE1 = 'T003')
AND (A.ADDR_CITY = C.CODE AND A.ADDR_AREA = C.UP_CODE) AND (A.ADDR_CITY = C.CODE AND A.ADDR_AREA = C.UP_CODE)
AND (A.SHIP_MENT = D.CODE2 AND D.CODE1 = 'SSRR') AND (A.SHIP_MENT = D.CODE2 AND D.CODE1 = 'SSRR')
AND (A.SHIP_TYPE = E.CODE2 AND E.CODE1 = 'FA81') AND (A.SHIP_TYPE = E.CODE2 AND E.CODE1 = 'FA81')
AND A.WO_DTTN_TYPE = F.CODE2 AND A.WO_DTTN_TYPE = F.CODE2
AND G.CODE2(+) = A.AGENCY_GUARD
AND A.SHIP_QLTY = H.CODE2 AND A.SHIP_QLTY = H.CODE2
AND A.ADDR_AREA = I.CODE AND A.ADDR_AREA = I.CODE
]]> ]]>
@ -1520,7 +1521,7 @@
REG_AGENCY REG_AGENCY
) VALUES ( ) VALUES (
T_CHN_ARREST_INFO_ID_SEQ.NEXTVAL, nextval('chn_arrest_bd_seq'),
TO_DATE(#{arrestDate}, 'YYYY-MM-DD hh24:mi'), TO_DATE(#{arrestDate}, 'YYYY-MM-DD hh24:mi'),
#{agencyType}, #{agencyType},
#{agencyGuard}, #{agencyGuard},
@ -1535,8 +1536,8 @@
TO_DATE(#{fieldArrestDate}, 'YYYY-MM-DD hh24:mi'), TO_DATE(#{fieldArrestDate}, 'YYYY-MM-DD hh24:mi'),
TO_DATE(#{fieldReleaseDate}, 'YYYY-MM-DD hh24:mi'), TO_DATE(#{fieldReleaseDate}, 'YYYY-MM-DD hh24:mi'),
COALESCE(#{leadDistance}, 0), COALESCE(#{leadDistance}, 0),
COALESCE(#{leadHour}, 0), COALESCE(#{leadHour}, '0'),
COALESCE(#{leadMinute}, 0), COALESCE(#{leadMinute}, '0'),
COALESCE(#{captainCount}, 0), COALESCE(#{captainCount}, 0),
COALESCE(#{mateCount}, 0), COALESCE(#{mateCount}, 0),
COALESCE(#{engineerCount}, 0), COALESCE(#{engineerCount}, 0),
@ -1573,7 +1574,7 @@
TO_DATE(#{marginPaymentDate}, 'YYYY-MM-DD hh24:mi'), TO_DATE(#{marginPaymentDate}, 'YYYY-MM-DD hh24:mi'),
#{status}, #{status},
#{delYn}, #{delYn},
NOW(), NOW(),
#{regUser}, #{regUser},
#{regAgency} #{regAgency}