From 019c16f8dd0d2a2ebb9dc6d576740c54f3f8e3b7 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Wed, 18 Jan 2023 13:29:41 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=99=B8=EC=82=AC=EC=B2=A9=EB=B3=B4?= =?UTF-8?q?=EB=A7=9D=20=EA=B2=AC=EB=AC=B8=EA=B4=80=EB=A6=AC=20->=20?= =?UTF-8?q?=EC=9A=B4=EC=98=81=EC=8B=A4=EC=A0=81=20=EC=A4=91=EA=B0=84?= =?UTF-8?q?=EC=A0=80=EC=9E=A5,=20=EA=B2=AC=EB=AC=B8=20=EB=AA=A8=EB=8B=AC?= =?UTF-8?q?=EC=B0=BD=20=EC=BF=BC=EB=A6=AC=EC=A1=B0=EA=B1=B4=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fpiMgt/affairResult/ResultController.java | 8 +- .../IntelligenceNetworkController.java | 54 ++-- .../mapper/IntelligenceNetworkMapper.java | 8 + .../model/IntelligenceAnalyze.java | 2 + .../service/IntelligenceNetworkService.java | 16 + .../resources/mybatisMapper/AffairMapper.xml | 11 +- .../IntelligenceNetworkMapper.xml | 277 ++++++++++++++++++ .../intelligenceAnalyze.js | 46 +-- .../IntelligenceAnalyzeList.html | 24 +- .../intelligenceAnalyzeEditModal.html | 58 ++-- .../intelligenceAnalyzeViewModal.html | 152 ++++++++++ 11 files changed, 582 insertions(+), 74 deletions(-) create mode 100644 src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html 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 9463a978..df4a4074 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 @@ -182,8 +182,12 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 @GetMapping("/affairListModal") public ModelAndView affairListModal(@AuthenticationPrincipal UserInfo loginUser, AffairBoard affair){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairResult/affairListModal"); - affair.setWrtUserSeq(loginUser.getUserSeq()); - affair.setRatingOrgan(loginUser.getOgCd()); + if(affair.getWrtUserSeq() == null) { + affair.setWrtUserSeq(loginUser.getUserSeq()); + } + if(affair.getWrtOrgan() == null) { + affair.setWrtOrgan(loginUser.getOgCd()); + } affair.setFirstIndex(0); affair.setRowCnt(9999); mav.addObject("affairList", affairService.selectAffairBoardList(affair)); 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 33086ee7..9cd95b02 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 @@ -154,7 +154,7 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 } @GetMapping("/intelligenceAnalyzeList/{type}") - public ModelAndView intelligenceAnalyzeList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, OperationPlan op){ + public ModelAndView intelligenceAnalyzeList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, IntelligenceAnalyze ia){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeList"); //메뉴권한 확인 @@ -163,10 +163,10 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 switch (accessAuth){ case "ACC001": // 조회 case "ACC002": // 작성 // 자신이 작성한 문서만 열람가능 - op.setWrtUserSeq(loginUser.getUserSeq()); + ia.setWrtUserSeq(loginUser.getUserSeq()); break; case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 - op.setDownOrganCdList(loginUser.getDownOrganCdList()); + ia.setDownOrganCdList(loginUser.getDownOrganCdList()); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); break; } @@ -174,10 +174,10 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 switch (accessAuth){ case "ACC001": // 조회 case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능 - op.setWrtOrgan(loginUser.getOgCd()); + ia.setWrtOrgan(loginUser.getOgCd()); break; case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 - op.setDownOrganCdList(loginUser.getDownOrganCdList()); + ia.setDownOrganCdList(loginUser.getDownOrganCdList()); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); break; } @@ -187,10 +187,10 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 if(type.equals("stay")) { if(apprvAuth==null) { if(!accessAuth.equals("ACC003")){ - op.setWrtUserSeq(loginUser.getUserSeq()); - op.setUserType("normalStayList"); + ia.setWrtUserSeq(loginUser.getUserSeq()); + ia.setUserType("normalStayList"); }else{ - op.setUserType("managerStayList"); + ia.setUserType("managerStayList"); } }else{ mav.addObject("userNm", loginUser.getUserNm()); @@ -199,17 +199,17 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 case "APC003": // 계장 // 결재대기 문서 조회 case "APC002": // 부장대행 case "APC001": // 부장 // 결재대기 문서 조회 - op.setOpState("DST002"); + ia.setIaState("DST002"); break; } } }else if(type.equals("commit")){ if(apprvAuth==null) { if(!accessAuth.equals("ACC003")){ - op.setWrtUserSeq(loginUser.getUserSeq()); - op.setUserType("normalCommitList"); + ia.setWrtUserSeq(loginUser.getUserSeq()); + ia.setUserType("normalCommitList"); }else{ - op.setUserType("managerCommitList"); + ia.setUserType("managerCommitList"); } }else{ switch (apprvAuth) { @@ -217,7 +217,7 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 case "APC003": // 계장 // case "APC002": // 부장대행 case "APC001": // 부장 // - op.setUserType("sectionCommitList"); + ia.setUserType("sectionCommitList"); break; } } @@ -225,14 +225,14 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 mav.addObject("accessAuth", accessAuth); mav.addObject("apprvAuth", apprvAuth); - op.setQueryInfo(); - mav.addObject("opList", intelligenceNetworkService.selectOperationPlanList(op)); - op.setContentCnt(intelligenceNetworkService.selectOperationPlanListCnt(op)); - op.setPaginationInfo(); + ia.setQueryInfo(); + mav.addObject("iaList", intelligenceNetworkService.selectIntelligenceAnalyzeList(ia)); + ia.setContentCnt(intelligenceNetworkService.selectIntelligenceAnalyzeListCnt(ia)); + ia.setPaginationInfo(); mav.addObject("type", type); mav.addObject("searchUrl", "/intelligenceNetwork/intelligenceAnalyzeList/"+type); - mav.addObject("searchParams", op); + mav.addObject("searchParams", ia); return mav; } @@ -240,7 +240,11 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 public ModelAndView intelligenceAnalyzeEditModal(@AuthenticationPrincipal UserInfo loginUser, IntelligenceAnalyze ia){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal"); if(ia.getIaKey()!=null){ - + ia = intelligenceNetworkService.selectIntelligenceAnalyze(ia); + ia.setAffairList(intelligenceNetworkService.selectIntelligenceAnalyzeAffairKey(ia)); + }else { + ia.setWrtOrgan(loginUser.getOgCd()); + ia.setWrtUserSeq(loginUser.getUserSeq()); } mav.addObject("ia", ia); @@ -270,6 +274,18 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외 } return intelligenceNetworkService.saveIntelligenceAnalyze(ia); } + + @GetMapping("/intelligenceAnalyzeViewModal") + public ModelAndView intelligenceAnalyzeViewModal(@AuthenticationPrincipal UserInfo loginUser, IntelligenceAnalyze ia){ + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal"); + ia = intelligenceNetworkService.selectIntelligenceAnalyze(ia); + mav.addObject("ia", ia); + mav.addObject("userSeq",loginUser.getUserSeq()); + //메뉴권한 확인 + mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getAccessAuth()); + mav.addObject("apprvAuth", authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getApprovalAuth()); + return mav; + } } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/mapper/IntelligenceNetworkMapper.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/mapper/IntelligenceNetworkMapper.java index 0be3c08f..cab34a89 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/mapper/IntelligenceNetworkMapper.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/mapper/IntelligenceNetworkMapper.java @@ -16,6 +16,14 @@ public interface IntelligenceNetworkMapper { IntelligenceAnalyze selectAffairCnt(IntelligenceAnalyze ia); + List selectIntelligenceAnalyzeList(IntelligenceAnalyze ia); + + Integer selectIntelligenceAnalyzeListCnt(IntelligenceAnalyze ia); + + IntelligenceAnalyze selectIntelligenceAnalyze(IntelligenceAnalyze ia); + + List selectIntelligenceAnalyzeAffairKey(IntelligenceAnalyze ia); + } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyze.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyze.java index 43afe79a..cb1c49a2 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyze.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyze.java @@ -84,5 +84,7 @@ public class IntelligenceAnalyze extends BaseModel { private Integer joCnt; @Transient private Integer muCnt; + @Transient + private Integer iaTotal; } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java index f4c8b4f6..f69b4351 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java @@ -153,6 +153,22 @@ public class IntelligenceNetworkService extends BaseService { } return iaKey; } + + public List selectIntelligenceAnalyzeList(IntelligenceAnalyze ia) { + return intelligenceNetworkMapper.selectIntelligenceAnalyzeList(ia); + } + + public Integer selectIntelligenceAnalyzeListCnt(IntelligenceAnalyze ia) { + return intelligenceNetworkMapper.selectIntelligenceAnalyzeListCnt(ia); + } + + public IntelligenceAnalyze selectIntelligenceAnalyze(IntelligenceAnalyze ia) { + return intelligenceNetworkMapper.selectIntelligenceAnalyze(ia); + } + + public List selectIntelligenceAnalyzeAffairKey(IntelligenceAnalyze ia) { + return intelligenceNetworkMapper.selectIntelligenceAnalyzeAffairKey(ia); + } diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index ada4fc64..63f0b927 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -42,9 +42,14 @@ and a.wrt_dt <= #{endDate}::date+1 - - and c.rating_organ = #{ratingOrgan} - + + + and c.rating_organ = #{ratingOrgan} + + + and (c.organ_up != 'T' or c.organ_up is null) + + and a.wrt_organ in diff --git a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml index a7079373..8e341c3d 100644 --- a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml +++ b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml @@ -123,4 +123,281 @@ + + + + and wrt_user_seq = #{wrtUserSeq} + + + and wrt_organ = #{wrtOrgan} + + + and ia_state = #{iaState} + + + and wrt_dt >= #{startDate}::date + + + and wrt_dt <= #{endDate}::date+1 + + + and wrt_organ in + + #{organCd} + + + + + and ia_state in ('DST002') + + + and ia_state in ('DST003', 'DST004', 'DST005', 'DST006') + + + and ia_state in ('DST003', 'DST004', 'DST005', 'DST006') + + + and ia_state in ('DST002') + + + and ia_state in ('DST003', 'DST004', 'DST005', 'DST006') + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyze.js b/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyze.js index 631d2764..135dbf6c 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyze.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyze.js @@ -7,23 +7,23 @@ $(function(){ }) $(document).on('click', '#allTab', function (){ - location.href = "/intelligenceNetwork/operationPlanList/all"; + location.href = "/intelligenceNetwork/intelligenceAnalyzeList/all"; }) $(document).on('click', '#stayTab', function (){ - location.href = "/intelligenceNetwork/operationPlanList/stay"; + location.href = "/intelligenceNetwork/intelligenceAnalyzeList/stay"; }) $(document).on('click', '#commitTab', function (){ - location.href = "/intelligenceNetwork/operationPlanList/commit"; + location.href = "/intelligenceNetwork/intelligenceAnalyzeList/commit"; }) $(document).on('click', '#addBtn', function (){ getIntelligenceAnalyzeEditModal(null); }) -function getIntelligenceAnalyzeEditModal(opKey){ +function getIntelligenceAnalyzeEditModal(iaKey){ $.ajax({ url: '/intelligenceNetwork/intelligenceAnalyzeEditModal', - data: {opKey: opKey}, + data: {iaKey: iaKey}, type: 'GET', dataType:"html", success: function(html){ @@ -43,8 +43,11 @@ function getIntelligenceAnalyzeEditModal(opKey){ } $(document).on('click', '#affairModalBtn', function (){ - const workStartDt = $("#iaSdate").val() - const workEndDt = $("#iaEdate").val() + const affairKey = $("input[name=affairList]"); + console.log(affairKey); + console.log(affairKey.val()); + const workStartDt = $("#iaSdate").val(); + const workEndDt = $("#iaEdate").val(); if(!workStartDt||!workEndDt){ alert("실적기간을 입력해주세요."); }else{ @@ -54,12 +57,19 @@ $(document).on('click', '#affairModalBtn', function (){ startDate: workStartDt, endDate: workEndDt, affairCategory:"CAT216", + wrtUserSeq:$("input[name=wrtUserSeq]").val(), + wrtOrgan:$("input[name=wrtOrgan]").val(), affairStatus:"DST006" }, type: 'GET', dataType:"html", success: function(html){ - $("#affairListModalContent").empty().append(html) + $("#affairListModalContent").empty().append(html); + if(affairKey.val() != ""){ + for(var i=0; i - - + + + + + + + + + + + + + + + + - + @@ -169,9 +183,9 @@ -