From 46785fc5f66e274a8f6c7a1de8865861c4ba7c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 10 Apr 2023 18:43:18 +0900 Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=ED=99=9C=EB=8F=99=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=EB=8C=80=EC=9E=A5=20=EC=9E=91=EC=97=85?= =?UTF-8?q?=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activityCase/ActivityCaseController.java | 23 ++ .../mapper/ActivityCaseMapper.java | 3 + .../activityCase/model/ActivityCaseBoard.java | 9 + .../service/ActivityCaseService.java | 8 + .../mybatisMapper/ActivityCaseMapper.xml | 84 ++++++++ .../activityCase/activityCaseEditModal.html | 8 +- .../activityCase/activityCaseMgt.html | 204 ++++++++++++++++++ .../activityCase/activityCaseViewModal.html | 6 +- 8 files changed, 339 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/templates/counterIntelligence/activityCase/activityCaseMgt.html diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java index 0be0e52f..aa99738a 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java @@ -132,4 +132,27 @@ public class ActivityCaseController { return 0; } } + + @GetMapping("/activityCaseMgt") + public ModelAndView activityCaseMgt(@AuthenticationPrincipal UserInfo loginUser, ActivityCaseBoard activityCase){ + ModelAndView mav = new ModelAndView("counterIntelligence/activityCase/activityCaseMgt"); + mav.addObject("searchUrl", "/counterIntelligence/activityCaseMgt"); + String accessAuth = authMgtService.selectAccessConfigList + (loginUser.getUserSeq(), "/counterIntelligence/activityCaseMgt").get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); + + mav.addObject("ogCd", loginUser.getOgCd()); + if(accessAuth.equals("ACC003")){ + activityCase.setDownOrganCdList(loginUser.getDownOrganCdList()); + }else{ + activityCase.setWrtOrgan(loginUser.getOgCd()); + } + activityCase.setWrtUserSeq(loginUser.getUserSeq()); + activityCase.setQueryInfo(); + mav.addObject("activityCaseList", activityCaseService.selectActivityCaseMgt(activityCase)); + activityCase.setContentCnt(activityCaseService.selectActivityCaseMgtCnt(activityCase)); + activityCase.setPaginationInfo(); + mav.addObject("searchParams", activityCase); + return mav; + } } diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/mapper/ActivityCaseMapper.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/mapper/ActivityCaseMapper.java index f2fb6874..5d7c36f2 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/mapper/ActivityCaseMapper.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/mapper/ActivityCaseMapper.java @@ -19,4 +19,7 @@ public interface ActivityCaseMapper { Integer selectReceiptNum(int year); Integer selectCaseNum(Map map); + + List selectActivityCaseMgt(ActivityCaseBoard activityCase); + Integer selectActivityCaseMgtCnt(ActivityCaseBoard activityCase); } diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseBoard.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseBoard.java index 717014e1..e5667307 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseBoard.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseBoard.java @@ -23,9 +23,18 @@ public class ActivityCaseBoard extends BaseModel { private String caseType; private String caseNum; private String title; + private String content; private LocalDate reportDate; + private LocalDate activityStartDate; + private LocalDate activityEndDate; private LocalDateTime wrtDt; private String status; private String suspectNm; + private String suspectBirthDate; + private String suspectAddress; private Integer suspectCnt; + private String activityResult; + private String apprvType; + private String apprvUserNm; + private String description; } diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java index 69eb8dd3..12c104ee 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java @@ -162,4 +162,12 @@ public class ActivityCaseService extends BaseService { acaRepository.save(savedApprv); } } + + public List selectActivityCaseMgt(ActivityCaseBoard activityCase) { + return acMapper.selectActivityCaseMgt(activityCase); + } + + public Integer selectActivityCaseMgtCnt(ActivityCaseBoard activityCase) { + return acMapper.selectActivityCaseMgtCnt(activityCase); + } } diff --git a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml index 673fddab..9a62b796 100644 --- a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml +++ b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml @@ -188,4 +188,88 @@ where a.receipt_num = #{receiptNum} and b.case_num like #{year}||'%' + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseEditModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseEditModal.html index fb8b7da7..8c607f1e 100644 --- a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseEditModal.html +++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseEditModal.html @@ -64,8 +64,8 @@
@@ -169,9 +169,7 @@
- +
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseMgt.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseMgt.html new file mode 100644 index 00000000..9a3aeebc --- /dev/null +++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseMgt.html @@ -0,0 +1,204 @@ + + + + + + +
+
+ +
+
+
+
관리대장
+
+
+

외사방첩관리 > 외사활동 > 관리대장

+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
구분접수번호혐의자외사활동 사항착수일처리결과담당자비고
접수일성명주소종료일지휘자
생년월일
+ + + + + + + +
+ + + + + + + , + +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html index 100ad887..1ffcfb39 100644 --- a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html +++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html @@ -38,7 +38,7 @@ @@ -95,6 +95,10 @@
+
+ + +