From 4749d80839157541de8627c46f8a10e058f83c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Fri, 9 Jun 2023 15:28:26 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=EB=AA=A9=EB=A1=9D=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20=EB=8B=A4?= =?UTF-8?q?=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/fpiMgt/affair/AffairController.java | 9 +++++- .../fpiMgt/affair/service/AffairService.java | 4 ++- .../js/igActivities/fpiMgt/affairMgt.js | 32 +++++++++++++++---- .../static/js/igActivities/fpiMgt/fpiPrint.js | 1 - .../igActivities/fpiMgt/affair/affairMgt.html | 1 + .../fpiMgt/affair/fileListDiv.html | 9 ++++++ 6 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/templates/igActivities/fpiMgt/affair/fileListDiv.html 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 4edac085..a3fda047 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 @@ -203,7 +203,14 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 mav.addObject("affairRating", affairService.getAffairRating(affairBoard, affairBoard.getWrtOrgan())); return mav; } - + @GetMapping("/fileListDiv") + public ModelAndView fileListDiv(AffairBoard affairBoard){ + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/fileListDiv"); + List affairKeyList = new ArrayList<>(); + affairKeyList.add(affairBoard.getAffairKey()); + mav.addObject("fileList", affairService.selectAffairFileList(affairKeyList)); + return mav; + } @PostMapping("/deleteAffair") @ResponseBody 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 ec360c18..1255b954 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 @@ -323,7 +323,8 @@ public class AffairService extends BaseService { // 견문보고 affair.setAffairType2(Utils.searchCodeValue(affair.getAffairType2(), codeMap.get("DC02"))); affair.setAffairType3(Utils.searchCodeValue(affair.getAffairType3(), codeMap.get("DC03"))); affair.setAffairType4(Utils.searchCodeValue(affair.getAffairType4(), codeMap.get("DC04"))); - AffairRating rating = getAffairRating(affair, affair.getWrtOrgan()); + //AffairRating rating = getAffairRating(affair, affair.getWrtOrgan()); + AffairRating rating = affair.getRateList().get(0); if(Utils.isEmpty(rating.getSectionNm())){ affair.setSectionNm(rating.getHeadNm()); affair.setHeadNm("전결"); @@ -364,6 +365,7 @@ public class AffairService extends BaseService { // 견문보고 } return affair; } + public AffairRating getAffairRating(AffairBoard affairBoard, String ogCd){ AffairRating affairRating = null; for(AffairRating rating: affairBoard.getRateList()){ diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js index 170ecd70..f7d1db4a 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js @@ -29,16 +29,34 @@ $(document).on('click', '.affairTr', function (event){ $(".trChkBox").prop("checked", false); chkBox[0].checked = true; } - - if(target.className === "fileTd" - || $(target).parents(".fileTd").length>0){ - $("#fileDownBtn").click(); - }else{ - getAffairViewModal(Number($(this).find(".affairKey").val())); - } + getAffairViewModal(Number($(this).find(".affairKey").val())); } }) +$(document).on('mouseover', '.fileTd', function (event){ + const fileListDiv = $("#fileListDiv"); + const rect = event.target.getBoundingClientRect() + fileListDiv.attr('style', 'top: '+(rect.top-65)+'px; '+'left: '+(rect.left-300)+'px'); + const affairKey = $(this).parents(".affairTr").find(".affairKey").val(); + $.ajax({ + url: '/affair/fileListDiv', + data: {affairKey: affairKey}, + type: 'GET', + dataType:"html", + success: function(html){ + fileListDiv.empty().append(html) + fileListDiv.show(); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); +}) + +$(document).on('mouseleave', '#fileListDiv', function (){ + $(this).empty().hide(); +}) + $(document).on('click', '#addAffairBtn', function (){ getAffairEditModal(null) }) diff --git a/src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js b/src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js index fa063c4a..af73daa6 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js @@ -42,7 +42,6 @@ $(document).on('click', '#affairPrintBtn', function (){ form.action = url; form.crfName.value = "affairBoard"; data.wrtDt = data.reportDt; - debugger form.json.value = JSON.stringify(data); form.method = "post"; form.submit(); diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html index 3eb756f8..40344ea8 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html @@ -289,6 +289,7 @@ +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/fileListDiv.html b/src/main/resources/templates/igActivities/fpiMgt/affair/fileListDiv.html new file mode 100644 index 00000000..ef9a2ba6 --- /dev/null +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/fileListDiv.html @@ -0,0 +1,9 @@ + + + +
+ +
+ \ No newline at end of file