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 72e72eed..4c06cd9a 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 @@ -398,10 +398,9 @@ public class UnlawfulFishingController { case "type1": break; case "type2": - mav.addObject("organConfigList", organConfigService.selectOrganListToUnlawfulFishingStatistics()); break; case "type3": - + mav.addObject("organConfigList", organConfigService.selectOrganListToUnlawfulFishingStatistics()); break; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java index 3ed6408c..6a926812 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java @@ -84,7 +84,4 @@ public class SailorBaseEntity extends BaseModel { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime wrtDt; - @Column(name="detention_yn") - private String detentionYn; - } diff --git a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml index 04710f68..9a7bb125 100644 --- a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml +++ b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml @@ -272,7 +272,6 @@ ci.case_num , iss.sailor_name_kr , iss.birthdate , - iss.detention_yn , iss.position , iss.career , iss.similar_criminal_history , diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js index 7336db74..d01a288d 100644 --- a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js +++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js @@ -82,7 +82,6 @@ $(document).on('click', '.saveAllInfoBtn', function (){ sailorNameKr: sailorDiv.find(".sailorNameKr").val(), sailorNameCn: sailorDiv.find(".sailorNameCn").val(), birthdate: sailorDiv.find(".birthdate").val(), - detentionYn: sailorDiv.find(".detentionYn").val(), residence: sailorDiv.find(".residence").val(), education: sailorDiv.find(".education").val(), position: sailorDiv.find(".position").val(), diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html index f0b01be0..530c1d89 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html @@ -112,17 +112,17 @@
- +
- +
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html index be06e14a..5af38995 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html @@ -70,11 +70,11 @@
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html index b8b87ea6..f67e78c4 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html @@ -101,11 +101,11 @@
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html index f25916b2..ab801b7f 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html @@ -123,7 +123,6 @@ 사건번호 어선명 선원명 - 구속여부 생년월일 선박직책 승선경력 @@ -141,10 +140,6 @@ - - - - diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html index 13dafe2b..c53ab499 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html @@ -45,14 +45,6 @@
- -
- -
-
-
+
+
-
-
+
+
@@ -177,14 +169,6 @@
- -
- -
-
-
+
+
-
-
+
+
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html index 23ec3e4d..b3b5e708 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html @@ -40,14 +40,6 @@
- -
- -
-
-
+
+
-
-
+
+
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html index 212c6583..49e21044 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html @@ -10,19 +10,14 @@ - - -
-
-
+
-
-
+
+
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html index 7d414726..e9c127f3 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html @@ -42,19 +42,14 @@ - - -
-
-
+
-
- - - +
@@ -161,11 +156,11 @@
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html index 68ad7028..4724877d 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html @@ -199,11 +199,11 @@
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html b/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html index 28bca62f..e55bd6b3 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html @@ -7,7 +7,11 @@
@@ -84,7 +88,7 @@ - 구분 +
경찰서
연도