From 1ce9d2dd0779d047e69b8d9613b4216d3378ffe1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-QGC5RJO\\DBNT" Date: Mon, 30 Jan 2023 11:41:16 +0900 Subject: [PATCH 1/3] =?UTF-8?q?sri=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=88=9C=EC=84=9C=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/sri/sriBoard.html | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/main/resources/templates/sri/sriBoard.html b/src/main/resources/templates/sri/sriBoard.html index 42006a97..a3ec262e 100644 --- a/src/main/resources/templates/sri/sriBoard.html +++ b/src/main/resources/templates/sri/sriBoard.html @@ -80,35 +80,25 @@ - - - - + + + + - + - + - - - - + + @@ -116,6 +106,17 @@ + + + @@ -126,7 +127,7 @@
- +
+ th:data-parentkey="${file.affairKey}" th:data-fileseq="${file.fileSeq}" + th:text="|${file.origNm}.${file.fileExtn}|"> @@ -122,7 +142,7 @@
-
+
- +
-
- +
+ - - - - + + + +
-
- - +
+ +
-
+
- + - + - - - - + + + +
-
- - +
+ +
@@ -183,26 +223,32 @@
- + -
+
- +
- +
- +
- + -
+
- +
@@ -218,10 +264,12 @@
- +
- +
@@ -245,5 +293,5 @@ - +
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html index c7db601f..51dc59f2 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html @@ -13,20 +13,24 @@
- +
- +
- +
- +
@@ -36,7 +40,8 @@
- +
@@ -45,7 +50,8 @@
- +
@@ -80,7 +86,8 @@
+ th:data-parentkey="${file.planKey}" th:data-fileseq="${file.fileSeq}" + th:text="|${file.origNm}.${file.fileExtn}|"> @@ -89,28 +96,47 @@
상태분류제출기한순번 제목 관서 부서분류제출기한상태 작성자작성일시작성일
- - - - - - - - + + + + + + + +
+ +
-
-
- - +
+ + +
+ + + 결재결과: + -
- -
+ + 결재자: + + + + 결재일시: + + +
+ 기타의견: +
-
- -
-
-
+ +
@@ -123,10 +149,12 @@
- +
- +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html index b2acf492..2d8f9e10 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html @@ -95,6 +95,7 @@ + 순번 제목 사업기간 관서 @@ -107,11 +108,12 @@ - + + diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html index 4e7133a0..83328cd5 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html @@ -24,17 +24,16 @@
- -
+ +
- -
+ +
-
- -
+ +
@@ -42,35 +41,34 @@
- -
+ +
- -
+ +
- -
+ +
- -
+ +
-
- -
+ +
- +
@@ -98,26 +96,26 @@
- -
+ +
- +
- +
- +
@@ -125,7 +123,7 @@
- +
@@ -147,7 +145,7 @@
- +
@@ -208,18 +206,28 @@
-
-
+ +
+
+ - + 결재결과: + - + + 결재자: + + + 결재일시: + +
-
- -
-
- +
+ 기타의견: +
From 55df800b70f94f5eca4798b6f957d3cbe8b0e83d Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Mon, 30 Jan 2023 15:58:10 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=EC=99=B8=EC=82=AC=EB=AA=A8?= =?UTF-8?q?=EB=8B=88=ED=84=B0=EB=A7=81=20=EC=A7=80=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EA=B3=A0=20=ED=8C=8C=EC=9D=BC=EB=8B=A4=EC=9A=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dbnt/faisp/config/FileController.java | 5 +++++ .../main/fpiMgt/monitoring/service/MonitoringService.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java index b764b325..81bba3e4 100644 --- a/src/main/java/com/dbnt/faisp/config/FileController.java +++ b/src/main/java/com/dbnt/faisp/config/FileController.java @@ -8,6 +8,7 @@ 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.monitoring.service.MonitoringService; 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; @@ -57,6 +58,7 @@ public class FileController extends BaseService{ private final CounterIntelligenceService ciService; private final MajorStatusService majorStatusService; private final IntelligenceNetworkService inrelligenceNetworkService; + private final MonitoringService monitoringService; @GetMapping("/editorFileDisplay") public ResponseEntity editorFileDisplay(HttpServletRequest request, @@ -233,6 +235,9 @@ public class FileController extends BaseService{ case "operationPlan": downloadFile = inrelligenceNetworkService.selectOperationPlanFile(parentKey, fileSeq); break; + case "designation": + downloadFile = monitoringService.selectDesignationFile(parentKey, fileSeq); + break; } return downloadFile; } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java index 892b297f..ab54c57b 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java @@ -17,6 +17,7 @@ import com.dbnt.faisp.main.fpiMgt.monitoring.mapper.MonitoringMapper; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignation; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignationApprv; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignationFile; +import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignationFile.monitoringDesignationFileId; import com.dbnt.faisp.main.fpiMgt.monitoring.repository.MonitoringDesignationApprvRepository; import com.dbnt.faisp.main.fpiMgt.monitoring.repository.MonitoringDesignationFileRepository; import com.dbnt.faisp.main.fpiMgt.monitoring.repository.MonitoringDesignationRepository; @@ -134,6 +135,10 @@ public class MonitoringService extends BaseService { } return apprv.getMdKey(); } + + public MonitoringDesignationFile selectDesignationFile(Integer parentKey, Integer fileSeq) { + return monitoringDesignationFileRepository.findById(new monitoringDesignationFileId(parentKey,fileSeq)).orElse(null); + }