diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java index f9e16ffd..4e673974 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java @@ -406,7 +406,6 @@ public class UnlawfulFishingController { break; case "type2": mav.addObject("statisticsList", unlawfulFishingService.selectStatisticsListType2(params)); - mav.addObject("organConfigList", organConfigService.selectOrganListToUnlawfulFishingStatistics()); break; case "type3": mav.addObject("statisticsList", unlawfulFishingService.selectStatisticsListType3(params)); diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/StatisticsModel.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/StatisticsModel.java index b34a8c7a..b28b35ef 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/StatisticsModel.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/StatisticsModel.java @@ -15,6 +15,7 @@ import java.util.List; @NoArgsConstructor public class StatisticsModel{ private String type; + private String yearStr=""; private Integer year; private Integer captureCnt=0; @@ -33,4 +34,8 @@ public class StatisticsModel{ private Integer forfeitCnt=0; private Integer disposeCnt=0; private String etc=""; + + private String fieldIvsgt; + private String crackdownPolice; + } 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 60e72fa3..dd129722 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 @@ -328,7 +328,12 @@ public class UnlawfulFishingService { return statisticsList; } public List selectStatisticsListType2(StatisticsModel params) { - return unlawfulFishingMapper.selectStatisticsListType2(params); + List statisticsList = unlawfulFishingMapper.selectStatisticsListType2(params); + + for(StatisticsModel stat: statisticsList){ + + } + return statisticsList; } public List selectStatisticsListType3(StatisticsModel params) { return unlawfulFishingMapper.selectStatisticsListType3(params); diff --git a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml index 78d89067..5a6644d1 100644 --- a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml +++ b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml @@ -452,6 +452,14 @@ order by year desc diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/statistics.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/statistics.js index d19b4be4..27d1097b 100644 --- a/src/main/resources/static/js/faStatistics/unlawfulFishing/statistics.js +++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/statistics.js @@ -1,4 +1,4 @@ -$(document).on('click', '.nav-item', function (event){ +$(document).on('click', '.statTab', function (event){ location.href = "/unlawfulFishing/statistics?type="+event.target.id.replace("Tab", ""); }) diff --git a/src/main/resources/static/js/organMgt/organMgt.js b/src/main/resources/static/js/organMgt/organMgt.js index d5c21172..833eebe5 100644 --- a/src/main/resources/static/js/organMgt/organMgt.js +++ b/src/main/resources/static/js/organMgt/organMgt.js @@ -124,7 +124,7 @@ function addTr(tbody){ '' + options+ '' + - ' ' + + /*' ' +*/ '' ) } @@ -141,7 +141,7 @@ function setUsedOrganTr(parentOrgan, organType){ '' + - (organType!=="OGC002"?' ':'') + + /*(organType!=="OGC002"?' ':'') +*/ '' ) } diff --git a/src/main/resources/templates/adminPage/organMgt/organMgt.html b/src/main/resources/templates/adminPage/organMgt/organMgt.html index cd25f122..07a12a75 100644 --- a/src/main/resources/templates/adminPage/organMgt/organMgt.html +++ b/src/main/resources/templates/adminPage/organMgt/organMgt.html @@ -48,7 +48,7 @@ -
+
@@ -57,7 +57,6 @@ 관할서 - 불법조업 외국어선
단속 여부 diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html b/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html index 7030a8d6..c55465c5 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html @@ -7,7 +7,9 @@
@@ -26,13 +28,13 @@
@@ -106,25 +108,25 @@ - - + + - 구분 - - - - - - - - - + 구분 + + + + + + +