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 @@