From 1f53c902f83f0a53616523ed76efa86d4b076ef6 Mon Sep 17 00:00:00 2001 From: jiHyung Date: Fri, 11 Nov 2022 09:43:54 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B2=98=EB=A6=AC=ED=98=84=ED=99=A9,=20?= =?UTF-8?q?=EB=8B=A8=EC=86=8D=ED=98=84=ED=99=A9,=20=EC=84=A0=EC=9B=90?= =?UTF-8?q?=EC=84=B8=EB=B6=80=ED=98=84=ED=99=A9=20=EB=94=94=EC=9E=90?= =?UTF-8?q?=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrackdownStatusController.java | 3 + .../ProcessResultController.java | 2 + .../crackdownsStatus/SailorController.java | 2 + .../model/processResult/ProcessResult.java | 6 +- .../crackdownsStatus/model/sailor/Sailor.java | 4 + .../mybatisMapper/ProcessResultMapper.xml | 7 + .../resources/mybatisMapper/SailorMapper.xml | 7 + .../static/js/faStatistics/crackdownStatus.js | 6 +- .../static/js/faStatistics/processResult.js | 12 +- .../static/js/faStatistics/sailor.js | 2 +- .../crackdownStatus/crackdownStatus.html | 53 ++- .../crackdownStatusEditModal.html | 312 +++++++++--------- .../crackdownStatusHistoryDetail.html | 148 +++++---- .../crackdownStatusHistoryViewModal.html | 220 ++++++------ .../crackdownStatusViewModal.html | 281 ++++++++-------- .../processResult/processResult.html | 33 +- .../processResult/processResultAddModal.html | 46 ++- .../processResult/processResultEditModal.html | 74 +++-- .../processResultHistoryDetail.html | 76 +++-- .../processResultHistoryViewModal.html | 74 ++--- .../processResult/processResultViewModal.html | 73 ++-- .../templates/faStatistics/sailor/sailor.html | 40 +-- .../faStatistics/sailor/sailorAddModal.html | 44 +-- .../faStatistics/sailor/sailorEditModal.html | 88 ++--- .../sailor/sailorHistoryDetail.html | 124 +++---- .../sailor/sailorHistoryViewModal.html | 104 +++--- .../faStatistics/sailor/sailorViewModal.html | 103 +++--- 27 files changed, 1015 insertions(+), 929 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java index 75e0d97b..92ddeb8b 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java @@ -80,6 +80,9 @@ public class CrackdownStatusController { crackdownStatus.setViolationList(violationRepository.findByFbKey(crackdownStatus.getFishingBoat().getFbKey())); crackdownStatus.setSailorList(sailorRepository.findByFbKey(crackdownStatus.getFishingBoat().getFbKey())); }else{ + crackdownStatus.setWrtOrgan(loginUser.getOgCd()); + crackdownStatus.setWrtPart(loginUser.getOfcCd()); + crackdownStatus.setWrtUserGrd(loginUser.getGroupCd()); crackdownStatus.setWrtOrgan(loginUser.getOgCd()); crackdownStatus.setWrtUserNm(loginUser.getUserNm()); crackdownStatus.setWrtDt(LocalDateTime.now()); diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java index 0228dafd..ab6959bf 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java @@ -78,6 +78,8 @@ public class ProcessResultController { processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey())); }else{ processResult.setWrtOrgan(loginUser.getOgCd()); + processResult.setWrtPart(loginUser.getOfcCd()); + processResult.setWrtUserGrd(loginUser.getGroupCd()); processResult.setWrtUserNm(loginUser.getUserNm()); processResult.setWrtDt(LocalDateTime.now()); } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java index 05b57162..81e238d8 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java @@ -111,6 +111,8 @@ public class SailorController { sailor.setFishingBoatList(fishingBoatRepository.findAll()); sailor.setWrtOrgan(loginUser.getOgCd()); + sailor.setWrtPart(loginUser.getOfcCd()); + sailor.setWrtUserGrd(loginUser.getGroupCd()); sailor.setWrtUserNm(loginUser.getUserNm()); sailor.setWrtDt(LocalDateTime.now()); diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java index 9920af84..a2478472 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java @@ -8,8 +8,10 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; +import java.time.LocalDateTime; import java.util.List; @Getter @@ -28,7 +30,9 @@ public class ProcessResult extends ProcessResultBaseEntity { @Column(name = "cds_key") private Integer cdsKey; - + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDateTime updDt; @Transient private CrackdownStatus crackdownStatus; @Transient diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java index b3ff26d5..205a722b 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java @@ -8,6 +8,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; import java.time.LocalDate; @@ -31,6 +32,9 @@ public class Sailor extends SailorBaseEntity { @Column(name = "fb_key") private Integer fbKey; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDateTime updDt; @Transient private Integer cdsKey; @Transient diff --git a/src/main/resources/mybatisMapper/ProcessResultMapper.xml b/src/main/resources/mybatisMapper/ProcessResultMapper.xml index 581ec755..bc7d2841 100644 --- a/src/main/resources/mybatisMapper/ProcessResultMapper.xml +++ b/src/main/resources/mybatisMapper/ProcessResultMapper.xml @@ -66,6 +66,7 @@ , pr.confiscation_dt , pr.boat_disposal_dt , pr.wrt_dt + , prv.upd_dt AS updDt FROM process_result pr INNER JOIN crackdown_status cs ON pr.cds_key = cs.cds_key @@ -73,6 +74,12 @@ ON pr.cds_key = fb.cds_key LEFT JOIN violation v ON fb.fb_key = v.fb_key + INNER JOIN ( + SELECT pr_key ,MAX(wrt_dt) AS upd_dt + FROM process_result_version + GROUP BY pr_key + ) prv + ON pr.pr_key = prv.pr_key ORDER BY pr.pr_key DESC LIMIT #{rowCnt} OFFSET #{firstIndex} diff --git a/src/main/resources/mybatisMapper/SailorMapper.xml b/src/main/resources/mybatisMapper/SailorMapper.xml index 48c8f1a5..c0e869a0 100644 --- a/src/main/resources/mybatisMapper/SailorMapper.xml +++ b/src/main/resources/mybatisMapper/SailorMapper.xml @@ -68,11 +68,18 @@ , s.wrt_user_grd , s.wrt_user_nm , s.wrt_dt + , sv.upd_dt AS updDt FROM sailor s INNER JOIN fishing_boat f ON s.fb_key = f.fb_key INNER JOIN crackdown_status cs ON f.cds_key = cs.cds_key + INNER JOIN ( + SELECT sailor_key ,MAX(wrt_dt) AS upd_dt + FROM sailor_version + GROUP BY sailor_key + ) sv + ON s.sailor_key = sv.sailor_key ORDER BY s.sailor_key DESC diff --git a/src/main/resources/static/js/faStatistics/crackdownStatus.js b/src/main/resources/static/js/faStatistics/crackdownStatus.js index 4cda6685..d5ac8e2d 100644 --- a/src/main/resources/static/js/faStatistics/crackdownStatus.js +++ b/src/main/resources/static/js/faStatistics/crackdownStatus.js @@ -113,7 +113,7 @@ $(document).on('click', '#violationAddBtn', function (){ $('#violationDiv').append( '
' - + '' + '' + violation + '' @@ -447,13 +447,13 @@ function saveCrackdownStatus(saveYn){ function contentCheck(){ let flag = true; - if(!$('input[name="boatNameKr"]').val()) { + if(!$('#cdsEditForm').find($('input[name="boatNameKr"]').val())) { alert('선명을 입력해주세요.'); $('input[name="boatNameKr"]').focus(); return false; } - if(!$('select[name="processStatus"]').val()) { + if(!$('#cdsEditForm').find($('select[name="processStatus"]').val())) { alert('처리현황을 선택해주세요.'); $('select[name="processStatus"]').focus(); return false; diff --git a/src/main/resources/static/js/faStatistics/processResult.js b/src/main/resources/static/js/faStatistics/processResult.js index 42193a1a..a74e0358 100644 --- a/src/main/resources/static/js/faStatistics/processResult.js +++ b/src/main/resources/static/js/faStatistics/processResult.js @@ -1,21 +1,21 @@ $(function(){ - $("#consignmentStartDt").datepicker({ + $("#consignmentStartDate").datepicker({ format: "yyyy-mm-dd", language: "ko" }); - $("#consignmentEndDt").datepicker({ + $("#consignmentEndDate").datepicker({ format: "yyyy-mm-dd", language: "ko" }); - $("#returnDt").datepicker({ + $("#returnDate").datepicker({ format: "yyyy-mm-dd", language: "ko" }); - $("#confiscationDt").datepicker({ + $("#confiscationDate").datepicker({ format: "yyyy-mm-dd", language: "ko" }); - $("#boatDisposalDt").datepicker({ + $("#boatDisposalDate").datepicker({ format: "yyyy-mm-dd", language: "ko" }); @@ -101,7 +101,7 @@ $(document).on('click', '#violationAddBtn', function (){ $('#violationDiv').append( '
' - + '' + '' + violation + '' diff --git a/src/main/resources/static/js/faStatistics/sailor.js b/src/main/resources/static/js/faStatistics/sailor.js index 026bc7a2..1f15eadc 100644 --- a/src/main/resources/static/js/faStatistics/sailor.js +++ b/src/main/resources/static/js/faStatistics/sailor.js @@ -48,7 +48,7 @@ $(document).on('click', '#violationAddBtn', function (){ $('#violationDiv').append( '
' - + '' + '' + violation + '' diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html index 91660ab6..c8b5576c 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html @@ -40,7 +40,7 @@
-
+
@@ -334,8 +334,8 @@
- - +
+ @@ -445,9 +445,9 @@ - + - + @@ -456,16 +456,16 @@ - - - - + + + + - + - + @@ -499,11 +499,11 @@ - + - + - + - + @@ -564,7 +564,7 @@ - + @@ -577,19 +577,19 @@ - + - - - - + + + + - - + + - + @@ -620,8 +620,8 @@ - - + + @@ -637,7 +637,6 @@
연번 나포일시 단속경찰서 단속함정 출생년도 어종 수량
@@ -525,10 +525,10 @@
-
diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusEditModal.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusEditModal.html index 4faf428a..ac290128 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusEditModal.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusEditModal.html @@ -17,6 +17,8 @@ + + @@ -25,64 +27,68 @@
- - + +
- +
+ +
+ + + +
+
+
- +
-
- -
- -
-
- - +
+
+
- - - + - + - -
- -
-
- - - -
- + + +
+ + + +
+ +
+
+ + + + +
+
+
+
- -
- - - -
- +
+
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
검거기관
- +
- +
- +
- +
- +
선박제원
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- + - +
- +
- + - +
- +
- +
@@ -236,45 +242,45 @@ 어획물 축소기재
- +
- +
- +
- +
범칙물
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
처리결과
- +
- +
@@ -295,53 +301,53 @@ 담보금 납부
- +
- +
- +
- +
담보금 미납
- +
- +
선박처리
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
+
- +
- - - + + +
- +
- +
- +
- +
구속/ 불구속
- +
- +
- +
- +
- +
+
- +
- +
- - +
- +
압송
- +
- +
- +
- +
- - +
- +
압수어구
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
\ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryDetail.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryDetail.html index 09e5b0f3..ee9ecb90 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryDetail.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryDetail.html @@ -4,26 +4,22 @@ 나포정보
-
- - + +
+
-
- -
- -
- - - -
- -
-
+
+ +
+ + + +
+
특수공무집행방해
- -
- + +
+
- -
- + +
+
- -
- +
+
+ +
+
- -
- + +
+
- -
- +
+
+ +
+
- -
- + +
+
- -
- +
+
+ +
+
검거기관
- -
-
- -
-
- -
- @@ -101,43 +113,47 @@
- -
- + +
+
현장조사
- -
- + +
+
- -
- +
+
+ +
+
- -
- + +
+
압송
- -
- + +
+
- -
- + +
+
- -
- +
+
+ +
+
\ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryViewModal.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryViewModal.html index 71acac52..4dbdc4e1 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryViewModal.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatusHistoryViewModal.html @@ -19,7 +19,7 @@ -
+