From 7448c93356f4c419bfef23db91dbe3a0bae37d7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 14 Sep 2022 17:50:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B2=A9=EB=B3=B4=EC=88=98=EC=A7=91=ED=99=9C?= =?UTF-8?q?=EB=8F=99=20=EA=B3=84=ED=9A=8D=EC=88=98=EB=A6=BD=20=EA=B2=B0?= =?UTF-8?q?=EC=9E=AC=EA=B8=B0=EB=8A=A5=20=EC=9E=91=EC=97=85=EC=A4=91...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dbnt/faisp/authMgt/AuthMgtController.java | 9 +- .../faisp/authMgt/mapper/AuthMgtMapper.java | 5 +- .../faisp/authMgt/service/AuthMgtService.java | 9 +- .../java/com/dbnt/faisp/config/BaseModel.java | 2 + .../dbnt/faisp/fpiMgt/FpiMgtController.java | 113 ++++++++++- .../fpiMgt/monthPlan/model/BoardPlan.java | 10 +- .../monthPlan/service/MonthPlanService.java | 2 +- .../resources/mybatisMapper/AuthMgtMapper.xml | 12 +- .../mybatisMapper/MonthPlanMapper.xml | 55 ++++-- .../js/igActivities/fpiMgt/affairPlan.js | 24 +++ .../js/igActivities/fpiMgt/monthPlan.js | 30 ++- .../fpiMgt/affairPlan/commitPlan.html | 176 +++++++++++++++++ .../{monthPlan => affairPlan}/monthPlan.html | 60 ++++-- .../planEditModal.html | 5 +- .../planViewModal.html | 32 +-- .../fpiMgt/affairPlan/stayPlan.html | 183 ++++++++++++++++++ .../fpiMgt/monthPlan/apprvCommitTab.html | 94 --------- .../fpiMgt/monthPlan/apprvStayTab.html | 94 --------- .../fpiMgt/monthPlan/myPlanTab.html | 94 --------- 19 files changed, 645 insertions(+), 364 deletions(-) create mode 100644 src/main/resources/static/js/igActivities/fpiMgt/affairPlan.js create mode 100644 src/main/resources/templates/igActivities/fpiMgt/affairPlan/commitPlan.html rename src/main/resources/templates/igActivities/fpiMgt/{monthPlan => affairPlan}/monthPlan.html (66%) rename src/main/resources/templates/igActivities/fpiMgt/{monthPlan => affairPlan}/planEditModal.html (94%) rename src/main/resources/templates/igActivities/fpiMgt/{monthPlan => affairPlan}/planViewModal.html (86%) create mode 100644 src/main/resources/templates/igActivities/fpiMgt/affairPlan/stayPlan.html delete mode 100644 src/main/resources/templates/igActivities/fpiMgt/monthPlan/apprvCommitTab.html delete mode 100644 src/main/resources/templates/igActivities/fpiMgt/monthPlan/apprvStayTab.html delete mode 100644 src/main/resources/templates/igActivities/fpiMgt/monthPlan/myPlanTab.html diff --git a/src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java b/src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java index efa6543f..6fa8ec6d 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java +++ b/src/main/java/com/dbnt/faisp/authMgt/AuthMgtController.java @@ -8,6 +8,9 @@ import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; +import java.util.HashMap; +import java.util.Map; + @RestController @RequiredArgsConstructor @@ -31,8 +34,10 @@ public class AuthMgtController { @GetMapping("/authEditModal") public ModelAndView menuEditModal(UserInfo userInfo){ ModelAndView mav = new ModelAndView("adminPage/authMgt/authEditModal"); - userInfo.setAccessConfigList(authMgtService.selectAccessConfigList(userInfo)); - userInfo.setApprovalConfigList(authMgtService.selectApprovalConfigList(userInfo)); + Map params = new HashMap<>(); + params.put("userSeq", userInfo.getUserSeq()); + userInfo.setAccessConfigList(authMgtService.selectAccessConfigList(params)); + userInfo.setApprovalConfigList(authMgtService.selectApprovalConfigList(params)); mav.addObject("userInfo", userInfo); return mav; } diff --git a/src/main/java/com/dbnt/faisp/authMgt/mapper/AuthMgtMapper.java b/src/main/java/com/dbnt/faisp/authMgt/mapper/AuthMgtMapper.java index 5853f840..6011cc1a 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/mapper/AuthMgtMapper.java +++ b/src/main/java/com/dbnt/faisp/authMgt/mapper/AuthMgtMapper.java @@ -6,11 +6,12 @@ import com.dbnt.faisp.userInfo.model.UserInfo; import org.apache.ibatis.annotations.Mapper; import java.util.List; +import java.util.Map; @Mapper public interface AuthMgtMapper { - List selectAccessConfigList(UserInfo userInfo); + List selectAccessConfigList(Map params); - List selectApprovalConfigList(UserInfo userInfo); + List selectApprovalConfigList(Map params); } diff --git a/src/main/java/com/dbnt/faisp/authMgt/service/AuthMgtService.java b/src/main/java/com/dbnt/faisp/authMgt/service/AuthMgtService.java index b7e99e4f..5ab3c839 100644 --- a/src/main/java/com/dbnt/faisp/authMgt/service/AuthMgtService.java +++ b/src/main/java/com/dbnt/faisp/authMgt/service/AuthMgtService.java @@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; @Service @@ -21,12 +22,12 @@ public class AuthMgtService { private final ApprovalConfigRepository approvalConfigRepository; - public List selectAccessConfigList(UserInfo userInfo) { - return authMgtMapper.selectAccessConfigList(userInfo); + public List selectAccessConfigList(Map params) { + return authMgtMapper.selectAccessConfigList(params); } - public List selectApprovalConfigList(UserInfo userInfo) { - return authMgtMapper.selectApprovalConfigList(userInfo); + public List selectApprovalConfigList(Map params) { + return authMgtMapper.selectApprovalConfigList(params); } public void saveAuth(AuthMgt authMgt) { diff --git a/src/main/java/com/dbnt/faisp/config/BaseModel.java b/src/main/java/com/dbnt/faisp/config/BaseModel.java index 5bcab6f0..e4192fbc 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseModel.java +++ b/src/main/java/com/dbnt/faisp/config/BaseModel.java @@ -28,6 +28,8 @@ public class BaseModel { @Transient private Integer contentCnt=0; @Transient + private String dateSelector; + @Transient private String startDate; @Transient private String endDate; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java b/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java index 0bc0391e..bb5e7a5d 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/FpiMgtController.java @@ -1,5 +1,6 @@ package com.dbnt.faisp.fpiMgt; +import com.dbnt.faisp.authMgt.service.AuthMgtService; import com.dbnt.faisp.fpiMgt.monthPlan.service.MonthPlanService; import com.dbnt.faisp.fpiMgt.monthPlan.model.BoardPlan; import com.dbnt.faisp.userInfo.model.UserInfo; @@ -10,19 +11,38 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import java.time.LocalDateTime; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RestController @RequiredArgsConstructor @RequestMapping("/fpiMgt") public class FpiMgtController { // 외사경찰견문관리 private final MonthPlanService monthPlanService; + private final AuthMgtService authMgtService; @GetMapping("/monthPlanPage") public ModelAndView monthPlanPage(@AuthenticationPrincipal UserInfo loginUser, BoardPlan boardPlan){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monthPlan/monthPlan"); - mav.addObject("loginUser", loginUser); - boardPlan.setWrtNm(loginUser.getUserNm()); + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/monthPlan"); + Map params = new HashMap<>(); + params.put("userSeq", loginUser.getUserSeq()); + params.put("menuUrl", "/fpiMgt/monthPlanPage"); + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(params).get(0).getAccessAuth(); + switch (accessAuth){ + case "ACC001": // 조회 + case "ACC002": // 작성 // 자신이 작성한 문서만 열람가능 + boardPlan.setWrtUserSeq(loginUser.getUserSeq()); + break; + case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 + boardPlan.setOrganCdList(loginUser.getOrganCdList()); + mav.addObject("mgtOrganList", loginUser.getOrganCdList()); + break; + } + mav.addObject("accessAuth", accessAuth); + //결재권한 확인 + //authMgtService.selectApprovalConfigList(params); boardPlan.setQueryInfo(); mav.addObject("planList", monthPlanService.selectBoardPlanList(boardPlan)); boardPlan.setContentCnt(monthPlanService.selectBoardPlanListCnt(boardPlan)); @@ -33,12 +53,13 @@ public class FpiMgtController { // 외사경찰견문관리 @GetMapping("/planEditModal") public ModelAndView planEditModal(@AuthenticationPrincipal UserInfo loginUser, BoardPlan boardPlan){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monthPlan/planEditModal"); + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/planEditModal"); if(boardPlan.getPlanKey()!=null){ boardPlan = monthPlanService.selectBoardPlan(boardPlan.getPlanKey()); }else{ boardPlan.setWrtOrgan(loginUser.getOgCd()); - boardPlan.setWrtNm(loginUser.getUserNm()); + boardPlan.setWrtUserSeq(loginUser.getUserSeq()); + boardPlan.setWrtUserNm(loginUser.getUserNm()); boardPlan.setWrtDt(LocalDateTime.now()); } mav.addObject("plan", boardPlan); @@ -47,7 +68,7 @@ public class FpiMgtController { // 외사경찰견문관리 @GetMapping("/planViewModal") public ModelAndView planViewModal(BoardPlan boardPlan){ - ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monthPlan/planViewModal"); + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/planViewModal"); boardPlan = monthPlanService.selectBoardPlan(boardPlan.getPlanKey()); mav.addObject("plan", boardPlan); return mav; @@ -62,4 +83,84 @@ public class FpiMgtController { // 외사경찰견문관리 boardPlan.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); return monthPlanService.saveBoardPlan(boardPlan, planInfos, detailPlanInfos, deleteFileSeq); } + + @GetMapping("/apprvStayPage") + public ModelAndView apprvStayPage(@AuthenticationPrincipal UserInfo loginUser, BoardPlan boardPlan){ + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/stayPlan"); + Map params = new HashMap<>(); + params.put("userSeq", loginUser.getUserSeq()); + params.put("menuUrl", "/fpiMgt/monthPlanPage"); + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(params).get(0).getAccessAuth(); + switch (accessAuth){ + case "ACC001": // 조회 + case "ACC002": // 작성 // 자신이 작성한 문서만 열람가능 + boardPlan.setWrtUserSeq(loginUser.getUserSeq()); + break; + case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 + boardPlan.setOrganCdList(loginUser.getOrganCdList()); + mav.addObject("mgtOrganList", loginUser.getOrganCdList()); + break; + } + //결재권한 확인 + String apprvAuth = authMgtService.selectApprovalConfigList(params).get(0).getApprovalAuth(); + switch (apprvAuth){ + case "ACC004": // 계장대행 + case "ACC003": // 계장 // 결재대기 문서 조회 + boardPlan.setPlanState("DST002"); + break; + case "ACC002": // 부장대행 + case "ACC001": // 부장 // 계장승인 문서 조회 + boardPlan.setPlanState("DST004"); + break; + } + mav.addObject("accessAuth", accessAuth); + mav.addObject("apprvAuth", apprvAuth); + boardPlan.setQueryInfo(); + mav.addObject("planList", monthPlanService.selectBoardPlanList(boardPlan)); + boardPlan.setContentCnt(monthPlanService.selectBoardPlanListCnt(boardPlan)); + boardPlan.setPaginationInfo(); + mav.addObject("searchParams", boardPlan); + return mav; + } + + @GetMapping("/apprvCommitPage") + public ModelAndView apprvCommitPage(@AuthenticationPrincipal UserInfo loginUser, BoardPlan boardPlan){ + ModelAndView mav = new ModelAndView("igActivities/fpiMgt/affairPlan/commitPlan"); + Map params = new HashMap<>(); + params.put("userSeq", loginUser.getUserSeq()); + params.put("menuUrl", "/fpiMgt/monthPlanPage"); + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(params).get(0).getAccessAuth(); + switch (accessAuth){ + case "ACC001": // 조회 + case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능 + boardPlan.setWrtOrgan(loginUser.getOgCd()); + break; + case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능 + boardPlan.setOrganCdList(loginUser.getOrganCdList()); + mav.addObject("mgtOrganList", loginUser.getOrganCdList()); + break; + } + //결재권한 확인 + String apprvAuth = authMgtService.selectApprovalConfigList(params).get(0).getApprovalAuth(); + switch (apprvAuth){ + case "ACC004": // 계장대행 + case "ACC003": // 계장 // 계장반려, 계장승인 문서 조회 + boardPlan.setPlanState("DST002"); + break; + case "ACC002": // 부장대행 + case "ACC001": // 부장 // 부장반려, 부장승인 문서 조회 + boardPlan.setPlanState("DST004"); + break; + } + mav.addObject("accessAuth", accessAuth); + mav.addObject("apprvAuth", apprvAuth); + boardPlan.setQueryInfo(); + mav.addObject("planList", monthPlanService.selectBoardPlanList(boardPlan)); + boardPlan.setContentCnt(monthPlanService.selectBoardPlanListCnt(boardPlan)); + boardPlan.setPaginationInfo(); + mav.addObject("searchParams", boardPlan); + return mav; + } } diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/BoardPlan.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/BoardPlan.java index 476ee286..aa61b1c5 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/BoardPlan.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/model/BoardPlan.java @@ -26,8 +26,6 @@ public class BoardPlan extends BaseModel { @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "plan_key") private Integer planKey; - @Column(name = "plan_state") - private String planState; @Column(name = "content_title") private String contentTitle; @Column(name = "plan_dt") @@ -47,11 +45,15 @@ public class BoardPlan extends BaseModel { private String headEtc; @Column(name = "wrt_organ") private String wrtOrgan; - @Column(name = "wrt_nm") - private String wrtNm; + @Column(name = "wrt_user_nm") + private String wrtUserNm; @Column(name = "wrt_dt") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime wrtDt; + @Column(name = "plan_state") + private String planState; + @Column(name = "wrt_user_seq") + private Integer wrtUserSeq; @Transient private Integer fileCnt; diff --git a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/service/MonthPlanService.java b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/service/MonthPlanService.java index 98d17a31..159cf11a 100644 --- a/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/service/MonthPlanService.java +++ b/src/main/java/com/dbnt/faisp/fpiMgt/monthPlan/service/MonthPlanService.java @@ -44,7 +44,7 @@ public class MonthPlanService extends BaseService { Integer planKey = boardPlanRepository.save(boardPlan).getPlanKey(); Integer infoSeq = savePlanMainInfos(planKey,0, "S", planInfos);//요약 summery savePlanMainInfos(planKey, infoSeq, "D", detailPlanInfos);//상세 detail - if(deleteFileSeq.size()>0){ + if(deleteFileSeq != null && deleteFileSeq.size()>0){ deletePlanFile(planKey, deleteFileSeq); } if(boardPlan.getMultipartFileList()!=null){ diff --git a/src/main/resources/mybatisMapper/AuthMgtMapper.xml b/src/main/resources/mybatisMapper/AuthMgtMapper.xml index ad79adc9..16be6cde 100644 --- a/src/main/resources/mybatisMapper/AuthMgtMapper.xml +++ b/src/main/resources/mybatisMapper/AuthMgtMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select a.menu_key, a.cat1_cd as cat1Cd, a.cat2_cd as cat2Cd, @@ -13,10 +13,15 @@ from menu_mgt a left outer join access_config b on a.menu_key = b.menu_key and b.user_seq = #{userSeq} + + + and a.menu_url = #{menuUrl} + + order by cat1_cd, cat2_cd, cat3_cd - select a.menu_key, a.cat1_cd as cat1Cd, a.cat2_cd as cat2Cd, @@ -26,6 +31,9 @@ left outer join approval_config b on a.menu_key = b.menu_key and b.user_seq = #{userSeq} where a.approval_chk = 'T' + + and a.menu_url = #{menuUrl} + order by cat1_cd, cat2_cd, cat3_cd \ No newline at end of file diff --git a/src/main/resources/mybatisMapper/MonthPlanMapper.xml b/src/main/resources/mybatisMapper/MonthPlanMapper.xml index a0ff1752..0d120faa 100644 --- a/src/main/resources/mybatisMapper/MonthPlanMapper.xml +++ b/src/main/resources/mybatisMapper/MonthPlanMapper.xml @@ -4,6 +4,47 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + and a.wrt_user_seq = #{wrtUserSeq} + + + and a.wrt_user_nm like '%'||#{wrtUserNm}||'%' + + + and a.wrt_organ = #{wrtOrgan} + + + and a.content_title like '%'||#{contentTitle}||'%' + + + and a.plan_state = #{planState} + + + + and a.plan_dt >= #{startDate}::date + + + and a.plan_dt <= #{endDate}::date + + + + + and a.wrt_dt >= #{startDate}::date + + + and a.wrt_dt <= #{endDate}::date + + + + and a.wrt_organ in + + #{organCd} + + + + \ No newline at end of file diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affairPlan.js b/src/main/resources/static/js/igActivities/fpiMgt/affairPlan.js new file mode 100644 index 00000000..d125b053 --- /dev/null +++ b/src/main/resources/static/js/igActivities/fpiMgt/affairPlan.js @@ -0,0 +1,24 @@ +$(document).on('click', '#monthPlanTab', function (){ + location.href = "/fpiMgt/monthPlanPage"; +}) +$(document).on('click', '#apprvStayTab', function (){ + location.href = "/fpiMgt/apprvStayPage"; +}) +$(document).on('click', '#apprvCommitTab', function (){ + location.href = "/fpiMgt/apprvCommitPage"; +}) +function getViewModal(planKey){ + $.ajax({ + url: '/fpiMgt/planViewModal', + data: {planKey: planKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#planViewBody").empty().append(html) + $("#planViewModal").modal('show'); + }, + error:function(){ + + } + }); +} diff --git a/src/main/resources/static/js/igActivities/fpiMgt/monthPlan.js b/src/main/resources/static/js/igActivities/fpiMgt/monthPlan.js index 0d62a2aa..bd78ca0f 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/monthPlan.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/monthPlan.js @@ -1,10 +1,18 @@ let files = []; +$(function(){ + $("#dateSelectorDiv").datepicker({ + format: "yyyy-mm-dd", + language: "ko" + }); +}) + $(document).on('click', '#addPlanBtn', function (){ getEditModal(null) }) - $(document).on('click', '.planTr', function (){ + $(".trChkBox").prop("checked", false); + $(this).find(".trChkBox").prop("checked", true); getViewModal(Number($(this).find(".planKey").val())); }) $(document).on('click', '#editPlanBtn', function (){ @@ -35,28 +43,12 @@ $(document).on('click', '#detailPlanAddBtn', function (){ }) $(document).on('click', '#savePlanBtn', function (){ - savePlan('S') + savePlan('DST002') }) $(document).on('click', '#saveTempBtn', function (){ - savePlan('T') + savePlan('DST001') }) -function getViewModal(planKey){ - $.ajax({ - url: '/fpiMgt/planViewModal', - data: {planKey: planKey}, - type: 'GET', - dataType:"html", - success: function(html){ - $("#planViewBody").empty().append(html) - $("#planViewModal").modal('show'); - }, - error:function(){ - - } - }); -} - function getEditModal(planKey){ $.ajax({ url: '/fpiMgt/planEditModal', diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/commitPlan.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/commitPlan.html new file mode 100644 index 00000000..7abf09e0 --- /dev/null +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/commitPlan.html @@ -0,0 +1,176 @@ + + + + + +
+
+

첩보수집활동 > 외사경찰 견문관리 > 계획수립

+

계획수립

+ + +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+ +
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
제목시행일자작성자작성일시첨부파일상태
임시저장결재대기계장반려계장결재부장반려부장결재
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+ \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/monthPlan.html similarity index 66% rename from src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html rename to src/main/resources/templates/igActivities/fpiMgt/affairPlan/monthPlan.html index 25f773ae..4f5927dd 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/monthPlan.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/monthPlan.html @@ -3,11 +3,13 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> +
-

운영계획서

+

첩보수집활동 > 외사경찰 견문관리 > 계획수립

+

계획수립

@@ -15,7 +17,7 @@
+
+ +
- + +
+
+ +
+
+ +
+
+
+ + + +
@@ -65,18 +99,18 @@ - + - + - 계장결재 - 계장반려 - 부장결재 - 부장반려 - 임시저장 - 결재대기 + 임시저장 + 결재대기 + 계장반려 + 계장결재 + 부장반려 + 부장결재 @@ -109,7 +143,7 @@
- +
@@ -140,8 +174,8 @@
+ -
diff --git a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/planEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html similarity index 94% rename from src/main/resources/templates/igActivities/fpiMgt/monthPlan/planEditModal.html rename to src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html index 81eb121b..e3aeaeff 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/planEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planEditModal.html @@ -10,11 +10,12 @@ +
- +
- +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/planViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html similarity index 86% rename from src/main/resources/templates/igActivities/fpiMgt/monthPlan/planViewModal.html rename to src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html index 6de525ca..3ee055bf 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/planViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planViewModal.html @@ -4,9 +4,9 @@
- +
- +
@@ -18,24 +18,24 @@
- - - - - - - - - - - - - + - + + + + + + + + + + + + +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/stayPlan.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/stayPlan.html new file mode 100644 index 00000000..4604b509 --- /dev/null +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/stayPlan.html @@ -0,0 +1,183 @@ + + + + + +
+
+

첩보수집활동 > 외사경찰 견문관리 > 계획수립

+

계획수립

+ + +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+ +
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
제목시행일자작성자작성일시첨부파일상태
임시저장결재대기계장반려계장결재부장반려부장결재
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + + +
+ \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/apprvCommitTab.html b/src/main/resources/templates/igActivities/fpiMgt/monthPlan/apprvCommitTab.html deleted file mode 100644 index d6a0066d..00000000 --- a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/apprvCommitTab.html +++ /dev/null @@ -1,94 +0,0 @@ - - -
- -
-
- -
-
-
-
- -
- -
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
제목시행일자작성자작성일시첨부파일상태
계장결재계장반려부장결재부장반려임시저장결재대기
-
-
-
-
- -
-
- -
-
-
-
-
-
- \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/apprvStayTab.html b/src/main/resources/templates/igActivities/fpiMgt/monthPlan/apprvStayTab.html deleted file mode 100644 index d6a0066d..00000000 --- a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/apprvStayTab.html +++ /dev/null @@ -1,94 +0,0 @@ - - -
- -
-
- -
-
-
-
- -
- -
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
제목시행일자작성자작성일시첨부파일상태
계장결재계장반려부장결재부장반려임시저장결재대기
-
-
-
-
- -
-
- -
-
-
-
-
-
- \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/myPlanTab.html b/src/main/resources/templates/igActivities/fpiMgt/monthPlan/myPlanTab.html deleted file mode 100644 index d6a0066d..00000000 --- a/src/main/resources/templates/igActivities/fpiMgt/monthPlan/myPlanTab.html +++ /dev/null @@ -1,94 +0,0 @@ - - -
- -
-
- -
-
-
-
- -
- -
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
제목시행일자작성자작성일시첨부파일상태
계장결재계장반려부장결재부장반려임시저장결재대기
-
-
-
-
- -
-
- -
-
-
-
-
-
- \ No newline at end of file