diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java index 9d91801f..6c962878 100644 --- a/src/main/java/com/dbnt/faisp/config/FileController.java +++ b/src/main/java/com/dbnt/faisp/config/FileController.java @@ -7,6 +7,7 @@ import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.SailorService; import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService; import com.dbnt.faisp.main.fpiMgt.affairPlan.service.PlanService; import com.dbnt.faisp.main.fpiMgt.affairResult.service.ResultService; +import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.service.IntelligenceNetworkService; import com.dbnt.faisp.main.fpiMgt.sri.service.SriService; import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.service.BoardInvestigationService; import com.dbnt.faisp.main.ivsgtMgt.majorStatus.service.MajorStatusService; @@ -47,6 +48,7 @@ public class FileController extends BaseService{ private final SriService sriService; private final CounterIntelligenceService ciService; private final MajorStatusService majorStatusService; + private final IntelligenceNetworkService inrelligenceNetworkService; @GetMapping("/editorFileDisplay") public ResponseEntity editorFileDisplay(HttpServletRequest request, @@ -152,6 +154,9 @@ public class FileController extends BaseService{ case "ciActivity": downloadFile = ciService.selectCiaForeignerFile(parentKey, fileSeq); break; + case "operationPlan": + downloadFile = inrelligenceNetworkService.selectOperationPlanFile(parentKey, fileSeq); + break; } return downloadFile; } 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 474540cf..be45d537 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 @@ -71,6 +71,8 @@ public class OperationPlan extends BaseModel { private LocalDateTime wrtDt; + @Transient + private String status; @Transient private Integer fileCnt; @Transient 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 7740832a..a2b825d1 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 @@ -2,11 +2,12 @@ package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.service; import com.dbnt.faisp.config.BaseService; - +import com.dbnt.faisp.config.FileInfo; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.mapper.IntelligenceNetworkMapper; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlan; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanApprv; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanFile; +import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanFile.OperationPlanFileId; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.OperationPlanApprvRepository; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.OperationPlanFileRepository; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.OperationPlanRepository; @@ -119,6 +120,10 @@ public class IntelligenceNetworkService extends BaseService { } return apprv.getOpKey(); } + + public OperationPlanFile selectOperationPlanFile(Integer parentKey, Integer fileSeq) { + return operationPlanFileRepository.findById(new OperationPlanFileId(parentKey,fileSeq)).orElse(null); + } diff --git a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml index 29092538..51947a23 100644 --- a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml +++ b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml @@ -9,8 +9,8 @@ and op.wrt_user_seq = #{wrtUserSeq} - - and op.wrt_user_nm like '%'||#{wrtUserNm}||'%' + + and op.op_name like '%'||#{opName}||'%' and op.wrt_organ = #{wrtOrgan} @@ -52,10 +52,11 @@ - + + + + + + +
@@ -37,7 +37,7 @@
- +
@@ -52,7 +52,7 @@
- +
@@ -63,7 +63,7 @@
- +
@@ -77,25 +77,25 @@

- +
- +
- +
- +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html index 9e3fafd5..4eaeea42 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html @@ -11,7 +11,7 @@

운영계획서

-

첩보수집활동 > 외사첩보망 견문관리 > 계획수립

+

첩보수집활동 > 외사첩보망 견문관리 > 운영계획

@@ -28,7 +28,7 @@
-
- +
-
-
-
- -
-
- - - - - + 등록일:
@@ -87,7 +78,7 @@
- --> +
@@ -114,7 +105,8 @@ - + + diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html index 88f5da35..7c15b341 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html @@ -107,7 +107,7 @@ - diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html index 17543366..fd791023 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html @@ -86,7 +86,7 @@ -
운영중