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 a15f5079..3cefa579 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 @@ -9,6 +9,7 @@ import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.Illega import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ShipProcessInfo; import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ShipProcessInfoHistory; import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.IllegalShipSailor; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.IllegalShipSailorHistory; import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.UnlawfulFishingService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; @@ -161,7 +162,7 @@ public class UnlawfulFishingController { } @PostMapping("/deleteIllegalShipInfo") - public void deleteIllegalShipInfo(IllegalShipInfo illegalShipInfo){ + public void deleteIllegalShipInfo(@RequestBody IllegalShipInfo illegalShipInfo){ unlawfulFishingService.deleteIllegalShipInfo(illegalShipInfo.getFbKey()); } @@ -240,7 +241,7 @@ public class UnlawfulFishingController { } @PostMapping("/deleteShipProcessInfo") - public void deleteShipProcessInfo(ShipProcessInfo shipProcessInfo){ + public void deleteShipProcessInfo(@RequestBody ShipProcessInfo shipProcessInfo){ unlawfulFishingService.deleteShipProcessInfo(shipProcessInfo.getPrKey()); } @@ -284,11 +285,23 @@ public class UnlawfulFishingController { unlawfulFishingService.saveIllegalShipSailorList(sailorList); } + @PostMapping("/saveIllegalShipSailor") + public void saveIllegalShipSailor(@AuthenticationPrincipal UserInfo loginUser, IllegalShipSailor sailorInfo){ + sailorInfo.setWrtOrgan(loginUser.getOgCd()); + sailorInfo.setWrtPart(loginUser.getOfcCd()); + sailorInfo.setWrtUserSeq(loginUser.getUserSeq()); + sailorInfo.setWrtUserGrd(loginUser.getTitleCd()); + sailorInfo.setWrtUserNm(loginUser.getUserNm()); + sailorInfo.setWrtDt(LocalDateTime.now()); + unlawfulFishingService.saveIllegalShipSailor(sailorInfo); + } + @GetMapping("/issEditModal") public ModelAndView illegalShipSailorEditModal(@AuthenticationPrincipal UserInfo loginUser, IllegalShipSailor illegalShipSailor){ ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/illegalShipSailor/issEditModal"); illegalShipSailor = unlawfulFishingService.selectIllegalShipSailor(illegalShipSailor.getSailorKey()); mav.addObject("illegalShipSailor", illegalShipSailor); + mav.addObject("illegalShipInfo", unlawfulFishingService.selectIllegalShipInfo(illegalShipSailor.getFbKey())); return mav; } @GetMapping("/issViewModal") @@ -307,6 +320,17 @@ public class UnlawfulFishingController { mav.addObject("userSeq", loginUser.getUserSeq()); return mav; } + @GetMapping("/issHistoryDiv") + public ModelAndView illegalShipSailorHistoryDiv(IllegalShipSailorHistory history){ + ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv"); + mav.addObject("illegalShipSailor", unlawfulFishingService.selectIllegalShipSailorHistory(history.getSailorKey(), history.getVersionNo())); + return mav; + } + + @PostMapping("/deleteIllegalShipSailor") + public void deleteIllegalShipSailor(@RequestBody IllegalShipSailor sailor){ + unlawfulFishingService.deleteIllegalShipSailor(sailor.getSailorKey()); + } @GetMapping("/crackdownStatusVersionInfo") public ModelAndView selectUnlawfulFishingVersionInfo(Integer cdsKey, Integer versionNo){ diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/IllegalShipSailorHistory.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/IllegalShipSailorHistory.java index ad337e0d..2db751dc 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/IllegalShipSailorHistory.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/IllegalShipSailorHistory.java @@ -33,8 +33,8 @@ public class IllegalShipSailorHistory extends SailorBaseEntity { @NoArgsConstructor @AllArgsConstructor public static class IllegalShipSailorHistoryId implements Serializable { - private Integer versionNo; - private Integer sailorKey; + private Integer sailorKey; + private Integer versionNo; } /*@Transient diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/IllegalShipSailorRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/IllegalShipSailorRepository.java index d0905fad..8a499194 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/IllegalShipSailorRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/IllegalShipSailorRepository.java @@ -19,4 +19,8 @@ public interface IllegalShipSailorRepository extends JpaRepository sailorDeleteKeyList); Optional findBySailorKey(Integer sailorKey); + + @Modifying(clearAutomatically = true) + @Query("update IllegalShipSailor set status = :status where sailorKey = :sailorKey") + void bulkModifyingBySailorKeyToStatus(Integer sailorKey, String status); } 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 e375b4df..bc3d269f 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 @@ -256,6 +256,24 @@ public class UnlawfulFishingService { isshRepository.saveAll(historyList); } + public void saveIllegalShipSailor(IllegalShipSailor sailorInfo) { + if(sailorInfo.getStatus().equals("DST007")){ + IllegalShipSailorHistory lastHistory = isshRepository.findTopBySailorKeyOrderByVersionNoDesc(sailorInfo.getSailorKey()).orElse(null); + IllegalShipSailorHistory history = new IllegalShipSailorHistory(); + BeanUtils.copyProperties(sailorInfo, history); + history.setVersionNo(lastHistory==null?1:(lastHistory.getVersionNo()+1)); + isshRepository.save(history); + if(lastHistory!=null){ + sailorInfo.setWrtOrgan(lastHistory.getWrtOrgan()); + sailorInfo.setWrtPart(lastHistory.getWrtPart()); + sailorInfo.setWrtUserSeq(lastHistory.getWrtUserSeq()); + sailorInfo.setWrtUserGrd(lastHistory.getWrtUserGrd()); + sailorInfo.setWrtUserNm(lastHistory.getWrtUserNm()); + } + } + issRepository.save(sailorInfo); + } + public List selectIllegalShipSailorList(UnlawfulFishingParam params) { return unlawfulFishingMapper.selectIllegalShipSailorList(params); } @@ -267,4 +285,13 @@ public class UnlawfulFishingService { public List selectIllegalShipSailorHistoryList(Integer sailorKey) { return isshRepository.findBySailorKeyOrderByVersionNoDesc(sailorKey); } + + public IllegalShipSailorHistory selectIllegalShipSailorHistory(Integer sailorKey, Integer versionNo) { + return isshRepository.findById(new IllegalShipSailorHistory.IllegalShipSailorHistoryId(sailorKey, versionNo)).orElse(null); + } + + @Transactional + public void deleteIllegalShipSailor(Integer sailorKey) { + issRepository.bulkModifyingBySailorKeyToStatus(sailorKey, "DST008"); + } } diff --git a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml index bab60f74..9c54edd3 100644 --- a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml +++ b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml @@ -188,6 +188,8 @@ inner join illegal_ship_info b on a.fb_key = b.fb_key inner join crackdown_info c on b.cds_key = c.cds_key + order by a.wrt_dt desc + limit #{rowCnt} offset #{firstIndex} +
+ - +
- +
- + +
- -
- +
+ +
+ +
+ +
+ +
+ +
+ +
- -
- +
+ +
+ +
+ +
+ +
+ +
+ +
- -
- +
+ +
+ +
+ +
+ +
+ +
+ +
-
-
- -
- +
+ +
+ +
+ +
+ +
- -
- +
+ +
+ +
- -
- -
-
-
- -
- -
- -
- -
- -
- -
-
-
- -
- -
- -
- -
-
-
- -
- -
- -
- +
+ +
+ +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html new file mode 100644 index 00000000..49e21044 --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issHistoryDiv.html @@ -0,0 +1,57 @@ + + +
+
■ 선원정보
+
+
+ + + + + + + + +
+
+ + + + + + + + +
+
+ + + + + + +
+
+ +
+
+
+ +
+
\ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html index efc0d18d..d484a697 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html @@ -7,14 +7,14 @@