diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/statistics/CaptureStatistics.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/statistics/CaptureStatistics.java index 872453c5..953696f2 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/statistics/CaptureStatistics.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/statistics/CaptureStatistics.java @@ -21,8 +21,7 @@ public class CaptureStatistics { private Integer captureCnt=0; private Integer eezCnt=0; private Integer violation1=0; - private Integer violation21=0; - private Integer violation22=0; + private Integer violation2=0; private Integer violation3=0; private Integer violation4=0; private Integer violation51=0; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java index 9bac3829..a6117cf1 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java @@ -305,13 +305,12 @@ public class UnlawfulFishingService { total.setYearStr("총계"); for(CaptureStatistics stat: temp){ stat.setYearStr(stat.getYear().toString().substring(2)+"년"); - stat.setEezCnt(stat.getViolation1()+stat.getViolation21()+stat.getViolation22()+stat.getViolation3()); + stat.setEezCnt(stat.getViolation1()+stat.getViolation2()+stat.getViolation3()); stat.setCaptureCnt(stat.getEezCnt()+stat.getViolation4()); total.setCaptureCnt(total.getCaptureCnt()+stat.getCaptureCnt()); total.setEezCnt(total.getEezCnt()+stat.getEezCnt()); total.setViolation1(total.getViolation1()+stat.getViolation1()); - total.setViolation21(total.getViolation21()+stat.getViolation21()); - total.setViolation22(total.getViolation22()+stat.getViolation22()); + total.setViolation2(total.getViolation2()+stat.getViolation2()); total.setViolation3(total.getViolation3()+stat.getViolation3()); total.setViolation4(total.getViolation4()+stat.getViolation4()); total.setViolation51(total.getViolation51()+stat.getViolation51()); diff --git a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml index 366b4ed9..b84e9e5e 100644 --- a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml +++ b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml @@ -367,14 +367,13 @@