From 8b7a9d19b1922589eb5a44eba4d3ff534560ef76 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Thu, 19 Jan 2023 13:24:13 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=99=B8=EC=82=AC=EC=B2=A9=EB=B3=B4?= =?UTF-8?q?=EB=A7=9D=20=EA=B2=AC=EB=AC=B8=EA=B4=80=EB=A6=AC=20=EC=9A=B4?= =?UTF-8?q?=EC=9A=A9=EA=B3=84=ED=9A=8D=20=EC=9A=B4=EC=9A=A9=EC=8B=9C?= =?UTF-8?q?=EC=9E=91=EC=9D=BC=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EB=B7=B0?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=85=8D=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EC=97=90=EC=96=B4=EB=A6=AC=EC=96=B4=20=EC=A4=84=EB=B0=94?= =?UTF-8?q?=EA=BF=88=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IntelligenceNetworkController.java | 2 ++ .../intelligenceNetwork/model/OperationPlan.java | 3 +++ .../fpiMgt/intelligenceNetwork/operationPlan.js | 7 ++++++- .../intelligenceNetwork/operationPlanEditModal.html | 4 ++++ .../intelligenceNetwork/operationPlanViewModal.html | 10 ++++++---- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java index 1a5ffbfb..a740494e 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java @@ -142,6 +142,7 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getAccessAuth()); mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getApprovalAuth()); + mav.addObject("lineSeparator", '\n'); return mav; } @@ -286,6 +287,7 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getAccessAuth()); mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getApprovalAuth()); + mav.addObject("lineSeparator", '\n'); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/OperationPlan.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/OperationPlan.java index be45d537..2f1ddb1a 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/OperationPlan.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/OperationPlan.java @@ -46,6 +46,9 @@ public class OperationPlan extends BaseModel { private String opRank; @Column(name = "op_etc") private String opEtc; + @Column(name = "op_sdate") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate opSdate; @Column(name = "target_location") private String targetLocation; @Column(name = "vulnerability_analyze") diff --git a/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/operationPlan.js b/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/operationPlan.js index 6f0e0bc7..42f50081 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/operationPlan.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/operationPlan.js @@ -28,7 +28,7 @@ function getOerationPlanEditModal(opKey){ dataType:"html", success: function(html){ $("#operationPlanEditModalContent").empty().append(html) - $("#opBirth").datepicker({ + $("#opBirth,#opSdate").datepicker({ format: "yyyy-mm-dd", language: "ko", autoclose: true @@ -48,6 +48,11 @@ $(document).on('click', '#editBtn', function (){ }) $(document).on('click', '#saveBtn', function (){ + if(!$("#opSdate").val()){ + alert("운용시작일을 입력해주세요."); + $('#opSdate').focus(); + return false; + } if(!$("#opName").val()){ alert("성명을 입력해주세요."); $('#opName').focus(); diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html index c6884dda..a94d44b9 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html @@ -16,6 +16,10 @@
+ +
+ +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html index 7c15b341..8b70b2dc 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html @@ -17,6 +17,8 @@
+ + @@ -65,28 +67,28 @@
-
+
-
+
-
+
-
+