From abf85070303083c503e941b65eff95c66389500c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Tue, 26 Mar 2024 18:04:10 +0900 Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=B2=A9=EB=B3=B4=EB=A7=9D?= =?UTF-8?q?=20=EC=9A=B4=EC=98=81=EA=B3=84=ED=9A=8D,=20=ED=95=B4=EA=B3=A0/?= =?UTF-8?q?=EC=97=B0=EC=9E=A5=EB=B3=B4=EA=B3=A0=20=EC=9E=91=EC=97=85?= =?UTF-8?q?=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IntelligenceNetworkController.java | 2 + .../model/FireExtensionReport.java | 2 + .../model/OperationPlan.java | 3 +- .../service/IntelligenceNetworkService.java | 1 + .../IntelligenceNetworkMapper.xml | 13 ++++- .../fireExtensionReport.js | 31 ++++++---- .../fireExtensionReportEditModal.html | 56 ++++++++++++------- .../fireExtensionReportViewModal.html | 14 +++-- .../operationPlanList.html | 5 +- .../operationPlanListModal.html | 13 +---- 10 files changed, 90 insertions(+), 50 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 c86d73cc..f33383ac 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 @@ -129,6 +129,7 @@ public class IntelligenceNetworkController { MultipartHttpServletRequest request, @RequestParam(value = "fileSeq", required = false) List deleteFileSeq){ op.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); if(op.getOpKey() == null) { + op.setCollaboratorStatus("CS001"); op.setWrtOrgan(loginUser.getOgCd()); op.setWrtPart(loginUser.getOfcCd()); op.setWrtUserGrd(loginUser.getTitleCd()); @@ -424,6 +425,7 @@ public class IntelligenceNetworkController { ModelAndView mav = new ModelAndView("igActivities/intelligenceNetwork/operationPlanListModal"); op.setFirstIndex(0); op.setRowCnt(9999); + op.setCollaboratorStatus("feEditModal"); if(Utils.isEmpty(op.getWrtOrgan())){ op.setWrtOrgan(loginUser.getOgCd()); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/FireExtensionReport.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/FireExtensionReport.java index 63046dde..9584936d 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/FireExtensionReport.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/FireExtensionReport.java @@ -80,6 +80,8 @@ public class FireExtensionReport extends BaseModel { @Transient private String opSdate; @Transient + private String collaboratorStatus; + @Transient private OperationPlan operationPlan; @Transient List apprvList; 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 2f1ddb1a..b7deb6cb 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 @@ -72,7 +72,8 @@ public class OperationPlan extends BaseModel { @Column(name = "wrt_dt") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime wrtDt; - + @Column(name = "collaborator_status") + private String collaboratorStatus; @Transient private String status; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java index 68d1e371..9f3d52d6 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java @@ -214,6 +214,7 @@ public class IntelligenceNetworkService extends BaseService { @Transactional public Integer saveFireExtensionReport(FireExtensionReport fer) { Integer ferKey = fireExtensionReportRepository.save(fer).getFerKey(); + operationPlanRepository.findById(fer.getOpKey()).ifPresent(op -> op.setCollaboratorStatus(fer.getCollaboratorStatus())); if(fer.getFerState().equals("DST002")){ //작성완료일 때 부장 결재 사용자에게 알림 발송. userAlarmService.sendAlarmToApprvUser(ferKey, fer.getWrtOrgan(), "APC001", 35, "외사첩보망 견문관리 외사첩보망 해고(연장)보고에 결재대기 문서가 있습니다."); diff --git a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml index 361b7709..4a0c6274 100644 --- a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml +++ b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml @@ -48,6 +48,16 @@ and op_state in ('DST003', 'DST004', 'DST005', 'DST006') + + + + and op.collaborator_status in ('CS001', 'CS002') + + + and op.collaborator_status = #{collaboratorStatus} + + + - -
+
+
@@ -61,21 +61,29 @@
-
-
- -
- -
- -
- -
- +
+
+ +
+ +
+ +
+ +
+ +
+ +
+
@@ -98,12 +106,12 @@
-
-
+
+
@@ -112,6 +120,10 @@
+ +
+ +
@@ -122,10 +134,14 @@
- -
- -
+ +
+ +
@@ -154,7 +170,7 @@
- +
diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html index 3fcd77a0..156ff104 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html @@ -34,20 +34,26 @@ -
-
+
+
+ +
- - + +
■ 소요예산
diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html index e3a1e94d..3c545134 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html @@ -113,8 +113,9 @@ - 운영중 - + + + diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanListModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanListModal.html index 05cd6889..2f183c4d 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanListModal.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanListModal.html @@ -8,7 +8,6 @@ - @@ -20,8 +19,8 @@ - - + + @@ -33,12 +32,4 @@
성명 생년월일 근무처(소속)
- -
-
- -
-
- -
\ No newline at end of file