From 4df78ab1d41133cf351c693324e070f1293f27dc Mon Sep 17 00:00:00 2001 From: "DESKTOP-QGC5RJO\\DBNT" Date: Fri, 13 Jan 2023 17:59:11 +0900 Subject: [PATCH] =?UTF-8?q?asf=20=EB=B0=8F=20=EC=BD=94=EB=A1=9C=EB=82=9819?= =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=EC=A1=B0=EC=B9=98=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crackdownsStatus/AsfCovController.java | 2 +- .../crackdownsStatus/model/asfCov/AsfCov.java | 6 +- .../static/js/faStatistics/asfCov.js | 38 ++--- .../templates/faStatistics/asfCov/asfCov.html | 11 +- .../faStatistics/asfCov/asfCovEditModal.html | 10 +- .../asfCov/asfCovHistoryDetail.html | 4 +- .../faStatistics/asfCov/asfCovViewModal.html | 148 ++++++------------ .../processResult/processResultViewModal.html | 1 - 8 files changed, 82 insertions(+), 138 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java index 50cb3858..47167030 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java @@ -38,7 +38,7 @@ public class AsfCovController { mav.addObject("searchParams", asfCov); asfCov.setQueryInfo(); - mav.addObject("asfCov", asfCov); + // mav.addObject("asfCov", asfCov); mav.addObject("asfCovList", asfCovService.selectAsfCovList(asfCov)); asfCov.setPaginationInfo(); return mav; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/asfCov/AsfCov.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/asfCov/AsfCov.java index 4d111747..39525535 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/asfCov/AsfCov.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/asfCov/AsfCov.java @@ -36,7 +36,7 @@ public class AsfCov extends BaseModel { private Integer cdsKey; @Column(name ="person_cnt") - private Integer personCnt; + private Integer personCnt=0; @Column(name ="pressurized_yn") private String pressurizedYn; @@ -45,10 +45,10 @@ public class AsfCov extends BaseModel { private String pressurizedN; @Column(name ="person_negative_cnt") - private Integer personNegativeCnt; + private Integer personNegativeCnt=0; @Column(name ="person_positive_cnt") - private Integer personPositiveCnt; + private Integer personPositiveCnt=0; @Column(name ="asfcov_action_detail") private String asfcovActionDetail; diff --git a/src/main/resources/static/js/faStatistics/asfCov.js b/src/main/resources/static/js/faStatistics/asfCov.js index 5b32475a..c56ea857 100644 --- a/src/main/resources/static/js/faStatistics/asfCov.js +++ b/src/main/resources/static/js/faStatistics/asfCov.js @@ -222,29 +222,25 @@ $(document).on('change', '#searchFormPolice', function (){ } }) -// $(document).on('click', '#history-tab', function (){ -// const asfCovKey = $('#asfCovEditModalContent').find('.asfCovKey').val(); -// getHistoryViewModal(asfCovKey); +// $(function(){ +// const searchFormBoat = $("#pressurizedN") +// if(searchFormBoat.val()!==""){ +// searchFormBoat.find("."+$("#pressurizedYn").val()).show(); +// searchFormBoat.removeAttr("disabled"); +// } +// // }); // -// function getHistoryViewModal(asfCovKey){ -// $.ajax({ -// url: '/faStatistics/asfCovHistoryViewModal', -// data: { -// asfCovKey: asfCovKey, -// cdsKey : cdsKey, -// }, -// type: 'GET', -// dataType:"html", -// success: function(html){ -// $("#asfCovViewModalContent").empty().append(html) -// $("#asfCovViewModal").modal('show'); -// }, -// error:function(e){ -// ajaxErrorAction(e); -// } -// }); -// } +// $(document).on('change', '#pressurizedYn', function (){ +// const searchFormBoat = $("#pressurizedN") +// searchFormBoat.find("option").hide() +// if(this.value !== ""){ +// searchFormBoat.removeAttr("disabled") +// searchFormBoat.find("."+this.value).show(); +// }else{ +// searchFormBoat.attr("disabled", "disabled") +// } +// }) $(document).on('click', '.versionInfoTr', function (){ $(this).find(".versionNo").prop('checked', true); diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCov.html b/src/main/resources/templates/faStatistics/asfCov/asfCov.html index 3090cb03..721d220b 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCov.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCov.html @@ -112,8 +112,9 @@ - - + + + @@ -134,9 +135,9 @@ - O - - + + + diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html b/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html index 1b051d80..ebd4cda7 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html @@ -97,24 +97,24 @@
- +
- +
- +
diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCovHistoryDetail.html b/src/main/resources/templates/faStatistics/asfCov/asfCovHistoryDetail.html index 559a1acd..ffb9e688 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCovHistoryDetail.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCovHistoryDetail.html @@ -53,7 +53,7 @@
- @@ -61,7 +61,7 @@
- diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html b/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html index e5b24df3..efa80a1e 100644 --- a/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html +++ b/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html @@ -24,112 +24,60 @@
diff --git a/src/main/resources/templates/faStatistics/processResult/processResultViewModal.html b/src/main/resources/templates/faStatistics/processResult/processResultViewModal.html index 6f5afc06..82e48de7 100644 --- a/src/main/resources/templates/faStatistics/processResult/processResultViewModal.html +++ b/src/main/resources/templates/faStatistics/processResult/processResultViewModal.html @@ -157,7 +157,6 @@
-