From 970df1cd479f4778ac9e065e14db403179d88fa6 Mon Sep 17 00:00:00 2001 From: Hyung Geun Date: Wed, 20 Apr 2022 09:05:32 +0900 Subject: [PATCH] =?UTF-8?q?arrestvo=20=EC=88=98=EC=A0=95,=20getArrestList?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ArrestServiceImpl.java | 4 +- .../java/kcg/faics/arrest/vo/ArrestVO.java | 902 ++---------------- .../sqlmapper/mappers/arrest/arrest.xml | 85 +- 3 files changed, 135 insertions(+), 856 deletions(-) diff --git a/src/main/java/kcg/faics/arrest/service/impl/ArrestServiceImpl.java b/src/main/java/kcg/faics/arrest/service/impl/ArrestServiceImpl.java index 9cb4f3c..7cd3af5 100644 --- a/src/main/java/kcg/faics/arrest/service/impl/ArrestServiceImpl.java +++ b/src/main/java/kcg/faics/arrest/service/impl/ArrestServiceImpl.java @@ -74,7 +74,7 @@ public class ArrestServiceImpl implements ArrestService { // if(!arrestVO.getShipProcType().equals("01")){ - arrestVO.setCommissionCost(""); + arrestVO.setCommissionCost(0); } if(arrestVO.getMarginPaymentYn().equals("N")){ @@ -101,7 +101,7 @@ public class ArrestServiceImpl implements ArrestService { HashMap result = new HashMap(); if(!arrestVO.getShipProcType().equals("01")){ - arrestVO.setCommissionCost(""); + arrestVO.setCommissionCost(0); } if(arrestVO.getMarginPaymentYn().equals("N")){ diff --git a/src/main/java/kcg/faics/arrest/vo/ArrestVO.java b/src/main/java/kcg/faics/arrest/vo/ArrestVO.java index cc76cab..9ff4132 100644 --- a/src/main/java/kcg/faics/arrest/vo/ArrestVO.java +++ b/src/main/java/kcg/faics/arrest/vo/ArrestVO.java @@ -8,13 +8,14 @@ package kcg.faics.arrest.vo; * 수정일 수정자 수정내용 * ------------- -------- --------------------------- * 2017. 3. 13. 이영호 최초생성 + * * */ public class ArrestVO { /** * 중국어선 나포정보 ID. */ - private String arrestId = ""; + private int arrestId = 0; /** * 나포일시 */ @@ -110,23 +111,23 @@ public class ArrestVO { /** * 침범유형1 */ - private int invasionType1 = 0; + private String invasionType1 = ""; /** * 침범유형2 */ - private int invasionType2 = 0; + private String invasionType2 = ""; /** * 침범유형3 */ - private int invasionType3 = 0; + private String invasionType3 = ""; /** * 침범유형4 */ - private int invasionType4 = 0; + private String invasionType4 = ""; /** * 침범유형5 */ - private int invasionType5 = 0; + private String invasionType5 = ""; /** * 선박처리유형(위탁관리) */ @@ -174,7 +175,7 @@ public class ArrestVO { /** * 거리 */ - private String leadDistance = ""; + private int leadDistance = 0; /** * 소요시간 */ @@ -206,15 +207,15 @@ public class ArrestVO { /** * 위탁관리비 */ - private String commissionCost = ""; + private int commissionCost = 0; /** * 어구압수-틀 */ - private String gearCast = ""; + private double gearCast = 0; /** * 어구압수-폭 */ - private String gearWidth = ""; + private double gearWidth = 0; /** * 어구압수-기타 */ @@ -262,7 +263,7 @@ public class ArrestVO { /** * 선박제원-톤수 */ - private String shipTonnage = ""; + private double shipTonnage = 0; /** * 선박제원-선원수 */ @@ -387,1485 +388,760 @@ public class ArrestVO { /** * NLL건수 */ - private int nllCnt = 0; - - - /** - * @return the specBatlCnt - */ - public int getSpecBatlCnt() { - return specBatlCnt; - } - /** - * @param specBatlCnt the specBatlCnt to set - */ - public void setSpecBatlCnt(int specBatlCnt) { - this.specBatlCnt = specBatlCnt; - } - /** - * @return the procCondNCnt - */ - public int getNllCnt() { - return nllCnt; - } - /** - * @param nllCnt the nllCnt to set - */ - public void setNllCnt(int nllCnt) { - this.nllCnt = nllCnt; - } - /** - * @return the procCondNCnt - */ - public int getProcCondNCnt() { - return procCondNCnt; - } - /** - * @param procCondNCnt the procCondNCnt to set - */ - public void setProcCondNCnt(int procCondNCnt) { - this.procCondNCnt = procCondNCnt; - } - /** - * @return the procCondYCnt - */ - public int getProcCondYCnt() { - return procCondYCnt; - } - /** - * @param procCondYCnt the procCondYCnt to set - */ - public void setProcCondYCnt(int procCondYCnt) { - this.procCondYCnt = procCondYCnt; - } - /** - * @return the totalCnt - */ - public int getTotalCnt() { - return totalCnt; - } - /** - * @param totalCnt the totalCnt to set - */ - public void setTotalCnt(int totalCnt) { - this.totalCnt = totalCnt; - } - /** - * @return the addrAreaStr - */ - public String getAddrAreaStr() { - return addrAreaStr; - } - /** - * @param addrAreaStr the addrAreaStr to set - */ - public void setAddrAreaStr(String addrAreaStr) { - this.addrAreaStr = addrAreaStr; - } + private int nllCnt = 0; - /** - * @return the notPayment - */ - public String getNotPayment() { - return notPayment; - } - /** - * @param notPayment the notPayment to set - */ - public void setNotPayment(String notPayment) { - this.notPayment = notPayment; - } - /** - * @return the arrestId - */ - public String getArrestId() { + public int getArrestId() { return arrestId; } - /** - * @param arrestId the arrestId to set - */ - public void setArrestId(String arrestId) { + public void setArrestId(int arrestId) { this.arrestId = arrestId; } - - /** - * @return the arrestDate - */ public String getArrestDate() { return arrestDate; } - - /** - * @param arrestDate the arrestDate to set - */ public void setArrestDate(String arrestDate) { this.arrestDate = arrestDate; } - - /** - * @return the agencyType - */ public String getAgencyType() { return agencyType; } - - /** - * @param agencyType the agencyType to set - */ public void setAgencyType(String agencyType) { this.agencyType = agencyType; } - - /** - * @return the agencyGuard - */ public String getAgencyGuard() { return agencyGuard; } - - /** - * @param arrestId the arrestId to set - */ public void setAgencyGuard(String agencyGuard) { this.agencyGuard = agencyGuard; } - - /** - * @return the agencyVessel - */ public String getAgencyVessel() { return agencyVessel; } - - /** - * @param agencyVessel the agencyVessel to set - */ public void setAgencyVessel(String agencyVessel) { this.agencyVessel = agencyVessel; } - - /** - * @return the procCondition - */ public String getProcCondition() { return procCondition; } - - /** - * @param procCondition the procCondition to set - */ public void setProcCondition(String procCondition) { this.procCondition = procCondition; } - - /** - * @return the violateType - */ public String getViolateType() { return violateType; } - - /** - * @param violateType the violateType to set - */ public void setViolateType(String violateType) { this.violateType = violateType; } - - /** - * @return the agencyType - */ public String getViolateDetail() { return violateDetail; } - - /** - * @param violateDetail the violateDetail to set - */ public void setViolateDetail(String violateDetail) { this.violateDetail = violateDetail; } - - /** - * @return the invasionType - */ public String getInvasionType() { return invasionType; } - - /** - * @param invasionType the invasionType to set - */ public void setInvasionType(String invasionType) { this.invasionType = invasionType; } - - /** - * @return the invasion1 - */ public String getInvasion1() { return invasion1; } - - /** - * @param invasion1 the invasion1 to set - */ public void setInvasion1(String invasion1) { this.invasion1 = invasion1; } - - /** - * @return the invasion2 - */ public String getInvasion2() { return invasion2; } - - /** - * @param invasion2 the invasion2 to set - */ public void setInvasion2(String invasion2) { this.invasion2 = invasion2; } - - /** - * @return the invasion3 - */ public String getInvasion3() { return invasion3; } - - /** - * @param invasion3 the invasion3 to set - */ public void setInvasion3(String invasion3) { this.invasion3 = invasion3; } - - /** - * @return the invasion4 - */ public String getInvasion4() { return invasion4; } - - /** - * @param invasion4 the invasion4 to set - */ public void setInvasion4(String invasion4) { this.invasion4 = invasion4; } - - /** - * @return the procCondY - */ public String getProcCondY() { return procCondY; } - - /** - * @param procCondY the procCondY to set - */ public void setProcCondY(String procCondY) { this.procCondY = procCondY; } - - /** - * @return the procCondN - */ public String getProcCondN() { return procCondN; } - - /** - * @param procCondN the procCondN to set - */ public void setProcCondN(String procCondN) { this.procCondN = procCondN; } + public int getProcCondNCnt() { + return procCondNCnt; + } + + public void setProcCondNCnt(int procCondNCnt) { + this.procCondNCnt = procCondNCnt; + } + + public int getProcCondYCnt() { + return procCondYCnt; + } + + public void setProcCondYCnt(int procCondYCnt) { + this.procCondYCnt = procCondYCnt; + } - /** - * @return the noMarginPaymentAmt - */ public String getNoMarginPaymentAmt() { return noMarginPaymentAmt; } - - /** - * @param noMarginPaymentAmt the noMarginPaymentAmt to set - */ public void setNoMarginPaymentAmt(String noMarginPaymentAmt) { this.noMarginPaymentAmt = noMarginPaymentAmt; } - - /** - * @return the shipProcTypeA - */ public String getShipProcTypeA() { return shipProcTypeA; } - - /** - * @param shipProcTypeA the shipProcTypeA to set - */ public void setShipProcTypeA(String shipProcTypeA) { this.shipProcTypeA = shipProcTypeA; } - - /** - * @return the shipProcTypeB - */ public String getShipProcTypeB() { return shipProcTypeB; } - - /** - * @param shipProcTypeB the shipProcTypeB to set - */ public void setShipProcTypeB(String shipProcTypeB) { this.shipProcTypeB = shipProcTypeB; } - - /** - * @return the shipProcTypeC - */ public String getShipProcTypeC() { return shipProcTypeC; } - - /** - * @param shipProcTypeC the shipProcTypeC to set - */ public void setShipProcTypeC(String shipProcTypeC) { this.shipProcTypeC = shipProcTypeC; } - - /** - * @return the shipProcTypeD - */ public String getShipProcTypeD() { return shipProcTypeD; } - - /** - * @param shipProcTypeD the shipProcTypeD to set - */ public void setShipProcTypeD(String shipProcTypeD) { this.shipProcTypeD = shipProcTypeD; } - - /** - * @return the shipProcTypeE - */ public String getShipProcTypeE() { return shipProcTypeE; } - - /** - * @param shipProcTypeE the shipProcTypeE to set - */ public void setShipProcTypeE(String shipProcTypeE) { this.shipProcTypeE = shipProcTypeE; } - - /** - * @return the detentionTotalCnt - */ public String getDetentionTotalCnt() { return detentionTotalCnt; } - - /** - * @param detentionTotalCnt the detentionTotalCnt to set - */ public void setDetentionTotalCnt(String detentionTotalCnt) { this.detentionTotalCnt = detentionTotalCnt; } - - /** - * @return the invasionType1 - */ - public int getInvasionType1() { + public String getInvasionType1() { return invasionType1; } - - /** - * @param invasionType1 the invasionType1 to set - */ - public void setInvasionType1(int invasionType1) { + public void setInvasionType1(String invasionType1) { this.invasionType1 = invasionType1; } - - /** - * @return the invasionType2 - */ - public int getInvasionType2() { + public String getInvasionType2() { return invasionType2; } - - /** - * @param invasionType2 the invasionType2 to set - */ - public void setInvasionType2(int invasionType2) { + public void setInvasionType2(String invasionType2) { this.invasionType2 = invasionType2; } - - /** - * @return the invasionType3 - */ - public int getInvasionType3() { + public String getInvasionType3() { return invasionType3; } - - /** - * @param invasionType3 the invasionType3 to set - */ - public void setInvasionType3(int invasionType3) { + public void setInvasionType3(String invasionType3) { this.invasionType3 = invasionType3; } - - /** - * @return the invasionType4 - */ - public int getInvasionType4() { + public String getInvasionType4() { return invasionType4; } - - /** - * @param invasionType4 the invasionType4 to set - */ - public void setInvasionType4(int invasionType4) { + public void setInvasionType4(String invasionType4) { this.invasionType4 = invasionType4; } - - /** - * @return the invasionType5 - */ - public int getInvasionType5() { + public String getInvasionType5() { return invasionType5; } - - /** - * @param invasionType5 the invasionType5 to set - */ - public void setInvasionType5(int invasionType5) { + public void setInvasionType5(String invasionType5) { this.invasionType5 = invasionType5; } - - /** - * @return the shipProcType1 - */ public String getShipProcType1() { return shipProcType1; } - - /** - * @param shipProcType1 the shipProcType1 to set - */ public void setShipProcType1(String shipProcType1) { this.shipProcType1 = shipProcType1; } - - /** - * @return the shipProcType2 - */ public String getShipProcType2() { return shipProcType2; } - - /** - * @param shipProcType2 the shipProcType2 to set - */ public void setShipProcType2(String shipProcType2) { this.shipProcType2 = shipProcType2; } - - /** - * @return the shipProcType3 - */ public String getShipProcType3() { return shipProcType3; } - - /** - * @param shipProcType3 the shipProcType3 to set - */ public void setShipProcType3(String shipProcType3) { this.shipProcType3 = shipProcType3; } - - /** - * @return the shipProcType4 - */ public String getShipProcType4() { return shipProcType4; } - - /** - * @param shipProcType4 the shipProcType4 to set - */ public void setShipProcType4(String shipProcType4) { this.shipProcType4 = shipProcType4; } - - /** - * @return the shipProcType5 - */ public String getShipProcType5() { return shipProcType5; } - - /** - * @param shipProcType5 the shipProcType5 to set - */ public void setShipProcType5(String shipProcType5) { this.shipProcType5 = shipProcType5; } - - /** - * @return the fieldCnt - */ public String getFieldCnt() { return fieldCnt; } - - /** - * @param fieldCnt the fieldCnt to set - */ public void setFieldCnt(String fieldCnt) { this.fieldCnt = fieldCnt; } - - /** - * @return the specBatlYn - */ public String getSpecBatlYn() { return specBatlYn; } - - /** - * @param specBatlYn the specBatlYn to set - */ public void setSpecBatlYn(String specBatlYn) { this.specBatlYn = specBatlYn; } - - /** - * @return the nllYn - */ public String getNllYn() { return nllYn; } - - /** - * @param nllYn the nllYn to set - */ public void setNllYn(String nllYn) { this.nllYn = nllYn; } - - /** - * @return the woDetentionType - */ public String getWoDetentionType() { return woDetentionType; } - - /** - * @param woDetentionType the woDetentionType to set - */ public void setWoDetentionType(String woDetentionType) { this.woDetentionType = woDetentionType; } - - /** - * @return the fieldArrestDate - */ public String getFieldArrestDate() { return fieldArrestDate; } - - /** - * @param fieldArrestDate the fieldArrestDate to set - */ public void setFieldArrestDate(String fieldArrestDate) { this.fieldArrestDate = fieldArrestDate; } - - /** - * @return the fieldReleaseDate - */ public String getFieldReleaseDate() { return fieldReleaseDate; } - - /** - * @param fieldReleaseDate the fieldReleaseDate to set - */ public void setFieldReleaseDate(String fieldReleaseDate) { this.fieldReleaseDate = fieldReleaseDate; } - - /** - * @return the leadDistance - */ - public String getLeadDistance() { + public int getLeadDistance() { return leadDistance; } - - /** - * @param leadDistance the leadDistance to set - */ - public void setLeadDistance(String leadDistance) { + public void setLeadDistance(int leadDistance) { this.leadDistance = leadDistance; } - - /** - * @return the leadHour - */ public String getLeadHour() { return leadHour; } - - /** - * @param leadHour the leadHour to set - */ public void setLeadHour(String leadHour) { this.leadHour = leadHour; } - - /** - * @return the leadMinute - */ public String getLeadMinute() { return leadMinute; } - - /** - * @param leadMinute the leadMinute to set - */ public void setLeadMinute(String leadMinute) { this.leadMinute = leadMinute; } - - /** - * @return the captainCount - */ public int getCaptainCount() { return captainCount; } - - /** - * @param captainCount the captainCount to set - */ public void setCaptainCount(int captainCount) { this.captainCount = captainCount; } - - /** - * @return the mateCount - */ public int getMateCount() { return mateCount; } - - /** - * @param mateCount the mateCount to set - */ public void setMateCount(int mateCount) { this.mateCount = mateCount; } - - /** - * @return the engineerCount - */ public int getEngineerCount() { return engineerCount; } - - /** - * @param engineerCount the engineerCount to set - */ public void setEngineerCount(int engineerCount) { this.engineerCount = engineerCount; } - - /** - * @return the crewCount - */ public int getCrewCount() { return crewCount; } - - /** - * @param crewCount the crewCount to set - */ public void setCrewCount(int crewCount) { this.crewCount = crewCount; } - - /** - * @return the shipProcType - */ public String getShipProcType() { return shipProcType; } - - /** - * @param shipProcType the shipProcType to set - */ public void setShipProcType(String shipProcType) { this.shipProcType = shipProcType; } - - /** - * @return the commissionCost - */ - public String getCommissionCost() { + public int getCommissionCost() { return commissionCost; } - - /** - * @param commissionCost the commissionCost to set - */ - public void setCommissionCost(String commissionCost) { + public void setCommissionCost(int commissionCost) { this.commissionCost = commissionCost; } - - /** - * @return the gearCast - */ - public String getGearCast() { + public double getGearCast() { return gearCast; } - - /** - * @param gearCast the gearCast to set - */ - public void setGearCast(String gearCast) { + public void setGearCast(double gearCast) { this.gearCast = gearCast; } - - /** - * @return the gearWidth - */ - public String getGearWidth() { + public double getGearWidth() { return gearWidth; } - - /** - * @param gearWidth the gearWidth to set - */ - public void setGearWidth(String gearWidth) { + public void setGearWidth(double gearWidth) { this.gearWidth = gearWidth; } - - /** - * @return the gearEtc - */ public String getGearEtc() { return gearEtc; } - - /** - * @param gearEtc the gearEtc to set - */ public void setGearEtc(String gearEtc) { this.gearEtc = gearEtc; } - - /** - * @return the addrArea - */ public String getAddrArea() { return addrArea; } - - /** - * @param addrArea the addrArea to set - */ public void setAddrArea(String addrArea) { this.addrArea = addrArea; } - - /** - * @return the addrCity - */ public String getAddrCity() { return addrCity; } - - /** - * @param addrCity the addrCity to set - */ public void setAddrCity(String addrCity) { this.addrCity = addrCity; } - - /** - * @return the addrDetail - */ public String getAddrDetail() { return addrDetail; } - - /** - * @param addrDetail the addrDetail to set - */ public void setAddrDetail(String addrDetail) { this.addrDetail = addrDetail; } - - /** - * @return the latD - */ public int getLatD() { return latD; } - - /** - * @param latD the latD to set - */ public void setLatD(int latD) { this.latD = latD; } - - /** - * @return the latM - */ public int getLatM() { return latM; } - - /** - * @param latM the latM to set - */ public void setLatM(int latM) { this.latM = latM; } - - /** - * @return the latS - */ public double getLatS() { return latS; } - - /** - * @param latS the latS to set - */ public void setLatS(double latS) { this.latS = latS; } - - /** - * @return the lonD - */ public int getLonD() { return lonD; } - - /** - * @param lonD the lonD to set - */ public void setLonD(int lonD) { this.lonD = lonD; } - - /** - * @return the lonM - */ public int getLonM() { return lonM; } - - /** - * @param lonM the lonM to set - */ public void setLonM(int lonM) { this.lonM = lonM; } - - /** - * @return the lonS - */ public double getLonS() { return lonS; } - - /** - * @param lonS the lonS to set - */ public void setLonS(double lonS) { this.lonS = lonS; } - - /** - * @return the shipName - */ public String getShipName() { return shipName; } - - /** - * @param shipName the shipName to set - */ public void setShipName(String shipName) { this.shipName = shipName; } - - /** - * @return the shipTonnage - */ - public String getShipTonnage() { + public double getShipTonnage() { return shipTonnage; } - - /** - * @param shipTonnage the shipTonnage to set - */ - public void setShipTonnage(String shipTonnage) { + public void setShipTonnage(double shipTonnage) { this.shipTonnage = shipTonnage; } - - /** - * @return the shipCrewCnt - */ public String getShipCrewCnt() { return shipCrewCnt; } - - /** - * @param shipCrewCnt the shipCrewCnt to set - */ public void setShipCrewCnt(String shipCrewCnt) { this.shipCrewCnt = shipCrewCnt; } - - /** - * @return the shipQuality - */ public String getShipQuality() { return shipQuality; } - - /** - * @param setShipQuality the setShipQuality to set - */ public void setShipQuality(String shipQuality) { this.shipQuality = shipQuality; } - - /** - * @return the shipQualityStr - */ public String getShipQualityStr() { return shipQualityStr; } - - /** - * @param shipQualityStr the shipQualityStr to set - */ public void setShipQualityStr(String shipQualityStr) { this.shipQualityStr = shipQualityStr; } - - /** - * @return the agencyType - */ public String getNoPaymentCnt() { return noPaymentCnt; } - - /** - * @param invasionType the invasionType to set - */ public void setNoPaymentCnt(String noPaymentCnt) { this.noPaymentCnt = noPaymentCnt; } - - /** - * @return the shipMent - */ public String getShipMent() { return shipMent; } - - /** - * @param shipMent the shipMent to set - */ public void setShipMent(String shipMent) { this.shipMent = shipMent; } - - /** - * @return the shipPortName - */ public String getShipPortName() { return shipPortName; } - - /** - * @param shipPortName the shipPortName to set - */ public void setShipPortName(String shipPortName) { this.shipPortName = shipPortName; } - - /** - * @return the shipType - */ public String getShipType() { return shipType; } - - /** - * @param shipType the shipType to set - */ public void setShipType(String shipType) { this.shipType = shipType; } - - /** - * @return the capName - */ public String getCapName() { return capName; } - - /** - * @param capName the capName to set - */ public void setCapName(String capName) { this.capName = capName; } - - /** - * @return the capChnName - */ public String getCapChnName() { return capChnName; } - - /** - * @param capChnName the capChnName to set - */ public void setCapChnName(String capChnName) { this.capChnName = capChnName; } - - /** - * @return the capAge - */ public int getCapAge() { return capAge; } - - /** - * @param capAge the capAge to set - */ public void setCapAge(int capAge) { this.capAge = capAge; } - - /** - * @return the vioFish - */ public String getVioFish() { return vioFish; } - - /** - * @param vioFish the vioFish to set - */ public void setVioFish(String vioFish) { this.vioFish = vioFish; } - - /** - * @return the vioCnt - */ public int getVioCnt() { return vioCnt; } - - /** - * @param vioCnt the vioCnt to set - */ public void setVioCnt(int vioCnt) { this.vioCnt = vioCnt; } - - /** - * @return the vioPriatedAmt - */ public int getVioPriatedAmt() { return vioPriatedAmt; } - - /** - * @param vioPriatedAmt the vioPriatedAmt to set - */ public void setVioPriatedAmt(int vioPriatedAmt) { this.vioPriatedAmt = vioPriatedAmt; } - - /** - * @return the marginPaymentYn - */ public String getMarginPaymentYn() { return marginPaymentYn; } - - /** - * @param marginPaymentYn the marginPaymentYn to set - */ public void setMarginPaymentYn(String marginPaymentYn) { this.marginPaymentYn = marginPaymentYn; } - - /** - * @return the marginPaymentAmt - */ public int getMarginPaymentAmt() { return marginPaymentAmt; } - - /** - * @param marginPaymentAmt the marginPaymentAmt to set - */ public void setMarginPaymentAmt(int marginPaymentAmt) { this.marginPaymentAmt = marginPaymentAmt; } - - /** - * @return the marginPaymentDate - */ public String getMarginPaymentDate() { return marginPaymentDate; } - - /** - * @param marginPaymentDate the marginPaymentDate to set - */ public void setMarginPaymentDate(String marginPaymentDate) { this.marginPaymentDate = marginPaymentDate; } - - /** - * @return the status - */ public String getStatus() { return status; } - - /** - * @param status the status to set - */ public void setStatus(String status) { this.status = status; } - - /** - * @return the delYn - */ public String getDelYn() { return delYn; } - - /** - * @param delYn the delYn to set - */ public void setDelYn(String delYn) { this.delYn = delYn; } - - /** - * @return the regDate - */ public String getRegDate() { return regDate; } - - /** - * @param regDate the regDate to set - */ public void setRegDate(String regDate) { this.regDate = regDate; } - - /** - * @return the regUser - */ public String getRegUser() { return regUser; } - - /** - * @param regUser the regUser to set - */ public void setRegUser(String regUser) { this.regUser = regUser; } - - /** - * @return the regAgency - */ public String getRegAgency() { return regAgency; } - /** - * @param regAgency the regAgency to set - */ public void setRegAgency(String regAgency) { this.regAgency = regAgency; } - - /** - * @return the shipMentStr - */ public String getShipMentStr() { return shipMentStr; } - - /** - * @param shipMentStr the shipMentStr to set - */ public void setShipMentStr(String shipMentStr) { this.shipMentStr = shipMentStr; } - - /** - * @return the shipTypeStr - */ public String getShipTypeStr() { return shipTypeStr; } - - /** - * @param shipTypeStr the shipTypeStr to set - */ public void setShipTypeStr(String shipTypeStr) { this.shipTypeStr = shipTypeStr; } - - /** - * @return the woDetentionStr - */ public String getWoDetentionStr() { return woDetentionStr; } - - /** - * @param woDetentionStr the woDetentionStr to set - */ public void setWoDetentionStr(String woDetentionStr) { this.woDetentionStr = woDetentionStr; } - - /** - * @return the marginPaymentDate - */ public String getAgencyGuardStr() { return agencyGuardStr; } - - /** - * @param marginPaymentAmt the marginPaymentAmt to set - */ public void setAgencyGuardStr(String agencyGuardStr) { this.agencyGuardStr = agencyGuardStr; } - - /** - * @return the addrStr - */ public String getAddrStr() { return addrStr; } - - /** - * @param addrStr the addrStr to set - */ public void setAddrStr(String addrStr) { this.addrStr = addrStr; } + public String getNotPayment() { + return notPayment; + } + public void setNotPayment(String notPayment) { + this.notPayment = notPayment; + } + + public String getAddrAreaStr() { + return addrAreaStr; + } + + public void setAddrAreaStr(String addrAreaStr) { + this.addrAreaStr = addrAreaStr; + } + + public int getTotalCnt() { + return totalCnt; + } + + public void setTotalCnt(int totalCnt) { + this.totalCnt = totalCnt; + } + + public int getSpecBatlCnt() { + return specBatlCnt; + } + + public void setSpecBatlCnt(int specBatlCnt) { + this.specBatlCnt = specBatlCnt; + } + + public int getNllCnt() { + return nllCnt; + } + + public void setNllCnt(int nllCnt) { + this.nllCnt = nllCnt; + } @Override public String toString() { @@ -1912,3 +1188,5 @@ public class ArrestVO { } } + + diff --git a/src/main/resources/sqlmapper/mappers/arrest/arrest.xml b/src/main/resources/sqlmapper/mappers/arrest/arrest.xml index 11478d7..766cb5e 100644 --- a/src/main/resources/sqlmapper/mappers/arrest/arrest.xml +++ b/src/main/resources/sqlmapper/mappers/arrest/arrest.xml @@ -270,15 +270,12 @@ A.ADDR_DTL , A.VLTN_TYPE , B.CODENM || ' (' || A.VLTN_DTL || ')' VLTN_DTL, - DECODE(A.IVSN_TYPE, 'YRB2', '1', '') IVSN_TYPE1, - DECODE(A.IVSN_TYPE, 'YRD1', '1', '') IVSN_TYPE2, - DECODE(A.IVSN_TYPE, 'YRA1', '1', '') IVSN_TYPE3, - DECODE(A.IVSN_TYPE, 'YRB1', '1', '') IVSN_TYPE4, - - - - DECODE(A.SPEC_BATL_YN, 'Y', '1' , '') SPEC_BATL_YN, - DECODE(A.NLL_YN, 'Y', '1' , '') NLL_YN, + case A.IVSN_TYPE when 'YRB2' then '1' else '' end IVSN_TYPE1, + case A.IVSN_TYPE when 'YRD1' then '1' else '' end IVSN_TYPE2, + case A.IVSN_TYPE when 'YRA1' then '1' else '' end IVSN_TYPE3, + 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, A.AGENCY_TYPE , A.AGENCY_GUARD , G.CODENM AGENCY_GUARD_STR , @@ -300,21 +297,22 @@ A.VIO_CNT , A.VIO_PRTD_AMT , A.PROC_COND , - DECODE(A.PROC_COND, '02', '1', '') PROC_COND_Y, - DECODE(A.PROC_COND, '01', '1', '') PROC_COND_N, + case A.PROC_COND when '02' then '1' else '' end PROC_COND_Y, + case A.PROC_COND when '01' then '1' else '' end PROC_COND_N, A.MRGN_PYMT_YN , - - DECODE(A.MRGN_PYMT_YN, 'Y', A.MRGN_PYMT_AMT, '' ) MRGN_PYMT_AMT, - DECODE(A.MRGN_PYMT_YN, 'N', A.MRGN_PYMT_AMT, '' ) NO_MRGN_PYMT_AMT, - TO_CHAR(MRGN_PYMT_DATE, 'YYYY-MM-DD hh24:mi') MRGN_PYMT_DATE , - DECODE(A.MRGN_PYMT_YN, 'N', '1', '') NOT_PAYMENT, - A.SHIP_PROC_TYPE , - DECODE(A.SHIP_PROC_TYPE, '01', '1', '') SHIP_PROC_TYPE_A, - DECODE(A.SHIP_PROC_TYPE, '02', '1', '') SHIP_PROC_TYPE_B, - DECODE(A.SHIP_PROC_TYPE, '03', '1', '') SHIP_PROC_TYPE_C, - DECODE(A.SHIP_PROC_TYPE, '04', '1', '') SHIP_PROC_TYPE_D, - DECODE(A.SHIP_PROC_TYPE, '05', '1', '') SHIP_PROC_TYPE_E, - + case when A.MRGN_PYMT_YN != null then 'Y' end MRGN_PYMT_AMT, + case when A.MRGN_PYMT_AMT != null then '' end MRGN_PYMT_AMT, + case when A.MRGN_PYMT_YN != null then 'N' end NO_MRGN_PYMT_AMT, + case when A.MRGN_PYMT_AMT != null then '' end NO_MRGN_PYMT_AMT, + TO_CHAR(MRGN_PYMT_DATE, 'YYYY-MM-DD hh24:mi') MRGN_PYMT_DATE , + case A.MRGN_PYMT_YN when 'N' then '1' else '' end NOT_PAYMENT, + A.SHIP_PROC_TYPE , + case A.SHIP_PROC_TYPE when '01' then '1' else '' end SHIP_PROC_TYPE_A, + case A.SHIP_PROC_TYPE when '02' then '1' else '' end SHIP_PROC_TYPE_B, + case A.SHIP_PROC_TYPE when '03' then '1' else '' end SHIP_PROC_TYPE_C, + 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.DTTN_CAP_CNT , A.DTTN_MATE_CNT , @@ -325,7 +323,7 @@ F.CODENM WO_DTTN_STR, 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 , - 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_HOUR , A.LEAD_MINUTE , @@ -337,22 +335,25 @@ A.REG_DATE , A.REG_USER , A.REG_AGENCY - FROM T_CHN_ARREST_INFO A, - TCODE B , -- 위반내용 - (SELECT CODE, UP_CODE, CODE_NM FROM CD_CODE C WHERE GP_CODE = 'A001' ) C, -- 시군구 - TCODE D , -- 선적 - TCODE E , -- 선종 - (SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'T005' ) F , -- 무혐의불구속 - (SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'C001' ) G , -- - (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 -- 특별광역시도 + FROM + T_CHN_ARREST_INFO A + right outer join + (SELECT CODE1, CODE2, CODENM + FROM TCODE WHERE CODE1 = 'C001') G + on g.code2 = a.agency_guard, + TCODE B , + (SELECT CODE, UP_CODE, CODE_NM FROM CD_CODE C WHERE GP_CODE = 'A001' ) C, + 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' 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.SHIP_MENT = D.CODE2 AND D.CODE1 = 'SSRR') AND (A.SHIP_TYPE = E.CODE2 AND E.CODE1 = 'FA81') AND A.WO_DTTN_TYPE = F.CODE2 - AND G.CODE2(+) = A.AGENCY_GUARD AND A.SHIP_QLTY = H.CODE2 AND A.ADDR_AREA = I.CODE ]]> @@ -582,9 +583,9 @@ TCODE B , -- 위반내용 (SELECT CODE, UP_CODE, CODE_NM FROM CD_CODE C WHERE GP_CODE = 'A001' ) C, -- 시군구 TCODE D , -- 선적 - TCODE E , -- 선종 + TCODE E , -- 선종 (SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'T005' ) F , -- 무혐의불구속 - (SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'C001' ) G , -- + (SELECT CODE1, CODE2, CODENM FROM TCODE WHERE CODE1 = 'C001' ) G , -- (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' @@ -981,7 +982,7 @@ --A.MRGN_PYMT_AMT , DECODE(MRGN_PYMT_YN, 'Y', MRGN_PYMT_AMT, 0) MRGN_PYMT_AMT, DECODE(MRGN_PYMT_YN, 'N', MRGN_PYMT_AMT, 0) NO_MRGN_PYMT_AMT, - + TO_CHAR(MRGN_PYMT_DATE, 'YYYY-MM-DD') MRGN_PYMT_DATE , A.SHIP_PROC_TYPE , DECODE(A.SHIP_PROC_TYPE, '01', 1, 0) SHIP_PROC_TYPE_A, @@ -1520,8 +1521,8 @@ REG_AGENCY ) VALUES ( - T_CHN_ARREST_INFO_ID_SEQ.NEXTVAL, - TO_DATE(#{arrestDate}, 'YYYY-MM-DD hh24:mi'), + nextval('chn_arrest_bd_seq'), + TO_DATE(#{arrestDate}, 'YYYY-MM-DD hh24:mi'), #{agencyType}, #{agencyGuard}, #{agencyVessel}, @@ -1535,8 +1536,8 @@ TO_DATE(#{fieldArrestDate}, 'YYYY-MM-DD hh24:mi'), TO_DATE(#{fieldReleaseDate}, 'YYYY-MM-DD hh24:mi'), COALESCE(#{leadDistance}, 0), - COALESCE(#{leadHour}, 0), - COALESCE(#{leadMinute}, 0), + COALESCE(#{leadHour}, '0'), + COALESCE(#{leadMinute}, '0'), COALESCE(#{captainCount}, 0), COALESCE(#{mateCount}, 0), COALESCE(#{engineerCount}, 0), @@ -1573,7 +1574,7 @@ TO_DATE(#{marginPaymentDate}, 'YYYY-MM-DD hh24:mi'), #{status}, #{delYn}, - NOW(), + NOW(), #{regUser}, #{regAgency}