From 0e70e715b278d1234bd19edc3eeb9d0276ed9d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 12 Oct 2022 17:40:48 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B2=AD=EC=82=B0=EB=B3=B4=EA=B3=A0=EC=84=9C?= =?UTF-8?q?=20=EC=9E=91=EC=97=85=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/config/FileController.java | 5 + .../fpiMgt/affairResult/ResultController.java | 6 +- .../affairResult/mapper/ResultMapper.java | 4 + .../fpiMgt/affairResult/model/ClearInfo.java | 2 +- .../affairResult/model/ResultBoard.java | 5 + .../repository/ClearInfoRepository.java | 4 + .../repository/ResultInfoRepository.java | 4 + .../repository/ResultToAffairRepository.java | 4 + .../affairResult/service/ResultService.java | 3 + .../resources/mybatisMapper/ResultMapper.xml | 29 +- src/main/resources/static/css/common.css | 2 +- .../igActivities/fpiMgt/result/resultMgt.js | 20 +- .../fpiMgt/affair/affairViewModal.html | 2 +- .../fpiMgt/affairResult/clearInfoRow.html | 2 +- .../fpiMgt/affairResult/resultEditModal.html | 75 +++- .../fpiMgt/affairResult/resultMgt.html | 35 +- .../fpiMgt/affairResult/resultViewModal.html | 343 ++++++++++++------ 17 files changed, 393 insertions(+), 152 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java index 6b49c312..49b4cbc6 100644 --- a/src/main/java/com/dbnt/faisp/config/FileController.java +++ b/src/main/java/com/dbnt/faisp/config/FileController.java @@ -2,6 +2,7 @@ package com.dbnt.faisp.config; import com.dbnt.faisp.fpiMgt.affair.service.AffairService; import com.dbnt.faisp.fpiMgt.affairPlan.service.PlanService; +import com.dbnt.faisp.fpiMgt.affairResult.service.ResultService; import com.dbnt.faisp.ivsgtMgt.boardInvestigation.service.BoardInvestigationService; import com.dbnt.faisp.publicBoard.service.PublicBoardService; import lombok.RequiredArgsConstructor; @@ -21,6 +22,7 @@ public class FileController { private final PlanService planService; private final PublicBoardService publicBoardService; private final AffairService affairService; + private final ResultService resultService; private final BoardInvestigationService boardInvestigationService; @GetMapping("/file/fileDownload") @@ -40,6 +42,9 @@ public class FileController { case "affair": downloadFile = affairService.selectAffairFile(parentKey, fileSeq); break; + case "affairResult": + downloadFile = resultService.selectResultFile(parentKey, fileSeq); + break; case "ivsgt": downloadFile = boardInvestigationService.selectIvsgtFile(parentKey, fileSeq); break; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java index 51740571..00f4753f 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/ResultController.java @@ -50,8 +50,8 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 mav.addObject("accessAuth", accessAuth); mav.addObject("apprvAuth", apprvAuth); resultBoard.setQueryInfo(); -// mav.addObject("resultList", resultService.selectResultBoardList(resultBoard)); -// resultBoard.setContentCnt(resultService.selectResultBoardListCnt(resultBoard)); + mav.addObject("resultList", resultService.selectResultBoardList(resultBoard)); + resultBoard.setContentCnt(resultService.selectResultBoardListCnt(resultBoard)); resultBoard.setContentCnt(0); resultBoard.setPaginationInfo(); mav.addObject("searchParams", resultBoard); @@ -168,6 +168,8 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 resultBoard.setWrtDt(LocalDateTime.now()); } mav.addObject("result", resultBoard); + mav.addObject("categoryList", codeMgtService.selectCodeMgtList("RIC")); + mav.addObject("codeList", codeMgtService.selectCodeMgtList("RID")); return mav; } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/mapper/ResultMapper.java b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/mapper/ResultMapper.java index f5d7c6b6..b24687ff 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/mapper/ResultMapper.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/mapper/ResultMapper.java @@ -1,6 +1,8 @@ package com.dbnt.faisp.fpiMgt.affairResult.mapper; +import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard; import com.dbnt.faisp.fpiMgt.affairResult.model.ResultBoard; +import com.dbnt.faisp.fpiMgt.affairResult.model.ResultToAffair; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -11,4 +13,6 @@ public interface ResultMapper { List selectResultBoardList(ResultBoard resultBoard); Integer selectResultBoardListCnt(ResultBoard resultBoard); + + List selectAffairToResultKey(Integer resultKey); } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ClearInfo.java b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ClearInfo.java index f5466b83..6bb42d85 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ClearInfo.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ClearInfo.java @@ -26,7 +26,7 @@ public class ClearInfo { @Column(name = "use_catg") private String useCatg; @Column(name = "use_detail") - private String userDetail; + private String useDetail; @Column(name = "price") private Double price; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultBoard.java b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultBoard.java index bc7ed174..2e0de927 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultBoard.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/model/ResultBoard.java @@ -1,6 +1,7 @@ package com.dbnt.faisp.fpiMgt.affairResult.model; import com.dbnt.faisp.config.BaseModel; +import com.dbnt.faisp.fpiMgt.affair.model.AffairBoard; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -70,6 +71,8 @@ public class ResultBoard extends BaseModel { @Transient private String userType; @Transient + private Integer affairCnt; + @Transient private Integer fileCnt; @Transient private List apprvList; @@ -83,4 +86,6 @@ public class ResultBoard extends BaseModel { private List resultInfoList; @Transient private List affairList; + @Transient + private List affairBoardList; } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ClearInfoRepository.java b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ClearInfoRepository.java index 642e93c1..30f9d7a1 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ClearInfoRepository.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ClearInfoRepository.java @@ -3,7 +3,11 @@ package com.dbnt.faisp.fpiMgt.affairResult.repository; import com.dbnt.faisp.fpiMgt.affairResult.model.ClearInfo; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface ClearInfoRepository extends JpaRepository { void deleteByResultKey(Integer resultKey); + + List findByResultKey(Integer resultKey); } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultInfoRepository.java b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultInfoRepository.java index 0f2e3a82..9b4849bc 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultInfoRepository.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultInfoRepository.java @@ -3,8 +3,12 @@ package com.dbnt.faisp.fpiMgt.affairResult.repository; import com.dbnt.faisp.fpiMgt.affairResult.model.ResultInfo; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface ResultInfoRepository extends JpaRepository { void deleteByResultKey(Integer resultKey); + + List findByResultKey(Integer resultKey); } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToAffairRepository.java b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToAffairRepository.java index 483faf1b..23206f78 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToAffairRepository.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/repository/ResultToAffairRepository.java @@ -3,8 +3,12 @@ package com.dbnt.faisp.fpiMgt.affairResult.repository; import com.dbnt.faisp.fpiMgt.affairResult.model.ResultToAffair; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface ResultToAffairRepository extends JpaRepository { void deleteByResultKey(Integer resultKey); + + List findByResultKey(Integer resultKey); } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/service/ResultService.java b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/service/ResultService.java index 5e3de96a..eaf2a7c2 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/service/ResultService.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/affairResult/service/ResultService.java @@ -40,6 +40,9 @@ public class ResultService extends BaseService { // 월간계획 if (savedResult != null) { savedResult.setFileList(resultFileRepository.findByResultKey(resultKey)); savedResult.setApprvList(resultApprvRepository.findByResultKey(resultKey)); + savedResult.setClearInfoList(clearInfoRepository.findByResultKey(resultKey)); + savedResult.setResultInfoList(resultInfoRepository.findByResultKey(resultKey)); + savedResult.setAffairBoardList(resultMapper.selectAffairToResultKey(resultKey)); } return savedResult; } diff --git a/src/main/resources/mybatisMapper/ResultMapper.xml b/src/main/resources/mybatisMapper/ResultMapper.xml index 04fa7e8f..c978afde 100644 --- a/src/main/resources/mybatisMapper/ResultMapper.xml +++ b/src/main/resources/mybatisMapper/ResultMapper.xml @@ -60,21 +60,28 @@ + + \ No newline at end of file diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index e341f7df..fd8f5e86 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -5,7 +5,7 @@ top: 0; left: 0; background-color: #00000050; - z-index: 1090; + z-index: 2090; } #fadeDiv > div{ diff --git a/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js index ce36be5c..57ce49e5 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js @@ -78,10 +78,15 @@ $(document).on('click', '#getAffairBtn', function (){ affairListTbody += ""; affairListTbody += ""+affairTr.find(".wrtDt")[0].innerText+""; affairListTbody += ""+affairTr.find(".title")[0].innerText+""; - affairListTbody += ""+(affairTr.find(".affairRate")[0].innerText+(affairTr.find(".organUp")[0].innerText==="O"?"(상보)":""))+""; + if(affairTr.find(".affairRate").length>0){ + affairListTbody += ""+(affairTr.find(".affairRate")[0].innerText+(affairTr.find(".organUp")[0].innerText==="O"?"(상보)":""))+""; + }else{ + affairListTbody += ""; + } affairListTbody += ""; }) $("#affairListTbody").empty().append(affairListTbody); + $("#affairListModal").modal("hide"); }) $(document).on('click', '.rowDeleteBtn', function (){ @@ -154,7 +159,6 @@ $(document).on('click', '.resultTr', function (){ }) $(document).on('click', '.apprvBtn', function (){ - $("#apprvFormResultKey").val($("#viewModalResultKey").val()); $("#viewModalApprvValue").val($(this).attr("data-resultstate")); if(confirm($(this).val()+"하시겠습니까?")){ const formData = new FormData($("#apprvForm")[0]); @@ -214,6 +218,18 @@ function getResultEditModal(resultKey){ format: "yyyy-mm-dd", language: "ko" }); + $(".contactInfo").summernote({ + lang:'ko-KR', + height: 60, + disableDragAndDrop: true, + toolbar: [ + ['style', ['style']], + ['font', ['bold', 'underline', 'clear']], + ['color', ['color']], + ['para', ['ul', 'ol', 'paragraph']], + ['table', ['table']] + ] + }); setUploadDiv(); }, error:function(){ diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html index e157a1c8..9739270a 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html @@ -1,7 +1,7 @@
- +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/clearInfoRow.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/clearInfoRow.html index d9da2d6c..a889d0b0 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/clearInfoRow.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/clearInfoRow.html @@ -12,7 +12,7 @@
- diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html index 87ab9498..d8cbdfcc 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html @@ -63,7 +63,7 @@
- +
@@ -72,7 +72,7 @@
- +
@@ -90,7 +90,39 @@
- + +
+ +
+
+ +
+
+ +
+
+
+
+ +
+ +
+ +
+
+
+
+
@@ -135,15 +167,15 @@
- - + +
- +
@@ -161,7 +193,23 @@
- + +
+ +
+
+ +
+
+ +
+
+ +
+
+
@@ -200,8 +248,8 @@
- - + +
@@ -219,7 +267,14 @@ - + + + + + + + +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html index 257b5cf3..84866376 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html @@ -16,7 +16,7 @@
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html index 3a60b1be..b74ca410 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html @@ -1,138 +1,257 @@
- +
- - - -
- -
- -
- -
- -
- -
- -
- -
- - - -
-
-
-
-
+ + + + +
+
- -
- + +
+
-
-
-
- -
- - - - - + +
+
-
-
-
- -
- - -
- - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - -
파일명사이즈
파일이 없습니다.
-
-
- -
- -
-
+
+ +
- + - -
-
- -
-
-
- - -
-
-
-
-
- - - - +
+
+ +
+ +
+ +
+ +
-
- +
+ +
+ +
+ +
+ +
+
+ +
+ +
-
- +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + +
no구분상세금액
+
+
+
+
+ +
+ +
- +
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+
+
+ +
+ + + + + + + + + + + + + + + +
no접촉대상자접촉내용
+
+
+
+
+ +
+ +
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
작성일자제목활용
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
파일명사이즈
파일이 없습니다.
+
+
+
+
+
+ +
+ +
+
+ + + + +
+
+ +
+
+ +
+
+ + +
+ +
+
+
+ + + + +
+
+ +
+
+ +
+
+
+
- - - + + +