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 6fca1f44..92f01cd1 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 @@ -2,8 +2,10 @@ package com.dbnt.faisp.main.fpiMgt.affair; import com.dbnt.faisp.config.FileInfo; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.codeMgt.model.CodeMgt; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairFile; import com.dbnt.faisp.main.fpiMgt.affair.model.AffairRating; import com.dbnt.faisp.main.fpiMgt.affair.model.TypeStatistics; import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService; @@ -18,6 +20,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import java.io.*; import java.time.LocalDate; import java.time.LocalDateTime; @@ -156,7 +159,7 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 public ModelAndView affairViewModal(@AuthenticationPrincipal UserInfo loginUser, AffairBoard affairBoard){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/affairViewModal"); affairBoard = affairService.selectAffairBoard(affairBoard.getAffairKey()); - affairBoard.setAffairStatus(getAffairRating(affairBoard, loginUser.getOgCd()).getAffairStatus());; + affairBoard.setAffairStatus(getAffairRating(affairBoard, loginUser.getOgCd()).getAffairStatus()); mav.addObject("affair", affairBoard); mav.addObject("userSeq",loginUser.getUserSeq()); @@ -169,6 +172,46 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 mav.addObject("apprvAuth", apprvAuth); return mav; } + @GetMapping("/affairBoardJson") + public AffairBoard affairBoardJson(AffairBoard affair, HttpSession session){ + Map> codeMap = (Map>) session.getAttribute("commonCode"); + affair = affairService.selectAffairBoard(affair.getAffairKey()); + affair.setWrtPart(Utils.searchCodeValue(affair.getWrtPart(), codeMap.get(affair.getWrtOrgan()))); + affair.setWrtUserGrd(Utils.searchCodeValue(affair.getWrtUserGrd(), codeMap.get("JT"))); + affair.setAffairType1(Utils.searchCodeValue(affair.getAffairType1(), codeMap.get("DC01"))); + 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()); + affair.setSectionNm(rating.getSectionNm()); + affair.setHeadNm(rating.getHeadNm()); + affair.setOrganUp(rating.getOrganUp().equals("T")?"O":""); + affair.setLastEtc(Utils.isEmpty(rating.getSectionEtc())?rating.getHeadEtc():rating.getSectionEtc()); + affair.setReference(rating.getRatingOrgan().equals("OG027")?"경비작전과장":"정보외사과장"); + if(rating.getRatingOrgan().equals("OG001")){ + affair.setReception("해양경찰청장"); + }else if(rating.getRatingOrgan().equals("OG027")){ + affair.setReception("서해5도특별경비단장"); + }else{ + String organNm = Utils.searchCodeValue(rating.getRatingOrgan(), codeMap.get("OG")); + if(organNm.endsWith("청")){ + affair.setReception(organNm.substring(0, organNm.length()-1)+"지방청장"); + }else{ + affair.setReception(organNm.substring(0, organNm.length()-1)+"경찰서장"); + } + } + switch (rating.getAffairRate()){ + case "AAR001": affair.setAffairRate1("O");break; + case "AAR003": affair.setAffairRate2("O");break; + case "AAR004": affair.setAffairRate3("O");break; + case "AAR006": affair.setAffairRate4("O");break; + case "AAR008": affair.setAffairRate5("O");break; + } + for(AffairFile file: affair.getFileList()){ + file.setOrigNm(file.getOrigNm()+"."+file.getFileExtn()); + } + return affair; + } @PostMapping("/saveAffair") public Integer saveAffair(AffairBoard affairBoard, 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 68aa7d08..0df2dbd0 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 @@ -66,14 +66,35 @@ public class AffairBoard extends BaseModel { @Column(name = "doc_no") private String docNo; - @Transient - private String organUp; - @Transient - private String affairRate; @Transient private String affairStatus; @Transient private String ratingOrgan; + @Transient + private String affairRate; + + @Transient + private String reception; + @Transient + private String reference; + @Transient + private String affairRate1; + @Transient + private String affairRate2; + @Transient + private String affairRate3; + @Transient + private String affairRate4; + @Transient + private String affairRate5; + @Transient + private String organUp; + @Transient + private String sectionNm; + @Transient + private String headNm; + @Transient + private String lastEtc; @Transient private String hashTags; 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 10213a68..7d4f4ad9 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js @@ -226,7 +226,28 @@ $(document).on('click', '#fileDownBtn', function (){ }) $(document).on('click', '#printBtn', function (){ - window.open(location.origin+"/affair/print?affairKey="+$(this).attr("data-affairkey")); + // window.open(location.origin+"/affair/print?affairKey="+$(this).attr("data-affairkey")); + $.ajax({ + url: '/affair/affairBoardJson', + type: 'GET', + data: {affairKey: $(this).attr('data-affairkey')}, + dataType:"json", + success: function(data){ + var url = $("#printUrl").attr("data-printurl")+"/affairBoard.jsp"; + var title = "견문 보고서 인쇄"; + var status = "width=900px,height=800px,scrollbars=yes"; + window.open("", title, status); + const form = $("#printForm")[0]; + form.target = title; + form.action = url; + form.affair.value = JSON.stringify(data); + form.method = "post"; + form.submit(); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); }) function getAffairViewModal(affairKey){ diff --git a/src/main/resources/static/js/igActivities/fpiMgt/plan/planMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/plan/planMgt.js index c2660a90..be538ba7 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/plan/planMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/plan/planMgt.js @@ -120,20 +120,17 @@ $(document).on('click', '#printBtn', function (){ for(let i=0; i +
+
+ +
+
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html index 66162860..87be9907 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html @@ -333,7 +333,9 @@
- + + + diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html index 1011bfe1..63fe9c5d 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html @@ -194,5 +194,10 @@
+
+
+ +
+
\ 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 b0bd8a08..11ed013d 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html @@ -164,12 +164,9 @@
-
-
- -
-
- + + +