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 4c06cd9a..72e72eed 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,9 +398,10 @@ 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 6a926812..3ed6408c 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,4 +84,7 @@ 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 9a7bb125..04710f68 100644 --- a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml +++ b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml @@ -272,6 +272,7 @@ 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 d01a288d..7336db74 100644 --- a/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js +++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/illegalShipSailor.js @@ -82,6 +82,7 @@ $(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 c438e039..80cdd8fa 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html @@ -98,17 +98,17 @@
- +
- +
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html index 5af38995..be06e14a 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 f67e78c4..b8b87ea6 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 ab801b7f..f25916b2 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html @@ -123,6 +123,7 @@ 사건번호 어선명 선원명 + 구속여부 생년월일 선박직책 승선경력 @@ -140,6 +141,10 @@ + + + + diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html index c53ab499..13dafe2b 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issAddModal.html @@ -45,6 +45,14 @@
+ +
+ +
+
+
-
-
+
+
-
-
@@ -169,6 +177,14 @@
+ +
+ +
+
+
-
-
+
+
-
-
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html index b3b5e708..23ec3e4d 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issEditModal.html @@ -40,6 +40,14 @@
+ +
+ +
+
+
-
-
+
+
-
-
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html index 49e21044..212c6583 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html @@ -10,14 +10,19 @@ - + +
+
+ + -
-
- -
+ + - +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html index e9c127f3..7d414726 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html @@ -42,14 +42,19 @@ - + +
+
+ + -
-
-
+ + - +
@@ -156,11 +161,11 @@
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html index 4724877d..68ad7028 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 e55bd6b3..28bca62f 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html @@ -7,11 +7,7 @@
@@ -88,7 +84,7 @@ -
경찰서
연도 + 구분