diff --git a/src/main/java/com/dbnt/faisp/config/ModalController.java b/src/main/java/com/dbnt/faisp/config/ModalController.java index c694fb2f..9e6928eb 100644 --- a/src/main/java/com/dbnt/faisp/config/ModalController.java +++ b/src/main/java/com/dbnt/faisp/config/ModalController.java @@ -2,6 +2,7 @@ package com.dbnt.faisp.config; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.UnlawfulFishingParam; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CSStatistics; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusDTO; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.FishingBoatRepository; @@ -74,7 +75,10 @@ public class ModalController { if(!yearList.contains(params.getYear())){ yearList.add(params.getYear()); } - mav.addObject("crackdownStatusList", fishingBoatService.selectCrackdownStatusList(params)); + List csDTOList = fishingBoatService.selectCrackdownStatusList(params); + CSStatistics statistics = fishingBoatService.calculationCSStatistics(csDTOList); + mav.addObject("statistics", statistics); + mav.addObject("crackdownStatusList", csDTOList); mav.addObject("yearList", yearList); mav.addObject("searchParams", params); return mav; diff --git a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java index 2970c614..2202e070 100644 --- a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java +++ b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java @@ -30,16 +30,13 @@ public class KwmsController { mav.addObject("msg", "＊-포함 입력 ex) M00-00000"); }else{ UserInfo savedUser = userInfoService.selectUserInfoToDicCode(empInfo.getDic()); - if(savedUser == null || savedUser.getUserStatus().equals("USC004")){ + if(savedUser == null){ UserInfo userInfo = kwmsService.selectEmpInfo(empInfo.getDic()); if(userInfo==null){ mav.addObject("joinFlag", "F"); mav.addObject("userInfo", empInfo); mav.addObject("msg", "검색 결과가 없습니다."); }else{ - if(savedUser!=null && savedUser.getUserStatus().equals("USC004")){ - userInfo.setUserSeq(savedUser.getUserSeq()); - } mav.addObject("joinFlag", "T"); mav.addObject("userInfo", userInfo); mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); @@ -51,9 +48,23 @@ public class KwmsController { mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); } }else{ - mav.addObject("joinFlag", "F"); - mav.addObject("userInfo", empInfo); - mav.addObject("msg", "이미 가입된 식별번호입니다."); + if(savedUser.getUserStatus().equals("USC004")){ + UserInfo userInfo = kwmsService.selectEmpInfo(empInfo.getDic()); + userInfo.setUserSeq(savedUser.getUserSeq()); + mav.addObject("joinFlag", "T"); + mav.addObject("userInfo", userInfo); + mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); + mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); + mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); + mav.addObject("dutyList", codeMgtService.selectCodeMgtList("DT")); + mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); + mav.addObject("seriesList", codeMgtService.selectCodeMgtList(userInfo.getOutturnCd())); + mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); + }else{ + mav.addObject("joinFlag", "F"); + mav.addObject("userInfo", empInfo); + mav.addObject("msg", "이미 가입된 식별번호입니다."); + } } } return mav; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java index 1bdc83d9..7c849032 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java @@ -3,6 +3,7 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.UnlawfulFishingParam; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CSStatistics; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusDTO; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat; @@ -73,7 +74,10 @@ public class FishingBoatController { if(!yearList.contains(params.getYear())){ yearList.add(params.getYear()); } - mav.addObject("crackdownStatusList", fishingBoatService.selectCrackdownStatusList(params)); + List csDTOList = fishingBoatService.selectCrackdownStatusList(params); + CSStatistics statistics = fishingBoatService.calculationCSStatistics(csDTOList); + mav.addObject("statistics", statistics); + mav.addObject("crackdownStatusList", csDTOList); mav.addObject("yearList", yearList); mav.addObject("searchParams", params); return mav; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/UnlawfulFishingParam.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/UnlawfulFishingParam.java index c14a0bba..169e96fc 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/UnlawfulFishingParam.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/UnlawfulFishingParam.java @@ -28,6 +28,21 @@ public class UnlawfulFishingParam extends BaseModel { private List violationList; private String processStatus; + /* + private List violationList; + private String caseAgency; + private String crackdownPolice; + private String crackdownBoat; + private String boatNameKr; + private String boatNnySung; + private String boatNnySi; + private Double tonMin; + private Double tonMax; + private String boatMaterial; + private String fisheryType; + private String processStatus; + */ + private String caseNum; private String napoSeaPointDetail; private String nll; private String mmsi; @@ -50,12 +65,17 @@ public class UnlawfulFishingParam extends BaseModel { private String confiscationJo; private String confiscationGae; private String confiscationEtc; - private String obstrExspdCnt; - private String personDamageCnt; - private String personDamageAmount; + private String obstrExspdCntMin; + private String obstrExspdCntMax; + private String personDamageCntMin; + private String personDamageCntMax; + private String personDamageAmountMin; + private String personDamageAmountMax; private String personDamageDetail; - private String materialDamageCnt; - private String materialDamageAmount; + private String materialDamageCntMin; + private String materialDamageCntMax; + private String materialDamageAmountMin; + private String materialDamageAmountMax; private String materialDamageDetail; private String captainRestriction; private String navigaterRestriction; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CSStatistics.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CSStatistics.java new file mode 100644 index 00000000..f52f5ca9 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CSStatistics.java @@ -0,0 +1,62 @@ +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus; + +import com.dbnt.faisp.config.BaseModel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; +import java.time.LocalDateTime; + +@Getter +@Setter +@NoArgsConstructor +public class CSStatistics extends BaseModel { + private Integer vt002Cnt=0; + private Integer vt003vt004Cnt=0; + private Integer vt029Cnt=0; + private Integer vt030Cnt=0; + private Integer nllCnt=0; + private Integer obstrExspdCnt=0; + private Integer personDamageCnt=0; + private Integer personDamageAmount=0; + private Integer materialDamageCnt=0; + private Integer materialDamageAmount=0; + private Double offenseWeight=0d; + private Double offenseIllegalWasteQuantity=0d; + private Double offenseQuantity=0d; + private Double offenseAmount=0d; + private Integer pr001Cnt=0; + private Integer otherPrCnt=0; + private Integer damboPaymentCnt=0; + private Double damboPayment=0d; + private Integer damboUnpaidAmountCnt=0; + private Double damboUnpaidAmount=0d; + private Integer consignmentCnt=0; + private Integer evictionCnt=0; + private Integer directHandoverCnt=0; + private Integer bdt001Cnt=0; + private Integer bdt002Cnt=0; + private Integer bdt003Cnt=0; + private Integer exileCnt=0; + private Integer returnCnt=0; + private Integer sailorRestrictionCnt=0; + private Integer captainRestrictionCnt=0; + private Integer navigaterRestrictionCnt=0; + private Integer engineerRestrictionCnt=0; + private Integer normalRestrictionCnt=0; + private Integer confiscationCnt=0; + private Integer sailorRestrictionNotCnt=0; + private Integer captainRestrictionNotCnt=0; + private Integer navigaterRestrictionNotCnt=0; + private Integer engineerRestrictionNotCnt=0; + private Integer normalRestrictionNotCnt=0; + private Integer confiscationNotCnt=0; + private Integer fieldIvsgtCnt=0; + private Integer confiscationFrameCnt=0; + private Integer confiscationWidthCnt=0; + private Integer confiscationJoCnt=0; + private Integer confiscationGaeCnt=0; + private Integer confiscationEtcCnt=0; +} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusDTO.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusDTO.java index 9f040a62..bccd2e9a 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusDTO.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusDTO.java @@ -16,8 +16,8 @@ import java.time.LocalDateTime; @NoArgsConstructor public class CrackdownStatusDTO extends BaseModel { private Integer cdsKey; - private String status; private String caseNum; + private String status; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime napoDt; private String violationStr; @@ -34,6 +34,7 @@ public class CrackdownStatusDTO extends BaseModel { private Integer materialDamageAmount; private String materialDamageDetail; private String caseAgency; + private String casePoliceOfficer; private String crackdownPolice; private String crackdownBoat; private String mmsi; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java index 213ca65b..4cba65cc 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java @@ -4,6 +4,7 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.CrackdownStatusMapper; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.UnlawfulFishingParam; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CSStatistics; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusDTO; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat; @@ -235,4 +236,147 @@ public class FishingBoatService extends BaseService { } return fbKey; } + + public CSStatistics calculationCSStatistics(List csDTOList) { + CSStatistics statistics = new CSStatistics(); + for(CrackdownStatusDTO dto: csDTOList){ + if (dto.getViolationCode().contains("VT002")){ + statistics.setVt002Cnt(statistics.getVt002Cnt()+1); + } + if (dto.getViolationCode().contains("VT003") || dto.getViolationCode().contains("VT004")){ + statistics.setVt003vt004Cnt(statistics.getVt003vt004Cnt()+1); + } + if (dto.getViolationCode().contains("VT029")){ + statistics.setVt029Cnt(statistics.getVt029Cnt()+1); + } + if (dto.getViolationCode().contains("VT030")){ + statistics.setVt030Cnt(statistics.getVt030Cnt()+1); + } + if (dto.getNll().equals("Y")){ + statistics.setNllCnt(statistics.getNllCnt()+1); + } + if (dto.getObstrExspdCnt()!=null){ + statistics.setObstrExspdCnt(statistics.getObstrExspdCnt()+dto.getObstrExspdCnt()); + } + if (dto.getPersonDamageCnt()!=null){ + statistics.setPersonDamageCnt(statistics.getPersonDamageCnt()+dto.getPersonDamageCnt()); + } + if (dto.getPersonDamageAmount()!=null){ + statistics.setPersonDamageAmount(statistics.getPersonDamageAmount()+dto.getPersonDamageAmount()); + } + if (dto.getMaterialDamageCnt()!=null){ + statistics.setMaterialDamageCnt(statistics.getMaterialDamageCnt()+dto.getMaterialDamageCnt()); + } + if (dto.getMaterialDamageAmount()!=null){ + statistics.setMaterialDamageAmount(statistics.getMaterialDamageAmount()+dto.getMaterialDamageAmount()); + } + if(dto.getOffenseWeight()!=null){ + statistics.setOffenseWeight(statistics.getOffenseWeight()+dto.getOffenseWeight()); + } + if(dto.getOffenseIllegalWasteQuantity()!=null){ + statistics.setOffenseIllegalWasteQuantity(statistics.getOffenseIllegalWasteQuantity()+dto.getOffenseIllegalWasteQuantity()); + } + if(dto.getOffenseQuantity()!=null){ + statistics.setOffenseQuantity(statistics.getOffenseQuantity()+dto.getOffenseQuantity()); + } + if(dto.getOffenseAmount()!=null){ + statistics.setOffenseAmount(statistics.getOffenseAmount()+dto.getOffenseAmount()); + } + if (dto.getProcessStatus().equals("PR001")){ + statistics.setPr001Cnt(statistics.getPr001Cnt()+1); + } + if (!dto.getProcessStatus().equals("PR001")){ + statistics.setOtherPrCnt(statistics.getOtherPrCnt()+1); + } + if (dto.getDamboPayment()!=null && dto.getDamboPayment() > 0){ + statistics.setDamboPaymentCnt(statistics.getDamboPaymentCnt()+1); + statistics.setDamboPayment(statistics.getDamboPayment()+dto.getDamboPayment()); + } + if (dto.getDamboUnpaidAmount()!=null && dto.getDamboUnpaidAmount() > 0){ + statistics.setDamboUnpaidAmountCnt(statistics.getDamboUnpaidAmountCnt()+1); + statistics.setDamboUnpaidAmount(statistics.getDamboUnpaidAmount()+dto.getDamboUnpaidAmount()); + } + if (dto.getConsignmentStartDt()!=null){ + statistics.setConsignmentCnt(statistics.getConsignmentCnt()+1); + } + if (dto.getEvictionDt()!=null){ + statistics.setEvictionCnt(statistics.getEvictionCnt()+1); + } + if (dto.getDirectHandoverDt()!=null){ + statistics.setDirectHandoverCnt(statistics.getDirectHandoverCnt()+1); + } + if (dto.getBoatDisposalType()!=null && dto.getBoatDisposalType().equals("BDT001")){ + statistics.setBdt001Cnt(statistics.getBdt001Cnt()+1); + } + if (dto.getBoatDisposalType()!=null && dto.getBoatDisposalType().equals("BDT002")){ + statistics.setBdt002Cnt(statistics.getBdt002Cnt()+1); + } + if (dto.getBoatDisposalType()!=null && dto.getBoatDisposalType().equals("BDT003")){ + statistics.setBdt003Cnt(statistics.getBdt003Cnt()+1); + } + if (dto.getExileDt()!=null){ + statistics.setExileCnt(statistics.getExileCnt()+1); + } + if (dto.getReturnDt()!=null){ + statistics.setReturnCnt(statistics.getReturnCnt()+1); + } + if (dto.getCaptainRestriction()!=0){ + statistics.setSailorRestrictionCnt(statistics.getSailorRestrictionCnt()+dto.getCaptainRestriction()); + statistics.setCaptainRestrictionCnt(statistics.getCaptainRestrictionCnt()+dto.getCaptainRestriction()); + } + if (dto.getNavigaterRestriction()!=0){ + statistics.setSailorRestrictionCnt(statistics.getSailorRestrictionCnt()+dto.getNavigaterRestriction()); + statistics.setNavigaterRestrictionCnt(statistics.getNavigaterRestrictionCnt()+dto.getNavigaterRestriction()); + } + if (dto.getEngineerRestriction()!=0){ + statistics.setSailorRestrictionCnt(statistics.getSailorRestrictionCnt()+dto.getEngineerRestriction()); + statistics.setEngineerRestrictionCnt(statistics.getEngineerRestrictionCnt()+dto.getEngineerRestriction()); + } + if (dto.getSeniorRestriction()!=0 || dto.getNormalRestriction()!=0){ + statistics.setSailorRestrictionCnt(statistics.getSailorRestrictionCnt()+dto.getSeniorRestriction()+dto.getNormalRestriction()); + statistics.setNormalRestrictionCnt(statistics.getNormalRestrictionCnt()+dto.getSeniorRestriction()+dto.getNormalRestriction()); + } + if (dto.getConfiscationDt() != null){ + statistics.setConfiscationCnt(statistics.getConfiscationCnt()+1); + } + if (dto.getCaptainRestrictionNot()!=0){ + statistics.setSailorRestrictionNotCnt(statistics.getSailorRestrictionNotCnt()+dto.getCaptainRestrictionNot()); + statistics.setCaptainRestrictionNotCnt(statistics.getCaptainRestrictionNotCnt()+dto.getCaptainRestrictionNot()); + } + if (dto.getNavigaterRestrictionNot()!=0){ + statistics.setSailorRestrictionNotCnt(statistics.getSailorRestrictionNotCnt()+dto.getNavigaterRestrictionNot()); + statistics.setNavigaterRestrictionNotCnt(statistics.getNavigaterRestrictionNotCnt()+dto.getNavigaterRestrictionNot()); + } + if (dto.getEngineerRestrictionNot()!=0){ + statistics.setSailorRestrictionNotCnt(statistics.getSailorRestrictionNotCnt()+dto.getEngineerRestrictionNot()); + statistics.setEngineerRestrictionNotCnt(statistics.getEngineerRestrictionNotCnt()+dto.getEngineerRestrictionNot()); + } + if (dto.getSeniorRestrictionNot()!=0 || dto.getNormalRestrictionNot()!=0){ + statistics.setSailorRestrictionNotCnt(statistics.getSailorRestrictionNotCnt()+dto.getSeniorRestrictionNot()+dto.getNormalRestrictionNot()); + statistics.setNormalRestrictionNotCnt(statistics.getNormalRestrictionNotCnt()+dto.getSeniorRestrictionNot()+dto.getNormalRestrictionNot()); + } + if (dto.getConfiscationDt() == null){ + statistics.setConfiscationNotCnt(statistics.getConfiscationNotCnt()+1); + } + if(dto.getFieldIvsgt().equals("F")){ + statistics.setFieldIvsgtCnt(statistics.getFieldIvsgtCnt()+1); + } + if(dto.getConfiscationFrame()!=null){ + statistics.setConfiscationFrameCnt(statistics.getConfiscationFrameCnt()+Integer.parseInt(dto.getConfiscationFrame())); + } + if(dto.getConfiscationWidth()!=null){ + statistics.setConfiscationWidthCnt(statistics.getConfiscationWidthCnt()+Integer.parseInt(dto.getConfiscationWidth())); + } + if(dto.getConfiscationJo()!=null){ + statistics.setConfiscationJoCnt(statistics.getConfiscationJoCnt()+Integer.parseInt(dto.getConfiscationJo())); + } + if(dto.getConfiscationGae()!=null){ + statistics.setConfiscationGaeCnt(statistics.getConfiscationGaeCnt()+Integer.parseInt(dto.getConfiscationGae())); + } + if(dto.getConfiscationEtc()!=null){ + statistics.setConfiscationEtcCnt(statistics.getConfiscationEtcCnt()+Integer.parseInt(dto.getConfiscationEtc())); + } + } + return statistics; + } } diff --git a/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml b/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml index 7c07593d..2e93d046 100644 --- a/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml +++ b/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml @@ -12,11 +12,274 @@ and extract(month from a.napo_dt) = #{month}::numeric + + and (a.napo_sea_point_lon like '%'||#{napoSeaPointDetail}||'%' or + a.napo_sea_point_lat like '%'||#{napoSeaPointDetail}||'%' or + a.napo_sea_point_detail like '%'||#{napoSeaPointDetail}||'%') + + + and a.nll like '%'||#{nll}||'%' + + + and a.mmsi like '%'||#{mmsi}||'%' + + + and a.distance like '%'||#{distance}||'%' + + + and b.dambo_unpaid_amount > 0 + + + and (b.dambo_unpaid_amount = 0 or b.dambo_unpaid_amount is null) + + + and b.eviction_dt is not null + + + and b.eviiction_dt is null + + + and b.return_dt is not null + + + and b.return_dt is null + + + and b.consignment_start_dt is not null + + + and b.consignment_start_dt is null + + + and b.confiscation_dt is not null + + + and b.confiscation_dt is null + + + and b.direct_handover_dt is not null + + + and b.direct_handover_dt is null + + + and b.boat_disposal_type = #{boatDisposalType} + + + and (b.handover_sea_point_lon like '%'||#{handoverSeaPointDetail}||'%' or + b.handover_sea_point_lat like '%'||#{handoverSeaPointDetail}||'%' or + b.handover_sea_point_detail like '%'||#{handoverSeaPointDetail}||'%') + + + and b.handover_boat like '%'||#{handoverBoat}||'%' + + + and b.middle_takeover_boat like '%'||#{middleTakeoverBoat}||'%' + + + and d.sailor_name_kr like '%'||#{sailorNameKr}||'%' + + + and c.catch_fish_species like '%'||#{catchFishSpecies}||'%' + + + and c.offense_fish_species like '%'||#{offenseFishSpecies}||'%' + + + and c.confiscation_frame is not null + + + and c.confiscation_frame is null or c.confiscation_frame = 0 + + + and c.confiscation_width is not null + + + and c.confiscation_width is null or c.confiscation_width = 0 + + + and c.confiscation_jo is not null + + + and c.confiscation_jo is null or c.confiscation_jo = 0 + + + and c.confiscation_gae is not null + + + and c.confiscation_gae is null or c.confiscation_gae = 0 + + + and c.confiscation_etc is not null + + + and c.confiscation_etc is null or c.confiscation_etc = 0 + + + and a.obstr_exspd_cnt >= #{obstrExspdCntMin} + + + and a.obstr_exspd_cnt <= #{obstrExspdCntMax} + + + and a.person_damage_cnt >= #{personDamageCntMin} + + + and a.person_damage_cnt <= #{personDamageCntMax} + + + and a.person_damage_amount >= #{personDamageAmountMin} + + + and a.person_damage_amount <= #{personDamageAmountMax} + + + and a.person_damage_detail like '%'||#{personDamageDetail}||'%' + + + and a.material_damage_cnt >= #{materialDamageCntMin} + + + and a.material_damage_cnt <= #{materialDamageCntMax} + + + and a.material_damage_amount >= #{materialDamageAmountMin} + + + and a.material_damage_amount <= #{materialDamageAmountMax} + + + and a.material_damage_detail like '%'||#{materialDamageDetail}||'%' + + + and e.captainRestriction > 0 + + + and e.captainRestrictionNot > 0 + + + and e.navigaterRestriction > 0 + + + and e.navigaterRestrictionNot > 0 + + + and e.engineerRestriction > 0 + + + and e.engineerRestrictionNot > 0 + + + and a.case_agency = #{caseAgency} + + + and a.crackdown_police = #{crackdownPolice} + + + and a.crackdown_boat = #{crackdownBoat} + + + and c.boat_name_kr like '%'||#{boatNameKr}||'%' + + + and c.boat_nny_sung like '%'||#{boatNnySung}||'%' + + + and c.boat_nny_si like '%'||#{boatNnySi}||'%' + + + and c.boat_material = #{boatMaterial} + + + and c.fishery_type = #{fisheryType} + + + and b.process_status = #{processStatus} + + + and c.ton_cnt >= #{tonMin} + + + and c.ton_cnt <= #{tonMax} + + + and + + f.violationCode like '%'||#{violation}||'%' + + + + + + and a.napo_dt >= #{startDate}::date + + + and a.napo_dt <= #{endDate}::date+1 + + + + + and b.eviction_dt >= #{startDate}::date + + + and b.eviction_dt <= #{endDate}::date+1 + + + + + and b.direct_handover_dt >= #{startDate}::date + + + and b.direct_handover_dt <= #{endDate}::date+1 + + + + + and b.consignment_dt >= #{startDate}::date + + + and b.consignment_dt <= #{endDate}::date+1 + + + + + and b.confiscation_dt >= #{startDate}::date + + + and b.confiscation_dt <= #{endDate}::date+1 + + + + + and b.boat_disposal_dt >= #{startDate}::date + + + and b.boat_disposal_dt <= #{endDate}::date+1 + + + + + and b.return_dt >= #{startDate}::date + + + and b.return_dt <= #{endDate}::date+1 + + + + + and a.wrt_dt >= #{startDate}::date + + + and a.wrt_dt <= #{endDate}::date+1 + + + + + + + + +
@@ -129,16 +137,16 @@ 폐선조건부공매 - - - - - - - - - - + + + + + + + + + + 단속경찰서 단속함정 성 @@ -147,225 +155,184 @@ 출생년도 어종 수량 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 나포일시 석방일시 소요시간 소요시간 거리(해리) - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + - + - - + + + - ~ - -
+
+
+
+ + + + + + + + + + + + - - - -
- - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ~ - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
- -
-
diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html index f8da9d84..d6a39068 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html @@ -259,46 +259,82 @@
- +
- +
- +
- +
- +