From e71b87a7547995896225ff6e3ed4f8555b0ffe3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 11 Jan 2023 18:29:33 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=88=EB=B2=95=EC=A1=B0=EC=97=85=EC=99=B8?= =?UTF-8?q?=EA=B5=AD=EC=96=B4=EC=84=A0=20=EC=98=A4=EB=A5=98=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/FishingBoatService.java | 89 ++++++++++--------- .../faStatistics/internationalCrimeArrest.js | 4 +- .../internationalCrimeArrestEditModal.html | 6 +- .../resources/templates/layout/layout.html | 4 +- 4 files changed, 56 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java index 980c8e3f..fa0cbd92 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java @@ -96,17 +96,19 @@ public class FishingBoatService extends BaseService { List violationList = crackdownStatus.getViolationList(); List violationVersionList = new ArrayList<>(); int i = 1; - for(Violation violation: violationList){ - violation.setViolationKey(i++); - violation.setFbKey(fbKey); + if(violationList!=null){ + for(Violation violation: violationList){ + violation.setViolationKey(i++); + violation.setFbKey(fbKey); - ViolationVersion violationVersion = new ViolationVersion(); - BeanUtils.copyProperties(violation, violationVersion); - violationVersion.setVersionNo(1); - violationVersionList.add(violationVersion); + ViolationVersion violationVersion = new ViolationVersion(); + BeanUtils.copyProperties(violation, violationVersion); + violationVersion.setVersionNo(1); + violationVersionList.add(violationVersion); + } + violationRepository.saveAll(violationList); + violationVersionRepository.saveAll(violationVersionList); } - violationRepository.saveAll(violationList); - violationVersionRepository.saveAll(violationVersionList); // 처리현황, 처리현황버전 저장. ProcessResult processResult = crackdownStatus.getProcessResult(); ProcessResultVersion processResultVersion = new ProcessResultVersion(); @@ -118,21 +120,23 @@ public class FishingBoatService extends BaseService { processResultVersionRepository.save(processResultVersion); // 선원정보, 선원정보버전 저장. List sailorList = crackdownStatus.getSailorList(); - for(Sailor sailor: sailorList){ - sailor.setFbKey(fbKey); + if(sailorList != null){ + for(Sailor sailor: sailorList){ + sailor.setFbKey(fbKey); - SailorVersion sailorVersion = new SailorVersion(); + SailorVersion sailorVersion = new SailorVersion(); - Integer sailorKey = sailorRepository.save(sailor).getSailorKey(); + Integer sailorKey = sailorRepository.save(sailor).getSailorKey(); - BeanUtils.copyProperties(sailor, sailorVersion); - sailorVersion.setVersionNo(1); - sailorVersion.setSailorKey(sailorKey); - Integer versionNo = sailorVersionRepository.save(sailorVersion).getVersionNo(); - if(sailor.getPosition().equals("POS001")){ - //선장은 사진이 같이 업로드 됨. - if(sailorFiles.size()>0) { - saveCaptainPhoto(sailorKey, versionNo, sailorFiles); + BeanUtils.copyProperties(sailor, sailorVersion); + sailorVersion.setVersionNo(1); + sailorVersion.setSailorKey(sailorKey); + Integer versionNo = sailorVersionRepository.save(sailorVersion).getVersionNo(); + if(sailor.getPosition().equals("POS001")){ + //선장은 사진이 같이 업로드 됨. + if(sailorFiles!= null && sailorFiles.size()>0) { + saveCaptainPhoto(sailorKey, versionNo, sailorFiles); + } } } } @@ -151,19 +155,21 @@ public class FishingBoatService extends BaseService { fishingBoatVersionRepository.save(newInfo); // 위반사항 List violationList = crackdownStatus.getViolationList(); - List violationVersionList = new ArrayList<>(); - int i=1; - ViolationVersion lastViolationVersion = violationVersionRepository.findTop1ByFbKeyOrderByVersionNoDesc(fishingBoat.getFbKey()).orElse(null); - for(Violation violation: violationList){ - violation.setFbKey(fishingBoat.getFbKey()); - violation.setViolationKey(i++); - ViolationVersion violationVersion = new ViolationVersion(); - BeanUtils.copyProperties(violation, violationVersion); - violationVersion.setVersionNo(lastViolationVersion.getVersionNo()+1); - violationVersionList.add(violationVersion); + if(violationList != null){ + List violationVersionList = new ArrayList<>(); + int i=1; + ViolationVersion lastViolationVersion = violationVersionRepository.findTop1ByFbKeyOrderByVersionNoDesc(fishingBoat.getFbKey()).orElse(null); + for(Violation violation: violationList){ + violation.setFbKey(fishingBoat.getFbKey()); + violation.setViolationKey(i++); + ViolationVersion violationVersion = new ViolationVersion(); + BeanUtils.copyProperties(violation, violationVersion); + violationVersion.setVersionNo(lastViolationVersion.getVersionNo()+1); + violationVersionList.add(violationVersion); + } + violationRepository.saveAll(violationList); + violationVersionRepository.saveAll(violationVersionList); } - violationRepository.saveAll(violationList); - violationVersionRepository.saveAll(violationVersionList); } return cdsKey; } @@ -199,14 +205,15 @@ public class FishingBoatService extends BaseService { crackdownStatus.getProcessResult().setWrtUserNm(fishingBoat.getWrtUserNm()); crackdownStatus.getProcessResult().setWrtUserGrd(fishingBoat.getWrtUserGrd()); crackdownStatus.getProcessResult().setWrtDt(LocalDateTime.now()); - - for(Sailor sailor: crackdownStatus.getSailorList()){ - sailor.setWrtOrgan(fishingBoat.getWrtOrgan()); - sailor.setWrtPart(fishingBoat.getWrtPart()); - sailor.setWrtUserSeq(fishingBoat.getWrtUserSeq()); - sailor.setWrtUserNm(fishingBoat.getWrtUserNm()); - sailor.setWrtUserGrd(fishingBoat.getWrtUserGrd()); - sailor.setWrtDt(LocalDateTime.now()); + if(crackdownStatus.getSailorList()!=null){ + for(Sailor sailor: crackdownStatus.getSailorList()){ + sailor.setWrtOrgan(fishingBoat.getWrtOrgan()); + sailor.setWrtPart(fishingBoat.getWrtPart()); + sailor.setWrtUserSeq(fishingBoat.getWrtUserSeq()); + sailor.setWrtUserNm(fishingBoat.getWrtUserNm()); + sailor.setWrtUserGrd(fishingBoat.getWrtUserGrd()); + sailor.setWrtDt(LocalDateTime.now()); + } } return crackdownStatus; } diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js index a4cfee56..df01130a 100644 --- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js +++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js @@ -142,7 +142,9 @@ $(document).on('change', '#crimeType', function (){ let smugglingAmount = ''; commonCode.SG.forEach(function (item){ - smugglingAmount += ''; + if(item.useChk === 'T'){ + smugglingAmount += ''; + } }) if ($(this).val() == 'CTH2') { diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html index a1aad7ea..55611862 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html @@ -44,9 +44,9 @@
diff --git a/src/main/resources/templates/layout/layout.html b/src/main/resources/templates/layout/layout.html index 60e4d2c8..57c6f2e4 100644 --- a/src/main/resources/templates/layout/layout.html +++ b/src/main/resources/templates/layout/layout.html @@ -50,10 +50,10 @@
-
+
-
+