From 767fca621c844c1b4fba027ac089e3ed8ab65d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 13 Feb 2023 11:14:32 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=EB=B3=B4=EA=B3=A0=20=20-=20?= =?UTF-8?q?=EB=AC=B8=EC=84=9C=EB=B2=88=ED=98=B8=20=EB=B6=80=EC=97=AC=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=EC=99=84=EB=A3=8C=20=20-=20=EC=9D=B8?= =?UTF-8?q?=EC=87=84=20=EC=9E=91=EC=97=85=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faisp/main/fpiMgt/affair/AffairController.java | 2 +- .../main/fpiMgt/affair/mapper/AffairMapper.java | 2 ++ .../faisp/main/fpiMgt/affair/model/AffairBoard.java | 2 ++ .../main/fpiMgt/affair/service/AffairService.java | 1 + src/main/resources/mybatisMapper/AffairMapper.xml | 13 +++++++++++-- .../js/igActivities/fpiMgt/affair/affairMgt.js | 4 ++++ .../igActivities/fpiMgt/affair/affairMgt.html | 6 +++--- .../igActivities/fpiMgt/affair/affairViewModal.html | 3 ++- src/main/resources/templates/login/dashboard.html | 4 ++-- 9 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java index cf763ed3..a1caf26f 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/AffairController.java @@ -98,7 +98,7 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 affairBoard.setWrtOrgan(loginUser.getOgCd()); affairBoard.setDownOrganCdList(loginUser.getDownOrganCdList()); String parentOrgan = organConfigService.selectParentOrgan(loginUser.getOgCd()); - if(!parentOrgan.equals("OG001")){ + if(parentOrgan!= null && !parentOrgan.equals("OG001")){ affairBoard.setGroupOrganCdList(organConfigService.selectChildOrgan(parentOrgan)); } affairBoard.setQueryType("openReportList"); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java index 4c808698..036a2bea 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/mapper/AffairMapper.java @@ -32,4 +32,6 @@ public interface AffairMapper { List selectSangboTotal(TypeStatistics typeStatistics); List selectArrCntList(TypeStatistics typeStatistics); + + String selectDocNo(AffairBoard affair); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairBoard.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairBoard.java index f3dfcaa6..68aa7d08 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairBoard.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/model/AffairBoard.java @@ -63,6 +63,8 @@ public class AffairBoard extends BaseModel { private String affairCategory; @Column(name = "wrt_user_grd") private String wrtUserGrd; + @Column(name = "doc_no") + private String docNo; @Transient private String organUp; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java index 576a4231..0c7d07fb 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affair/service/AffairService.java @@ -53,6 +53,7 @@ public class AffairService extends BaseService { // 견문보고 } @Transactional public Integer saveAffairBoard(AffairBoard affair, List deleteFileSeq){ + affair.setDocNo(affairMapper.selectDocNo(affair)); Integer affairKey = affairBoardRepository.save(affair).getAffairKey(); if(!affair.getHashTags().isEmpty()){ saveHashTagLink(affairKey, affair.getHashTags().split(" ")); diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index 88c0e9ba..da8ce0b8 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -110,7 +110,8 @@ b.fileCnt, c.affair_status, c.affair_rate, - c.organ_up + c.organ_up, + a.doc_no from affair_board a left outer join (select affair_key, count(file_seq) as fileCnt @@ -137,6 +138,15 @@ where a.affair_key = #{affairKey} + + and wrt_user_nm like '%'||#{userNm}||'%' @@ -644,5 +654,4 @@ on c.wrt_organ = a.item_cd and c.affair_rate = b.item_cd order by wrt_organ,affairType asc - \ No newline at end of file diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js index ba0a6e60..97fb6ff1 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js @@ -225,6 +225,10 @@ $(document).on('click', '#fileDownBtn', function (){ } }) +$(document).on('click', '#printBtn', function (){ + window.open("http://118.219.150.34:50570/ClipReport5/report.jsp") +}) + function getAffairViewModal(affairKey){ $.ajax({ url: '/affair/affairViewModal', diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html index 4ed34d7d..68477f83 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html @@ -160,7 +160,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -220,7 +220,7 @@ - +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html index 7d41ea20..a7dfa717 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html @@ -24,7 +24,7 @@ + th:text="${affair.docNo}">
+ diff --git a/src/main/resources/templates/login/dashboard.html b/src/main/resources/templates/login/dashboard.html index 3069c024..5078ace3 100644 --- a/src/main/resources/templates/login/dashboard.html +++ b/src/main/resources/templates/login/dashboard.html @@ -125,7 +125,7 @@
외사경찰 견문관리
-
+
@@ -158,7 +158,7 @@
외사첩보망 견문관리
-
+