From cb12ee46d04ebf1880aeff3fd5a75fd4738e0f41 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Wed, 4 Jan 2023 09:44:48 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=B0=A9=EC=B2=A9=ED=99=9C=EB=8F=99?= =?UTF-8?q?=20=EC=A4=91=EA=B0=84=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CounterIntelligenceController.java | 10 ++ .../CounterIntelligenceMapper.xml | 8 ++ .../js/counterIntelligence/ciaSaftyDemand.js | 18 ++- .../ciaSaftyDemandList.html | 4 +- .../ciaSaftyDemandviewModal.html | 118 ++++++++++-------- 5 files changed, 106 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java index 4e44bc5b..344b1420 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java @@ -114,6 +114,7 @@ public class CounterIntelligenceController { public ModelAndView ciaSaftyDemandList(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ ModelAndView mav = new ModelAndView("counterIntelligence/ciaSaftyDemandList"); + cia.setDownOrganCdList(loginUser.getDownOrganCdList()); cia.setQueryInfo(); mav.addObject("sdiList", ciService.selectCiaSaftyDemandList(cia)); cia.setContentCnt(ciService.selectCiaSaftyDemandListCnt(cia)); @@ -152,4 +153,13 @@ public class CounterIntelligenceController { ciService.saveSaftyDemand(cia); return ciKey; } + + @GetMapping("/ciaSaftyDemandViewModal") + public ModelAndView ciaSaftyDemandViewModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceActivity cia){ + ModelAndView mav = new ModelAndView("counterIntelligence/ciaSaftyDemandViewModal"); + mav.addObject("lineSeparator", '\n'); + mav.addObject("viewUserSeq", loginUser.getUserSeq()); + mav.addObject("cia", ciService.selectSaftyDemandInfo(cia)); + return mav; + } } diff --git a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml index 204ead99..239a1fdc 100644 --- a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml +++ b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml @@ -153,6 +153,10 @@ from counter_intelligence_activity cia, safty_demand_info sdi where cia.ci_key = sdi.ci_key + and cia.wrt_organ in + + #{item} + ORDER BY cia.ci_key DESC LIMIT #{rowCnt} OFFSET #{firstIndex} @@ -171,6 +175,10 @@ from counter_intelligence_activity cia, safty_demand_info sdi where cia.ci_key = sdi.ci_key + and cia.wrt_organ in + + #{item} + ORDER BY cia.ci_key DESC )a diff --git a/src/main/resources/static/js/counterIntelligence/ciaSaftyDemand.js b/src/main/resources/static/js/counterIntelligence/ciaSaftyDemand.js index d3f5cfcf..87dcc64f 100644 --- a/src/main/resources/static/js/counterIntelligence/ciaSaftyDemand.js +++ b/src/main/resources/static/js/counterIntelligence/ciaSaftyDemand.js @@ -50,5 +50,21 @@ $(document).on('click', '#saveBtn', function (){ }) $(document).on('click', '.sdiTr', function (){ - getCiaSaftyDemandEditModal($(this).find(".ciKey").val()); + getCiaSaftyDemandViewModal($(this).find(".ciKey").val()); }) + +function getCiaSaftyDemandViewModal(ciKey){ + $.ajax({ + url: '/counterIntelligence/ciaSaftyDemandViewModal', + data: {ciKey: ciKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#ciWorkViewModalBody").empty().append(html) + $("#ciWorkViewModal").modal('show'); + }, + error:function(){ + + } + }); +} diff --git a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html index 09ae839e..21426114 100644 --- a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html +++ b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandList.html @@ -9,10 +9,10 @@
-

방첩공작

+

치안수요 분석결과

-

외사방첩관리 > 방첩공작

+

외사방첩관리 > 방첩활동 > 치안수요 분석결과

diff --git a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandviewModal.html b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandviewModal.html index 0e513d42..f296ebda 100644 --- a/src/main/resources/templates/counterIntelligence/ciaSaftyDemandviewModal.html +++ b/src/main/resources/templates/counterIntelligence/ciaSaftyDemandviewModal.html @@ -1,62 +1,82 @@
-
치안수요 등록
+
방첩공작 열람
-
-
- - - -
- -
- +
+ + +
+
+
+
+ + + +
- -
- +
+
+ +
+
+
+
+ +
+
+
+
+ +
-
- -
- -
-
-
- -
- -
-
-
- -
-
- -
파일을 업로드 해주세요. - - -
- - 삭제 -
- +
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
파일명사이즈
파일이 없습니다.
+ +
-
- +
-
-
+
+ + + -
-
- - -
-
- \ No newline at end of file +
\ No newline at end of file