From c32ecb1be99d1297381458ce421dfd1fb1615c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 22 Mar 2023 19:16:10 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AC=B6=EC=9D=8C=EC=9D=B8=EC=87=84=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=EC=A4=91.=20=EC=B2=AD=EC=82=B0=EB=B3=B4?= =?UTF-8?q?=EA=B3=A0=EC=84=9C=EC=97=90=EC=84=9C=20=EC=97=B0=EA=B4=80?= =?UTF-8?q?=EB=B3=B4=EA=B3=A0=EC=84=9C=20=EB=A7=81=ED=81=AC=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80.=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=9D=BC=EB=B6=80=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dbnt/faisp/config/BaseModel.java | 2 + .../main/fpiMgt/affair/AffairController.java | 62 +------ .../fpiMgt/affair/service/AffairService.java | 60 ++++++ .../fpiMgt/affairPlan/PlanController.java | 7 +- .../affairPlan/service/PlanService.java | 10 + .../fpiMgt/affairResult/ResultController.java | 72 ++++--- .../affairResult/mapper/ResultMapper.java | 3 + .../affairResult/model/ResultBoard.java | 5 + .../repository/ResultToPlanRepository.java | 5 + .../affairResult/service/ResultService.java | 42 +++++ .../IntelligenceNetworkController.java | 20 +- .../monitoring/MonitoringController.java | 14 +- .../resources/mybatisMapper/ResultMapper.xml | 10 + .../{igActivities/fpiMgt/sri => faRpt}/sri.js | 0 .../fpiMgt/{affair => }/affairMgt.js | 26 --- .../igActivities/fpiMgt/{plan => }/planMgt.js | 65 ------- .../static/js/igActivities/fpiMgt/print.js | 175 ++++++++++++++++++ .../fpiMgt/{result => }/resultMgt.js | 134 ++++++++------ .../fireExtensionReport.js | 0 .../intelligenceAnalyze.js | 0 .../intelligenceNetwork/operationPlan.js | 0 .../{fpiMgt => }/monitoring/designation.js | 0 .../{fpiMgt => }/monitoring/result.js | 0 .../{fpiMgt/affair => }/statistics.js | 0 .../igActivities/fpiMgt/affair/affairMgt.html | 3 +- .../fpiMgt/affair/affairViewModal.html | 38 ++-- .../fpiMgt/affairPlan/planMgt.html | 3 +- .../fpiMgt/affairPlan/planViewModal.html | 4 +- .../fpiMgt/affairResult/affairListModal.html | 1 + .../fpiMgt/affairResult/planListModal.html | 39 ++++ .../fpiMgt/affairResult/resultEditModal.html | 59 +++++- .../fpiMgt/affairResult/resultMgt.html | 18 +- .../fpiMgt/affairResult/resultViewModal.html | 76 ++++++-- .../intelligenceNetwork/analyzeList.html | 0 .../fireExtensionReportEditModal.html | 0 .../fireExtensionReportList.html | 0 .../fireExtensionReportViewModal.html | 0 .../intelligenceAnalyzeEditModal.html | 0 .../intelligenceAnalyzeViewModal.html | 0 .../operationPlanEditModal.html | 0 .../operationPlanList.html | 0 .../operationPlanListModal.html | 0 .../operationPlanViewModal.html | 0 .../monitoring/designationEditModal.html | 0 .../monitoring/designationList.html | 0 .../monitoring/designationListModal.html | 0 .../monitoring/designationViewModal.html | 0 .../monitoring/resultEditModal.html | 0 .../{fpiMgt => }/monitoring/resultList.html | 0 .../monitoring/resultViewModal.html | 0 .../resources/templates/sri/sriBoard.html | 2 +- 51 files changed, 659 insertions(+), 296 deletions(-) rename src/main/resources/static/js/{igActivities/fpiMgt/sri => faRpt}/sri.js (100%) rename src/main/resources/static/js/igActivities/fpiMgt/{affair => }/affairMgt.js (94%) rename src/main/resources/static/js/igActivities/fpiMgt/{plan => }/planMgt.js (72%) create mode 100644 src/main/resources/static/js/igActivities/fpiMgt/print.js rename src/main/resources/static/js/igActivities/fpiMgt/{result => }/resultMgt.js (80%) rename src/main/resources/static/js/igActivities/{fpiMgt => }/intelligenceNetwork/fireExtensionReport.js (100%) rename src/main/resources/static/js/igActivities/{fpiMgt => }/intelligenceNetwork/intelligenceAnalyze.js (100%) rename src/main/resources/static/js/igActivities/{fpiMgt => }/intelligenceNetwork/operationPlan.js (100%) rename src/main/resources/static/js/igActivities/{fpiMgt => }/monitoring/designation.js (100%) rename src/main/resources/static/js/igActivities/{fpiMgt => }/monitoring/result.js (100%) rename src/main/resources/static/js/igActivities/{fpiMgt/affair => }/statistics.js (100%) create mode 100644 src/main/resources/templates/igActivities/fpiMgt/affairResult/planListModal.html rename src/main/resources/templates/igActivities/{fpiMgt => }/intelligenceNetwork/analyzeList.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/intelligenceNetwork/fireExtensionReportEditModal.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/intelligenceNetwork/fireExtensionReportList.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/intelligenceNetwork/fireExtensionReportViewModal.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/intelligenceNetwork/intelligenceAnalyzeEditModal.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/intelligenceNetwork/intelligenceAnalyzeViewModal.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/intelligenceNetwork/operationPlanEditModal.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/intelligenceNetwork/operationPlanList.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/intelligenceNetwork/operationPlanListModal.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/intelligenceNetwork/operationPlanViewModal.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/monitoring/designationEditModal.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/monitoring/designationList.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/monitoring/designationListModal.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/monitoring/designationViewModal.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/monitoring/resultEditModal.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/monitoring/resultList.html (100%) rename src/main/resources/templates/igActivities/{fpiMgt => }/monitoring/resultViewModal.html (100%) diff --git a/src/main/java/com/dbnt/faisp/config/BaseModel.java b/src/main/java/com/dbnt/faisp/config/BaseModel.java index f34eda42..24928e0e 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseModel.java +++ b/src/main/java/com/dbnt/faisp/config/BaseModel.java @@ -41,6 +41,8 @@ public class BaseModel { private Boolean dashboardFlag = false; @Transient private Integer refDocKey; + @Transient + private String modalType; public void setQueryInfo(){ setFirstIndex((getPageIndex()-1)*getRowCnt()); 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 77fd9dd0..eb3de57a 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 @@ -159,8 +159,9 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 @GetMapping("/affairViewModal") public ModelAndView affairViewModal(@AuthenticationPrincipal UserInfo loginUser, AffairBoard affairBoard){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affair/affairViewModal"); + mav.addObject("modalType", affairBoard.getModalType()); affairBoard = affairService.selectAffairBoard(affairBoard.getAffairKey()); - affairBoard.setAffairStatus(getAffairRating(affairBoard, loginUser.getOgCd()).getAffairStatus()); + affairBoard.setAffairStatus(affairService.getAffairRating(affairBoard, loginUser.getOgCd()).getAffairStatus()); mav.addObject("affair", affairBoard); mav.addObject("userSeq",loginUser.getUserSeq()); @@ -177,40 +178,7 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 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()); - } + affair = affairService.getPrintTypeAffairBoard(affair, codeMap); return affair; } @@ -236,7 +204,7 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 ModelAndView mav = new ModelAndView("print/affair"); affairBoard = affairService.selectAffairBoard(affairBoard.getAffairKey()); mav.addObject("affair", affairBoard); - mav.addObject("affairRating", getAffairRating(affairBoard, affairBoard.getWrtOrgan())); + mav.addObject("affairRating", affairService.getAffairRating(affairBoard, affairBoard.getWrtOrgan())); return mav; } @@ -339,25 +307,5 @@ public class AffairController { // 첩보수집활동 > 외사경찰 견문관 } - private AffairRating getAffairRating(AffairBoard affairBoard, String ogCd){ - AffairRating affairRating = null; - for(AffairRating rating: affairBoard.getRateList()){ - if(rating.getRatingOrgan().equals(ogCd)){ - affairRating = rating; - //affairBoard.setAffairStatus(rating.getAffairStatus()); - break; - } - } - if(affairRating==null){ - for(AffairRating rating: affairBoard.getRateList()){ - if(rating.getOrganUp()==null || !rating.getOrganUp().equals("T")){ - affairRating = rating; - //affairBoard.setAffairStatus(rating.getAffairStatus()); - break; - } - } - } - return affairRating; - } - + } 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 ebb2d673..e6d568ca 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 @@ -3,6 +3,7 @@ package com.dbnt.faisp.main.fpiMgt.affair.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; +import com.dbnt.faisp.main.codeMgt.model.CodeMgt; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.fpiMgt.affair.mapper.AffairMapper; import com.dbnt.faisp.main.fpiMgt.affair.model.*; @@ -327,4 +328,63 @@ public class AffairService extends BaseService { // 견문보고 public List selectArrCntList(TypeStatistics typeStatistics) { return affairMapper.selectArrCntList(typeStatistics); } + + public AffairBoard getPrintTypeAffairBoard(AffairBoard affair, Map> codeMap) { + 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; + } + public AffairRating getAffairRating(AffairBoard affairBoard, String ogCd){ + AffairRating affairRating = null; + for(AffairRating rating: affairBoard.getRateList()){ + if(rating.getRatingOrgan().equals(ogCd)){ + affairRating = rating; + //affairBoard.setAffairStatus(rating.getAffairStatus()); + break; + } + } + if(affairRating==null){ + for(AffairRating rating: affairBoard.getRateList()){ + if(rating.getOrganUp()==null || !rating.getOrganUp().equals("T")){ + affairRating = rating; + //affairBoard.setAffairStatus(rating.getAffairStatus()); + break; + } + } + } + return affairRating; + } + } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java index d02527ae..aae766e6 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/PlanController.java @@ -177,6 +177,7 @@ public class PlanController { // 첩보수집활동 > 외사경찰 견문관리 @GetMapping("/planViewModal") public ModelAndView planViewModal(@AuthenticationPrincipal UserInfo loginUser, PlanBoard planBoard){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/planViewModal"); + mav.addObject("modalType", planBoard.getModalType()); planBoard = planService.selectPlanBoard(planBoard.getPlanKey()); mav.addObject("plan", planBoard); mav.addObject("userSeq",loginUser.getUserSeq()); @@ -209,11 +210,9 @@ public class PlanController { // 첩보수집활동 > 외사경찰 견문관리 @GetMapping("/planBoardJson") public PlanBoard planBoardJson(PlanBoard planBoard, HttpSession session){ - planBoard = planService.selectPlanBoard(planBoard.getPlanKey()); Map> codeMap = (Map>) session.getAttribute("commonCode"); - planBoard.setWrtPart(Utils.searchCodeValue(planBoard.getWrtPart(), codeMap.get(planBoard.getWrtOrgan()))); - planBoard.setWrtOrgan(Utils.searchCodeValue(planBoard.getWrtOrgan(), codeMap.get("OG"))); - planBoard.setWrtUserGrd(Utils.searchCodeValue(planBoard.getWrtUserGrd(), codeMap.get("JT"))); + planBoard = planService.selectPlanBoard(planBoard.getPlanKey()); + planBoard = planService.getPrintTypePlanBoard(planBoard, codeMap); return planBoard; } } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java index 4a12cc7a..d7e41ffd 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairPlan/service/PlanService.java @@ -4,6 +4,7 @@ package com.dbnt.faisp.main.fpiMgt.affairPlan.service; import com.dbnt.faisp.config.BaseService; 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.fpiMgt.affairPlan.mapper.PlanMapper; import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanApprv; import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard; @@ -15,6 +16,7 @@ import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanFileRepository; import com.dbnt.faisp.main.fpiMgt.affairPlan.repository.PlanMainInfoRepository; import com.dbnt.faisp.main.userInfo.model.UserAlarm; import com.dbnt.faisp.main.userInfo.service.UserAlarmService; +import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -24,6 +26,7 @@ import java.io.File; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.UUID; @Service @@ -147,4 +150,11 @@ public class PlanService extends BaseService { // 월간계획 } } } + + public PlanBoard getPrintTypePlanBoard(PlanBoard planBoard, Map> codeMap) { + planBoard.setWrtPart(Utils.searchCodeValue(planBoard.getWrtPart(), codeMap.get(planBoard.getWrtOrgan()))); + planBoard.setWrtOrgan(Utils.searchCodeValue(planBoard.getWrtOrgan(), codeMap.get("OG"))); + planBoard.setWrtUserGrd(Utils.searchCodeValue(planBoard.getWrtUserGrd(), codeMap.get("JT"))); + return planBoard; + } } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java index 102cf0a7..6bf3e437 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java @@ -5,6 +5,8 @@ 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.service.AffairService; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard; +import com.dbnt.faisp.main.fpiMgt.affairPlan.service.PlanService; import com.dbnt.faisp.main.fpiMgt.affairResult.model.*; import com.dbnt.faisp.main.fpiMgt.affairResult.service.ResultService; import com.dbnt.faisp.main.userInfo.model.UserInfo; @@ -17,6 +19,8 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpSession; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -26,6 +30,7 @@ import java.util.Map; public class ResultController { // 첩보수집활동 > 외사경찰 견문관리 > 계획수립 private final ResultService resultService; private final AffairService affairService; + private final PlanService planService; private final AuthMgtService authMgtService; private final CodeMgtService codeMgtService; @@ -185,16 +190,31 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 public ModelAndView affairListModal(@AuthenticationPrincipal UserInfo loginUser, AffairBoard affair){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairResult/affairListModal"); if(affair.getWrtUserSeq() == null) { - affair.setWrtUserSeq(loginUser.getUserSeq()); + affair.setWrtUserSeq(loginUser.getUserSeq()); } if(affair.getWrtOrgan() == null) { - affair.setWrtOrgan(loginUser.getOgCd()); + affair.setWrtOrgan(loginUser.getOgCd()); } affair.setFirstIndex(0); affair.setRowCnt(9999); mav.addObject("affairList", affairService.selectAffairBoardList(affair)); return mav; } + @GetMapping("/planListModal") + public ModelAndView planListModal(@AuthenticationPrincipal UserInfo loginUser, PlanBoard plan){ + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairResult/planListModal"); + if(plan.getWrtUserSeq() == null) { + plan.setWrtUserSeq(loginUser.getUserSeq()); + } + if(plan.getWrtOrgan() == null) { + plan.setWrtOrgan(loginUser.getOgCd()); + } + plan.setFirstIndex(0); + plan.setRowCnt(9999); + plan.setDateSelector("planDt"); + mav.addObject("planList", planService.selectPlanBoardList(plan)); + return mav; + } @GetMapping("/resultViewModal") public ModelAndView resultViewModal(@AuthenticationPrincipal UserInfo loginUser, ResultBoard resultBoard){ @@ -244,26 +264,32 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 public ResultBoard resultBoardJson(ResultBoard resultBoard, HttpSession session){ Map> codeMap = (Map>) session.getAttribute("commonCode"); resultBoard = resultService.selectResultBoard(resultBoard.getResultKey()); - resultBoard.setWrtPart(Utils.searchCodeValue(resultBoard.getWrtPart(), codeMap.get(resultBoard.getWrtOrgan()))); - resultBoard.setWrtOrgan(Utils.searchCodeValue(resultBoard.getWrtOrgan(), codeMap.get("OG"))); - resultBoard.setWrtUserGrd(Utils.searchCodeValue(resultBoard.getWrtUserGrd(), codeMap.get("JT"))); - for(ClearInfo info: resultBoard.getClearInfoList()){ - info.setUseCatg(Utils.searchCodeValue(info.getUseCatg(), codeMap.get("RIC"))); - info.setUseDetail(Utils.searchCodeValue(info.getUseDetail(), codeMap.get("RID"))); - } - for(ResultApprv apprv: resultBoard.getApprvList()){ - if(apprv.getState().equals("DST004")){ - resultBoard.setSectionApprv(apprv.getUserNm()); - }else if(apprv.getState().equals("DST006")){ - resultBoard.setHeadApprv(apprv.getUserNm()); - } - } - for(AffairBoard affair: resultBoard.getAffairBoardList()){ - affair.setAffairRate(Utils.searchCodeValue(affair.getAffairRate(), codeMap.get("AAR"))+(affair.getOrganUp().equals("T")?"(상보)":"")); - } - for(ResultFile file: resultBoard.getFileList()){ - file.setOrigNm(file.getOrigNm()+"."+file.getFileExtn()); - } - return resultBoard; + return resultService.getPrintTypeResultBoard(resultBoard, codeMap); } + + @GetMapping("/resultBundleJson") + public Map resultBundleJson(ResultBoard resultBoard, HttpSession session){ + Map> codeMap = (Map>) session.getAttribute("commonCode"); + resultBoard = resultService.selectResultBoard(resultBoard.getResultKey()); + Map bundleMap = new HashMap<>(); + List planBoardList = new ArrayList<>(); + for(ResultToPlan resultToPlan: resultBoard.getPlanList()){ + PlanBoard planBoard = planService.selectPlanBoard(resultToPlan.getPlanKey()); + planBoard = planService.getPrintTypePlanBoard(planBoard, codeMap); + planBoardList.add(planBoard); + } + List affairBoardList = new ArrayList<>(); + for(ResultToAffair resultToAffair: resultBoard.getAffairList()){ + AffairBoard affairBoard = affairService.selectAffairBoard(resultToAffair.getAffairKey()); + affairBoard = affairService.getPrintTypeAffairBoard(affairBoard, codeMap); + affairBoardList.add(affairBoard); + } + bundleMap.put("planBoard", planBoardList); + bundleMap.put("affairBoard", affairBoardList); + bundleMap.put("resultBoard", resultService.getPrintTypeResultBoard(resultBoard, codeMap)); + return bundleMap; + } + + + } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/mapper/ResultMapper.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/mapper/ResultMapper.java index bc54e032..b603813c 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/mapper/ResultMapper.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/mapper/ResultMapper.java @@ -1,6 +1,7 @@ package com.dbnt.faisp.main.fpiMgt.affairResult.mapper; import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard; import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultBoard; import org.apache.ibatis.annotations.Mapper; @@ -14,4 +15,6 @@ public interface ResultMapper { Integer selectResultBoardListCnt(ResultBoard resultBoard); List selectAffairToResultKey(Integer resultKey); + + List selectPlanToResultKey(Integer resultKey); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultBoard.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultBoard.java index 04973f0f..7ed90204 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultBoard.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultBoard.java @@ -2,6 +2,7 @@ package com.dbnt.faisp.main.fpiMgt.affairResult.model; import com.dbnt.faisp.config.BaseModel; import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; +import com.dbnt.faisp.main.fpiMgt.affairPlan.model.PlanBoard; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -87,7 +88,11 @@ public class ResultBoard extends BaseModel { @Transient private List affairList; @Transient + private List planList; + @Transient private List affairBoardList; + @Transient + private List planBoardList; @Transient private String sectionApprv; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultToPlanRepository.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultToPlanRepository.java index 7c583e19..804a2551 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultToPlanRepository.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/repository/ResultToPlanRepository.java @@ -3,7 +3,12 @@ package com.dbnt.faisp.main.fpiMgt.affairResult.repository; import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultToPlan; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface ResultToPlanRepository extends JpaRepository { + void deleteByResultKey(Integer resultKey); + + List findByResultKey(Integer resultKey); } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java index c7e3b006..94c11b8c 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java @@ -3,11 +3,14 @@ package com.dbnt.faisp.main.fpiMgt.affairResult.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; +import com.dbnt.faisp.main.codeMgt.model.CodeMgt; +import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; import com.dbnt.faisp.main.fpiMgt.affairResult.mapper.ResultMapper; import com.dbnt.faisp.main.fpiMgt.affairResult.model.*; import com.dbnt.faisp.main.fpiMgt.affairResult.repository.*; import com.dbnt.faisp.main.userInfo.model.UserAlarm; import com.dbnt.faisp.main.userInfo.service.UserAlarmService; +import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -15,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.util.List; +import java.util.Map; import java.util.UUID; @Service @@ -45,7 +49,10 @@ public class ResultService extends BaseService { // 월간계획 savedResult.setApprvList(resultApprvRepository.findByResultKey(resultKey)); savedResult.setClearInfoList(clearInfoRepository.findByResultKey(resultKey)); savedResult.setResultInfoList(resultInfoRepository.findByResultKey(resultKey)); + savedResult.setAffairList(resultToAffairRepository.findByResultKey(resultKey)); + savedResult.setPlanList(resultToPlanRepository.findByResultKey(resultKey)); savedResult.setAffairBoardList(resultMapper.selectAffairToResultKey(resultKey)); + savedResult.setPlanBoardList(resultMapper.selectPlanToResultKey(resultKey)); } return savedResult; } @@ -68,6 +75,9 @@ public class ResultService extends BaseService { // 월간계획 if (resultBoard.getAffairList() != null){ saveResultToAffair(resultKey, resultBoard.getAffairList()); } + if (resultBoard.getPlanList() != null){ + saveResultToPlan(resultKey, resultBoard.getPlanList()); + } if(resultBoard.getResultState().equals("DST002")){ //작성완료일 때 계장 결재 사용자에게 알림 발송. userAlarmService.sendAlarmToApprvUser(resultKey, resultBoard.getWrtOrgan(), "APC003", 31, "청산보고서에 결재대기 문서가 있습니다."); @@ -107,6 +117,30 @@ public class ResultService extends BaseService { // 월간계획 return apprv.getApprvSeq(); } + public ResultBoard getPrintTypeResultBoard(ResultBoard resultBoard, Map> codeMap) { + resultBoard.setWrtPart(Utils.searchCodeValue(resultBoard.getWrtPart(), codeMap.get(resultBoard.getWrtOrgan()))); + resultBoard.setWrtOrgan(Utils.searchCodeValue(resultBoard.getWrtOrgan(), codeMap.get("OG"))); + resultBoard.setWrtUserGrd(Utils.searchCodeValue(resultBoard.getWrtUserGrd(), codeMap.get("JT"))); + for(ClearInfo info: resultBoard.getClearInfoList()){ + info.setUseCatg(Utils.searchCodeValue(info.getUseCatg(), codeMap.get("RIC"))); + info.setUseDetail(Utils.searchCodeValue(info.getUseDetail(), codeMap.get("RID"))); + } + for(ResultApprv apprv: resultBoard.getApprvList()){ + if(apprv.getState().equals("DST004")){ + resultBoard.setSectionApprv(apprv.getUserNm()); + }else if(apprv.getState().equals("DST006")){ + resultBoard.setHeadApprv(apprv.getUserNm()); + } + } + for(AffairBoard affair: resultBoard.getAffairBoardList()){ + affair.setAffairRate(Utils.searchCodeValue(affair.getAffairRate(), codeMap.get("AAR"))+(affair.getOrganUp().equals("T")?"(상보)":"")); + } + for(ResultFile file: resultBoard.getFileList()){ + file.setOrigNm(file.getOrigNm()+"."+file.getFileExtn()); + } + return resultBoard; + } + private void saveUploadFiles(Integer resultKey, List multipartFileList){ ResultFile lastFileInfo = resultFileRepository.findTopByResultKeyOrderByFileSeqDesc(resultKey).orElse(null); int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); @@ -163,4 +197,12 @@ public class ResultService extends BaseService { // 월간계획 } resultToAffairRepository.saveAll(resultToAffairList); } + + private void saveResultToPlan(Integer resultKey, List resultToPlanList){ + resultToPlanRepository.deleteByResultKey(resultKey); + for(ResultToPlan relation: resultToPlanList){ + relation.setResultKey(resultKey); + } + resultToPlanRepository.saveAll(resultToPlanList); + } } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java index dd0af748..989d0bbf 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java @@ -28,7 +28,7 @@ public class IntelligenceNetworkController { @GetMapping("/operationPlanList/{type}") public ModelAndView operationPlanList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, OperationPlan op){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/operationPlanList"); + ModelAndView mav = new ModelAndView("igActivities/intelligenceNetwork/operationPlanList"); //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getAccessAuth(); @@ -111,7 +111,7 @@ public class IntelligenceNetworkController { @GetMapping("/operationPlanEditModal") public ModelAndView operationPlanEditModal(@AuthenticationPrincipal UserInfo loginUser, OperationPlan op){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal"); + ModelAndView mav = new ModelAndView("igActivities/intelligenceNetwork/operationPlanEditModal"); if(op.getOpKey()!=null){ op = intelligenceNetworkService.selectOperationPlan(op.getOpKey()); } @@ -137,7 +137,7 @@ public class IntelligenceNetworkController { @GetMapping("/operationPlanViewModal") public ModelAndView operationPlanViewModal(@AuthenticationPrincipal UserInfo loginUser, OperationPlan op){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal"); + ModelAndView mav = new ModelAndView("igActivities/intelligenceNetwork/operationPlanViewModal"); op = intelligenceNetworkService.selectOperationPlan(op.getOpKey()); mav.addObject("op", op); mav.addObject("userSeq",loginUser.getUserSeq()); @@ -159,7 +159,7 @@ public class IntelligenceNetworkController { @GetMapping("/intelligenceAnalyzeList/{type}") public ModelAndView intelligenceAnalyzeList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, IntelligenceAnalyze ia){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/analyzeList"); + ModelAndView mav = new ModelAndView("igActivities/intelligenceNetwork/analyzeList"); //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getAccessAuth(); @@ -242,7 +242,7 @@ public class IntelligenceNetworkController { @GetMapping("/intelligenceAnalyzeEditModal") public ModelAndView intelligenceAnalyzeEditModal(@AuthenticationPrincipal UserInfo loginUser, IntelligenceAnalyze ia){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal"); + ModelAndView mav = new ModelAndView("igActivities/intelligenceNetwork/intelligenceAnalyzeEditModal"); if(ia.getIaKey()!=null){ ia = intelligenceNetworkService.selectIntelligenceAnalyze(ia); ia.setAffairList(intelligenceNetworkService.selectIntelligenceAnalyzeAffairKey(ia)); @@ -281,7 +281,7 @@ public class IntelligenceNetworkController { @GetMapping("/intelligenceAnalyzeViewModal") public ModelAndView intelligenceAnalyzeViewModal(@AuthenticationPrincipal UserInfo loginUser, IntelligenceAnalyze ia){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal"); + ModelAndView mav = new ModelAndView("igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal"); ia = intelligenceNetworkService.selectIntelligenceAnalyze(ia); ia.setApprvList(intelligenceNetworkService.selectIntelligenceAnalyzeApprv(ia)); mav.addObject("ia", ia); @@ -304,7 +304,7 @@ public class IntelligenceNetworkController { @GetMapping("/fireExtensionReportList/{type}") public ModelAndView fireExtensionReportList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, FireExtensionReport fer){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList"); + ModelAndView mav = new ModelAndView("igActivities/intelligenceNetwork/fireExtensionReportList"); //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/fireExtensionReportList/all").get(0).getAccessAuth(); @@ -387,7 +387,7 @@ public class IntelligenceNetworkController { @GetMapping("/fireExtensionReportEditModal") public ModelAndView fireExtensionReportEditModal(@AuthenticationPrincipal UserInfo loginUser, FireExtensionReport fer){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportEditModal"); + ModelAndView mav = new ModelAndView("igActivities/intelligenceNetwork/fireExtensionReportEditModal"); if(fer.getFerKey()!=null){ fer = intelligenceNetworkService.selectFireExtensionReportInfo(fer); } @@ -398,7 +398,7 @@ public class IntelligenceNetworkController { @GetMapping("/operationPlanListModal") public ModelAndView operationPlanListModal(@AuthenticationPrincipal UserInfo loginUser, OperationPlan op){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/operationPlanListModal"); + ModelAndView mav = new ModelAndView("igActivities/intelligenceNetwork/operationPlanListModal"); op.setFirstIndex(0); op.setRowCnt(9999); mav.addObject("operationPlanList", intelligenceNetworkService.selectOperationPlanList(op)); @@ -427,7 +427,7 @@ public class IntelligenceNetworkController { @GetMapping("/fireExtensionReportViewModal") public ModelAndView fireExtensionReportViewModal(@AuthenticationPrincipal UserInfo loginUser, FireExtensionReport fer){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportViewModal"); + ModelAndView mav = new ModelAndView("igActivities/intelligenceNetwork/fireExtensionReportViewModal"); fer = intelligenceNetworkService.selectFireExtensionReportInfo(fer); mav.addObject("fer", fer); mav.addObject("userSeq",loginUser.getUserSeq()); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java index 2210954d..25f8c63f 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java @@ -30,7 +30,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 @GetMapping("/designationList/{type}") public ModelAndView designationList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, MonitoringDesignation md){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monitoring/designationList"); + ModelAndView mav = new ModelAndView("igActivities/monitoring/designationList"); //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/monitoring/designationList/all").get(0).getAccessAuth(); @@ -115,7 +115,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 @GetMapping("/designationEditModal") public ModelAndView designationEditModal(@AuthenticationPrincipal UserInfo loginUser, MonitoringDesignation md){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monitoring/designationEditModal"); + ModelAndView mav = new ModelAndView("igActivities/monitoring/designationEditModal"); if(md.getMdKey()!=null){ md = monitoringService.selectDesignation(md.getMdKey()); } @@ -141,7 +141,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 @GetMapping("/designationViewModal") public ModelAndView designationViewModal(@AuthenticationPrincipal UserInfo loginUser, MonitoringDesignation md){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monitoring/designationViewModal"); + ModelAndView mav = new ModelAndView("igActivities/monitoring/designationViewModal"); md = monitoringService.selectDesignation(md.getMdKey()); mav.addObject("md", md); mav.addObject("userSeq",loginUser.getUserSeq()); @@ -162,7 +162,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 @GetMapping("/resultList/{type}") public ModelAndView resultList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, MonitoringResult mr){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monitoring/resultList"); + ModelAndView mav = new ModelAndView("igActivities/monitoring/resultList"); //메뉴권한 확인 String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/monitoring/resultList/all").get(0).getAccessAuth(); @@ -247,7 +247,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 @GetMapping("/resultEditModal") public ModelAndView resultEditModal(@AuthenticationPrincipal UserInfo loginUser, MonitoringResult mr){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monitoring/resultEditModal"); + ModelAndView mav = new ModelAndView("igActivities/monitoring/resultEditModal"); if(mr.getMrKey()!=null){ mr = monitoringService.selectResult(mr.getMrKey()); } @@ -260,7 +260,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 @GetMapping("/designationListModal") public ModelAndView designationListModal(@AuthenticationPrincipal UserInfo loginUser, MonitoringDesignation md){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monitoring/designationListModal"); + ModelAndView mav = new ModelAndView("igActivities/monitoring/designationListModal"); md.setFirstIndex(0); md.setRowCnt(9999); mav.addObject("designationList", monitoringService.selectDesignationList(md)); @@ -284,7 +284,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 @GetMapping("/resultViewModal") public ModelAndView resultViewModal(@AuthenticationPrincipal UserInfo loginUser, MonitoringResult mr){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monitoring/resultViewModal"); + ModelAndView mav = new ModelAndView("igActivities/monitoring/resultViewModal"); mr = monitoringService.selectResult(mr.getMrKey()); mav.addObject("mr", mr); mav.addObject("userSeq",loginUser.getUserSeq()); diff --git a/src/main/resources/mybatisMapper/ResultMapper.xml b/src/main/resources/mybatisMapper/ResultMapper.xml index c5d8cfdd..ec5c3716 100644 --- a/src/main/resources/mybatisMapper/ResultMapper.xml +++ b/src/main/resources/mybatisMapper/ResultMapper.xml @@ -105,4 +105,14 @@ on a.affair_key = c.affair_key where c.result_key = #{resultKey} + \ No newline at end of file diff --git a/src/main/resources/static/js/igActivities/fpiMgt/sri/sri.js b/src/main/resources/static/js/faRpt/sri.js similarity index 100% rename from src/main/resources/static/js/igActivities/fpiMgt/sri/sri.js rename to src/main/resources/static/js/faRpt/sri.js diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js similarity index 94% rename from src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js rename to src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js index 592ff348..217cf427 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/affairMgt.js @@ -225,32 +225,6 @@ $(document).on('click', '#fileDownBtn', function (){ } }) -$(document).on('click', '#printBtn', function (){ - // 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")+"/singlePrint.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.crfName.value = "affairBoard"; - form.json.value = JSON.stringify(data); - form.method = "post"; - form.submit(); - }, - error:function(e){ - ajaxErrorAction(e); - } - }); -}) - function getAffairViewModal(affairKey){ $.ajax({ url: '/affair/affairViewModal', diff --git a/src/main/resources/static/js/igActivities/fpiMgt/plan/planMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/planMgt.js similarity index 72% rename from src/main/resources/static/js/igActivities/fpiMgt/plan/planMgt.js rename to src/main/resources/static/js/igActivities/fpiMgt/planMgt.js index a5b7ab9e..39a68b4c 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/plan/planMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/planMgt.js @@ -102,71 +102,6 @@ $(document).on('click', '.apprvBtn', function (){ } }) -$(document).on('click', '#printBtn', function (){ - - $.ajax({ - url: '/affairPlan/planBoardJson', - type: 'GET', - data: {planKey: $(this).attr('data-plankey')}, - dataType:"json", - success: function(data){ - const plan = {}; - plan.contentTitle = data.contentTitle; - plan.planDt = data.planDt; - plan.wrtOrgan = data.wrtOrgan; - plan.wrtPart = data.wrtPart; - plan.wrtUserGrd = data.wrtUserGrd; - plan.wrtUserNm = data.wrtUserNm; - for(let i=0; i 0) { + const mod = Math.floor(price % (division * unit) / division); + if(mod) { + const modToArray = mod.toString().split(''); + const modLength = modToArray.length - 1; + const toKorean = modToArray.reduce((a, v, i) => { + a+= `${koreanNumber[v*1]}${tenUnit[modLength - i]}`; + return a; + }, ''); + answer = `${toKorean}${tenThousandUnit[index]} `+ answer; + } + division = Math.pow(unit, ++index); + } + return "壹金 "+answer+"원 整 (￦ "+price.toLocaleString('ko-KR')+")"; +} diff --git a/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/resultMgt.js similarity index 80% rename from src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js rename to src/main/resources/static/js/igActivities/fpiMgt/resultMgt.js index eec40d4c..e75e28b2 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/resultMgt.js @@ -77,9 +77,34 @@ $(document).on('click', '#affairModalBtn', function (){ }); } }) +$(document).on('click', '#planModalBtn', function (){ + const workStartDt = $("#workStartDt").val() + const workEndDt = $("#workEndDt").val() + if(!workStartDt||!workEndDt){ + alert("청산보고서의 사업기간을 입력해주세요."); + }else{ + $.ajax({ + url: '/affairResult/planListModal', + data: { + startDate: workStartDt, + endDate: workEndDt + }, + type: 'GET', + dataType:"html", + success: function(html){ + $("#planListModalContent").empty().append(html) + $("#planListModal").modal('show'); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); + } +}) + $(document).on('click', '#getAffairBtn', function (){ let affairListTbody = ""; - $.each($(".rowChkBox:checked"), function (idx, chkBox){ + $.each($("#affairListBody").find(".rowChkBox:checked"), function (idx, chkBox){ const affairTr = $(chkBox).parents(".affairTr") affairListTbody += ""; affairListTbody += ""; @@ -95,6 +120,19 @@ $(document).on('click', '#getAffairBtn', function (){ $("#affairListTbody").empty().append(affairListTbody); $("#affairListModal").modal("hide"); }) +$(document).on('click', '#getPlanBtn', function (){ + let planListTbody = ""; + $.each($("#planListBody").find(".rowChkBox:checked"), function (idx, chkBox){ + const planTr = $(chkBox).parents(".planTr") + planListTbody += ""; + planListTbody += ""; + planListTbody += ""+planTr.find(".planDt")[0].innerText+""; + planListTbody += ""+planTr.find(".title")[0].innerText+""; + planListTbody += ""; + }) + $("#planListTbody").empty().append(planListTbody); + $("#planListModal").modal("hide"); +}) $(document).on('click', '.rowDeleteBtn', function (){ const isClearInfo = $(this).parents("#clearInfoRow").length !== 0; @@ -195,62 +233,48 @@ $(document).on('click', '.apprvBtn', function (){ }) } }) - -$(document).on('click', '#printBtn', function (){ - $.ajax({ - url: '/affairResult/resultBoardJson', - type: 'GET', - data: {resultKey: $(this).attr('data-resultkey')}, - dataType:"json", - success: function(data){ - data.planPrice = priceNumberToKorean(data.planPrice); - data.usePrice = priceNumberToKorean(data.usePrice); - for(let i=0; i 0) { - const mod = Math.floor(price % (division * unit) / division); - if(mod) { - const modToArray = mod.toString().split(''); - const modLength = modToArray.length - 1; - const toKorean = modToArray.reduce((a, v, i) => { - a+= `${koreanNumber[v*1]}${tenUnit[modLength - i]}`; - return a; - }, ''); - answer = `${toKorean}${tenThousandUnit[index]} `+ answer; - } - division = Math.pow(unit, ++index); + }); } - return "壹金 "+answer+"원 整 (￦ "+price.toLocaleString('ko-KR')+")"; -} - +}) +$(document).on('click', '.affairTr', function (event){ + const target = event.target; + if(!(target.className === "rowChkBox")){ + $.ajax({ + url: '/affair/affairViewModal', + data: { + affairKey: $(this).find(".affairKey").val(), + modalType: "viewOnly" + }, + type: 'GET', + dataType: "html", + success: function (html) { + $("#relationReportContent").empty().append(html) + $("#relationReportModal").modal('show'); + }, + error: function (e) { + ajaxErrorAction(e); + } + }); + } +}) function getResultViewModal(resultKey){ $.ajax({ url: '/affairResult/resultViewModal', diff --git a/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReport.js b/src/main/resources/static/js/igActivities/intelligenceNetwork/fireExtensionReport.js similarity index 100% rename from src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReport.js rename to src/main/resources/static/js/igActivities/intelligenceNetwork/fireExtensionReport.js diff --git a/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyze.js b/src/main/resources/static/js/igActivities/intelligenceNetwork/intelligenceAnalyze.js similarity index 100% rename from src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyze.js rename to src/main/resources/static/js/igActivities/intelligenceNetwork/intelligenceAnalyze.js diff --git a/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/operationPlan.js b/src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js similarity index 100% rename from src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/operationPlan.js rename to src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js diff --git a/src/main/resources/static/js/igActivities/fpiMgt/monitoring/designation.js b/src/main/resources/static/js/igActivities/monitoring/designation.js similarity index 100% rename from src/main/resources/static/js/igActivities/fpiMgt/monitoring/designation.js rename to src/main/resources/static/js/igActivities/monitoring/designation.js diff --git a/src/main/resources/static/js/igActivities/fpiMgt/monitoring/result.js b/src/main/resources/static/js/igActivities/monitoring/result.js similarity index 100% rename from src/main/resources/static/js/igActivities/fpiMgt/monitoring/result.js rename to src/main/resources/static/js/igActivities/monitoring/result.js diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affair/statistics.js b/src/main/resources/static/js/igActivities/statistics.js similarity index 100% rename from src/main/resources/static/js/igActivities/fpiMgt/affair/statistics.js rename to src/main/resources/static/js/igActivities/statistics.js diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html index 11da732f..03c63d57 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html @@ -3,7 +3,8 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - + +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html index 87be9907..7876ed22 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html @@ -332,23 +332,25 @@
-
- - - - - - - - - - - - - - - + +
+ + + + + + + + + + + + + + + + - -
\ No newline at end of file +
+ \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html index f5e80131..9c22b7b1 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html @@ -3,7 +3,8 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - + +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html index 11ed013d..f50dfa47 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html @@ -163,6 +163,7 @@
+
@@ -173,4 +174,5 @@ -
\ No newline at end of file + + \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/affairListModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/affairListModal.html index 38220798..ccdee1c6 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/affairListModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/affairListModal.html @@ -23,6 +23,7 @@ + diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/planListModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/planListModal.html new file mode 100644 index 00000000..ed09de8a --- /dev/null +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/planListModal.html @@ -0,0 +1,39 @@ + + +
+
계획목록
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
제목시행일자작성일첨부파일상태
+ + + +
+
+
+ + +
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html index 14f3111d..1c7267b6 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html @@ -22,7 +22,7 @@
@@ -242,7 +242,7 @@
-
+
@@ -251,13 +251,58 @@
-
- +
+
+
+
+
+
계획목록
+
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + +
시행일자제목
-
+
+
+
+
견문목록
+
+
+ +
+
+
+
+ + + + + @@ -266,7 +311,7 @@ - + @@ -280,7 +325,7 @@
-
+

파일을 업로드 해주세요. diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html index 915a188f..f94c3d88 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html @@ -3,7 +3,8 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - + +
@@ -191,6 +192,13 @@
+ + +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html index 240a21c3..1f307b45 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html @@ -153,25 +153,63 @@
-
작성일자
- - - - - - - - - - - - - - - - - -
작성일자제목활용
+
+
+
계획목록
+
+
+ + + + + + + + + + + + + + + + + + +
시행일자제목
+
+
+
견문목록
+
+
+ + + + + + + + + + + + + + + + + + + + + +
작성일자제목활용
+ + + +
+
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/analyzeList.html b/src/main/resources/templates/igActivities/intelligenceNetwork/analyzeList.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/analyzeList.html rename to src/main/resources/templates/igActivities/intelligenceNetwork/analyzeList.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportEditModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportEditModal.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportEditModal.html rename to src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportEditModal.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportList.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportList.html rename to src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportList.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportViewModal.html rename to src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeEditModal.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal.html rename to src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeEditModal.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html rename to src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanEditModal.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html rename to src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanEditModal.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html rename to src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanListModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanListModal.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanListModal.html rename to src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanListModal.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html rename to src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationEditModal.html b/src/main/resources/templates/igActivities/monitoring/designationEditModal.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/monitoring/designationEditModal.html rename to src/main/resources/templates/igActivities/monitoring/designationEditModal.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationList.html b/src/main/resources/templates/igActivities/monitoring/designationList.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/monitoring/designationList.html rename to src/main/resources/templates/igActivities/monitoring/designationList.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationListModal.html b/src/main/resources/templates/igActivities/monitoring/designationListModal.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/monitoring/designationListModal.html rename to src/main/resources/templates/igActivities/monitoring/designationListModal.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html b/src/main/resources/templates/igActivities/monitoring/designationViewModal.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html rename to src/main/resources/templates/igActivities/monitoring/designationViewModal.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/resultEditModal.html b/src/main/resources/templates/igActivities/monitoring/resultEditModal.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/monitoring/resultEditModal.html rename to src/main/resources/templates/igActivities/monitoring/resultEditModal.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/resultList.html b/src/main/resources/templates/igActivities/monitoring/resultList.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/monitoring/resultList.html rename to src/main/resources/templates/igActivities/monitoring/resultList.html diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/resultViewModal.html b/src/main/resources/templates/igActivities/monitoring/resultViewModal.html similarity index 100% rename from src/main/resources/templates/igActivities/fpiMgt/monitoring/resultViewModal.html rename to src/main/resources/templates/igActivities/monitoring/resultViewModal.html diff --git a/src/main/resources/templates/sri/sriBoard.html b/src/main/resources/templates/sri/sriBoard.html index eab548e4..6d90f29f 100644 --- a/src/main/resources/templates/sri/sriBoard.html +++ b/src/main/resources/templates/sri/sriBoard.html @@ -3,7 +3,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - +