From 2c298660ee7d770942eff2117f7c13ad2c4da0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Wed, 8 Mar 2023 13:00:08 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=ED=99=9C=EB=8F=99=20?=
 =?UTF-8?q?=EC=9E=91=EC=97=85=EC=A4=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activityCase/ActivityCaseController.java  |  42 +--
 .../activityCase/model/ActivityCaseBoard.java |   1 +
 .../activityCase/model/ActivityCaseInfo.java  |  10 +-
 .../model/ActivityCaseSummary.java            |   1 +
 .../model/ActivityCaseSuspect.java            |   2 +
 .../mybatisMapper/ActivityCaseMapper.xml      |   6 +-
 .../js/counterIntelligence/activityCase.js    |  21 +-
 .../activityCase/activityCase1EditModal.html  | 126 ---------
 .../activityCase/activityCase2EditModal.html  | 110 --------
 .../activityCase/activityCase2ViewModal.html  | 118 --------
 .../activityCase/activityCase3EditModal.html  | 110 --------
 .../activityCase/activityCase3ViewModal.html  | 118 --------
 .../activityCase/activityCaseBoard.html       |   2 +-
 .../activityCase/activityCaseEditModal.html   | 256 ++++++++++++++++++
 .../activityCaseSummaryModal.html             |   7 +-
 ...wModal.html => activityCaseViewModal.html} |   6 +-
 16 files changed, 303 insertions(+), 633 deletions(-)
 delete mode 100644 src/main/resources/templates/counterIntelligence/activityCase/activityCase1EditModal.html
 delete mode 100644 src/main/resources/templates/counterIntelligence/activityCase/activityCase2EditModal.html
 delete mode 100644 src/main/resources/templates/counterIntelligence/activityCase/activityCase2ViewModal.html
 delete mode 100644 src/main/resources/templates/counterIntelligence/activityCase/activityCase3EditModal.html
 delete mode 100644 src/main/resources/templates/counterIntelligence/activityCase/activityCase3ViewModal.html
 create mode 100644 src/main/resources/templates/counterIntelligence/activityCase/activityCaseEditModal.html
 rename src/main/resources/templates/counterIntelligence/activityCase/{activityCase1ViewModal.html => activityCaseViewModal.html} (94%)

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 4ed95f1c..7732e083 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
@@ -42,18 +42,7 @@ public class ActivityCaseController {
 
   @GetMapping("/activityCaseEditModal")
   public ModelAndView activityCaseEditModal(@AuthenticationPrincipal UserInfo loginUser, ActivityCase activityCase, ActivityCaseInfo activityCaseInfo){
-    ModelAndView mav = null;
-    switch (activityCaseInfo.getCaseType()){
-      case "ACT001":
-        mav = new ModelAndView("counterIntelligence/activityCase/activityCase1EditModal");
-        break;
-      case "ACT002":
-        mav = new ModelAndView("counterIntelligence/activityCase/activityCase2EditModal");
-        break;
-      case "ACT003":
-        mav = new ModelAndView("counterIntelligence/activityCase/activityCase3EditModal");
-        break;
-    }
+    ModelAndView mav = new ModelAndView("counterIntelligence/activityCase/activityCaseEditModal");
     if(activityCase.getReceiptKey()==null){
       activityCase.setWrtOrgan(loginUser.getOgCd());
       activityCase.setWrtPart(loginUser.getOfcCd());
@@ -62,7 +51,9 @@ public class ActivityCaseController {
       activityCase.setWrtUserNm(loginUser.getUserNm());
     }else{
       activityCase = activityCaseService.selectActivityCase(activityCase.getReceiptKey());
-      activityCaseInfo = activityCaseService.selectActivityCaseInfo(activityCaseInfo.getCaseKey());
+      if(activityCaseInfo.getCaseKey()!=null){
+        activityCaseInfo = activityCaseService.selectActivityCaseInfo(activityCaseInfo.getCaseKey());
+      }
     }
     String accessAuth = authMgtService.selectAccessConfigList
         (loginUser.getUserSeq(), "/counterIntelligence/activityCaseList").get(0).getAccessAuth();
@@ -89,31 +80,24 @@ public class ActivityCaseController {
   @GetMapping("/activityCaseSummaryModal")
   public ModelAndView activityCaseSummaryModal(@AuthenticationPrincipal UserInfo loginUser, ActivityCaseSummary activityCase){
     ModelAndView mav = new ModelAndView("counterIntelligence/activityCase/activityCaseSummaryModal");
-    mav.addObject("activityCaseList", activityCaseService.selectActivityCaseInfoList(activityCase.getReceiptKey()));
+    List<ActivityCaseSummary> activityCaseList = activityCaseService.selectActivityCaseInfoList(activityCase.getReceiptKey());
+    mav.addObject("lastCaseType", activityCaseList.get(activityCaseList.size()-1).getCaseType());
+    mav.addObject("receiptKey", activityCase.getReceiptKey());
+    mav.addObject("activityCaseList", activityCaseList);
     return mav;
   }
 
   @GetMapping("/activityCaseViewModal")
-  public ModelAndView activityCaseViewModal(@AuthenticationPrincipal UserInfo loginUser, ActivityCaseSummary activityCase){
-    ModelAndView mav = null;
-    ActivityCaseInfo activityCaseInfo = activityCaseService.selectActivityCaseInfo(activityCase.getCaseKey());
-    switch (activityCaseInfo.getCaseType()){
-      case "ACT001":
-        mav = new ModelAndView("counterIntelligence/activityCase/activityCase1ViewModal");
-        break;
-      case "ACT002":
-        mav = new ModelAndView("counterIntelligence/activityCase/activityCase2ViewModal");
-        break;
-      case "ACT003":
-        mav = new ModelAndView("counterIntelligence/activityCase/activityCase3ViewModal");
-        break;
-    }
+  public ModelAndView activityCaseViewModal(@AuthenticationPrincipal UserInfo loginUser, ActivityCase activityCase, ActivityCaseInfo activityCaseInfo){
+    ModelAndView mav = new ModelAndView("counterIntelligence/activityCase/activityCaseViewModal");
+    activityCase = activityCaseService.selectActivityCase(activityCase.getReceiptKey());
+    activityCaseInfo = activityCaseService.selectActivityCaseInfo(activityCaseInfo.getCaseKey());
     mav.addObject("viewUserSeq", loginUser.getUserSeq());
     String accessAuth = authMgtService.selectAccessConfigList
         (loginUser.getUserSeq(), "/counterIntelligence/activityCaseList").get(0).getAccessAuth();
     mav.addObject("accessAuth", accessAuth);
+    mav.addObject("activityCase", activityCase);
     mav.addObject("activityCaseInfo", activityCaseInfo);
-    mav.addObject("activityCase", activityCaseService.selectActivityCase(activityCaseInfo.getReceiptKey()));
     return mav;
   }
 
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 baee7d1c..717014e1 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
@@ -25,6 +25,7 @@ public class ActivityCaseBoard extends BaseModel {
   private String title;
   private LocalDate reportDate;
   private LocalDateTime wrtDt;
+  private String status;
   private String suspectNm;
   private Integer suspectCnt;
 }
diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseInfo.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseInfo.java
index f4418143..39b3b847 100644
--- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseInfo.java
+++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseInfo.java
@@ -37,12 +37,8 @@ public class ActivityCaseInfo extends BaseModel {
   private String caseType;
   @Column(name = "title")
   private String title;
-  @Column(name = "allegations")
-  private String allegations;
-  @Column(name = "applicable_law")
-  private String applicableLaw;
-  @Column(name = "case_progress")
-  private String caseProgress;
+  @Column(name = "content")
+  private String content;
   @Column(name = "description")
   private String description;
   @Column(name = "activity_result")
@@ -50,6 +46,8 @@ public class ActivityCaseInfo extends BaseModel {
   @Column(name = "wrt_dt")
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
   private LocalDateTime wrtDt;
+  @Column(name = "status")
+  private String status;
 
   @Transient
   private List<ActivityCaseApprv> apprvList;
diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseSummary.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseSummary.java
index bb938b8b..85c2f336 100644
--- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseSummary.java
+++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseSummary.java
@@ -29,6 +29,7 @@ public class ActivityCaseSummary extends BaseModel {
   private String caseType;
   private String title;
   private LocalDateTime wrtDt;
+  private String status;
   private Integer apprvCnt;
   private Integer allCnt;
   private Integer fileCnt;
diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseSuspect.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseSuspect.java
index d9f68eb3..5ab907ac 100644
--- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseSuspect.java
+++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseSuspect.java
@@ -39,6 +39,8 @@ public class ActivityCaseSuspect {
   private String address;
   @Column(name = "area")
   private String area;
+  @Column(name = "job")
+  private String job;
   @Column(name = "etc")
   private String etc;
 
diff --git a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml
index 01919b65..5421f71e 100644
--- a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml
+++ b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml
@@ -56,6 +56,7 @@
           c.title,
           c.report_date ,
           c.wrt_dt,
+          c.status,
           d.suspectCnt,
           e.name as suspectNm
     from activity_case a
@@ -119,13 +120,14 @@
           b.case_type ,
           b.title,
           b.wrt_dt,
+          b.status,
           c.apprvCnt,
           c.allCnt,
           d.fileCnt
     from activity_case a
       inner join activity_case_info b
         on a.receipt_key = b.receipt_key
-      inner join (
+      left outer join (
         select case_key,
               count(apprv_yn = 'Y' or apprv_yn = 'N') as apprvCnt,
               count(*) as allCnt
@@ -139,7 +141,7 @@
         group by case_key
       ) d on b.case_key = d.case_key
     where a.receipt_key = #{receiptKey}
-    order by b.wrt_dt desc
+    order by b.wrt_dt asc
   </select>
 
   <select id="selectReceiptNum" resultType="int" parameterType="int">
diff --git a/src/main/resources/static/js/counterIntelligence/activityCase.js b/src/main/resources/static/js/counterIntelligence/activityCase.js
index c2df84f3..b7675f4d 100644
--- a/src/main/resources/static/js/counterIntelligence/activityCase.js
+++ b/src/main/resources/static/js/counterIntelligence/activityCase.js
@@ -1,7 +1,7 @@
 let selectedList= [];
 
 $(document).on('click', '.addActivityCaseInfoBtn', function (){
-  getActivityCaseEditModal(null, $(this).attr('data-casetype'));
+  getActivityCaseEditModal(null, null, $(this).attr('data-casetype'));
 })
 
 $(document).on('click', '#suspectAddBtn', function (){
@@ -12,6 +12,7 @@ $(document).on('click', '#apprvAddBtn', function (){
   searchModalSubmit(1);
   $("#userModal").modal('show');
 })
+
 $(document).on('click', '#getUserBtn', function (){
   const selectedUser = $(".userInfoCheckBox:checked").parents(".userInfoTr")
   const userList = [];
@@ -37,9 +38,9 @@ $(document).on('click', '.saveBtn', function(){
   saveActivityCase($(this).attr("data-status"));
 })
 
-$(document).on('click', '#editActivityCaseBtn', function (){
-  $("#activityCaseViewModal").modal('hide');
-  getActivityCaseEditModal($(this).attr("data-casekey"));
+$(document).on('click', '.addInfoBtn', function (){
+  const target = $(this);
+  getActivityCaseEditModal(target.attr('data-receiptkey'), null, target.attr('data-casetype'))
 })
 
 $(document).on('click', '.activityCaseTr', function (){
@@ -47,13 +48,13 @@ $(document).on('click', '.activityCaseTr', function (){
 })
 
 $(document).on('click', '.summaryTr', function (){
-  getActivityCaseViewModal($(this).find(".caseKey").val());
+  getActivityCaseViewModal($(this).find(".receiptKey").val(), $(this).find(".caseKey").val());
 })
 
-function getActivityCaseEditModal(caseKey, caseType){
+function getActivityCaseEditModal(receiptKey, caseKey, caseType){
   $.ajax({
     url: '/counterIntelligence/activityCaseEditModal',
-    data: {caseKey: caseKey, caseType: caseType},
+    data: {receiptKey: receiptKey, caseKey: caseKey, caseType: caseType},
     type: 'GET',
     dataType:"html",
     success: function(html){
@@ -63,6 +64,7 @@ function getActivityCaseEditModal(caseKey, caseType){
         language: "ko",
         autoclose: true
       });
+      setEditor('editor', '470');
       setUploadDiv();
       $("#activityCaseEditModal").modal('show');
     },
@@ -128,10 +130,10 @@ function getActivityCaseSummaryModal(receiptKey){
   });
 }
 
-function getActivityCaseViewModal(caseKey){
+function getActivityCaseViewModal(receiptKey, caseKey){
   $.ajax({
     url: '/counterIntelligence/activityCaseViewModal',
-    data: {caseKey: caseKey},
+    data: {receiptKey: receiptKey, caseKey: caseKey},
     type: 'GET',
     dataType:"html",
     success: function(html){
@@ -181,6 +183,7 @@ function saveActivityCase(status){
         formData.append('apprvList['+idx+'].titleCd', $(el).find(".titleCd").val());
         formData.append('apprvList['+idx+'].userNm', $(el).find(".userNm").val());
       })
+      formData.append('content', CrossEditor.GetBodyValue());
       $.ajax({
         type : 'POST',
         data : formData,
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCase1EditModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCase1EditModal.html
deleted file mode 100644
index 855a46a6..00000000
--- a/src/main/resources/templates/counterIntelligence/activityCase/activityCase1EditModal.html
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko" xmlns:th="http://www.thymeleaf.org">
-<div class="modal-header bg-dark">
-  <h5 class="modal-title text-white" id="activityCaseEditModalLabel">
-    <th:block th:text="|착수보고서 ${activityCaseInfo.caseKey eq null?'작성':'수정'}|"></th:block>
-  </h5>
-  <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
-</div>
-<div class="modal-body" id="activityCaseEditBody">
-  <form action="#" method="post" id="activityCaseEditForm">
-    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
-    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
-    <input type="hidden" name="receiptKey" th:value="${activityCase.receiptKey}">
-    <input type="hidden" name="wrtOrgan" th:value="${activityCase.wrtOrgan}">
-    <input type="hidden" name="wrtPart" th:value="${activityCase.wrtPart}">
-    <input type="hidden" name="wrtUserSeq" th:value="${activityCase.wrtUserSeq}">
-    <input type="hidden" name="wrtUserGrd" th:value="${activityCase.wrtUserGrd}">
-    <input type="hidden" name="wrtUserNm" th:value="${activityCase.wrtUserNm}">
-    <input type="hidden" name="caseKey" th:value="${activityCaseInfo.caseKey}">
-    <input type="hidden" id="caseType" name="caseType" th:value="${activityCaseInfo.caseType}">
-    <div class="row mb-1">
-      <label for="receiptNum" class="col-sm-1 col-form-label col-form-label-sm text-center">접수번호</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" id="receiptNum" name="receiptNum" th:value="${activityCase.receiptNum}" placeholder="저장시 생성" readonly>
-      </div>
-      <label for="caseNum" class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" id="caseNum" name="caseNum" th:value="${activityCaseInfo.caseNum}" placeholder="저장시 생성" readonly>
-      </div>
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
-      <div class="col-sm-2">
-        <th:block th:if="${activityCase.wrtUserGrd eq null}">
-          <input type="text" class="form-control form-control-sm" th:value="${activityCase.wrtUserNm}" readonly>
-        </th:block>
-        <th:block th:unless="${activityCase.wrtUserGrd eq null}">
-          <th:block th:each="code:${session.commonCode.get('JT')}">
-            <th:block th:if="${code.itemCd eq activityCase.wrtUserGrd}">
-              <input type="text" class="form-control form-control-sm" th:value="|${code.itemValue} ${activityCase.wrtUserNm}|" readonly>
-            </th:block>
-          </th:block>
-        </th:block>
-      </div>
-      <label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(activityCaseInfo.wrtDt, 'yyyy-MM-dd HH:mm')}" placeholder="저장시 생성" readonly>
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="title" class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
-      <div class="col-sm-8">
-        <input type="text" class="form-control form-control-sm" id="title" name="title" th:value="${activityCaseInfo.title}">
-      </div>
-      <label for="reportDate" class="col-sm-1 col-form-label col-form-label-sm text-center">보고일자</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm dateSelector" id="reportDate" name="reportDate" th:value="${#temporals.format(activityCaseInfo.reportDate, 'yyyy-MM-dd')}">
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="suspectAddBtn" class="col-sm-1 col-form-label col-form-label-sm text-center">
-        혐의자
-        <button type="button" class="border-0 bg-white" id="suspectAddBtn">
-          <i class="bi bi-plus-square text-primary"></i>
-        </button>
-      </label>
-      <div class="col-sm-11">
-        <div class="border h-100">
-          <div class="row" id="suspectHome">
-
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="caseProgress" class="col-sm-1 col-form-label col-form-label-sm text-center">외사활동 사항</label>
-      <div class="col-sm-11">
-        <textarea class="form-control form-control-sm" id="caseProgress" name="caseProgress" th:value="${activityCaseInfo.caseProgress}"></textarea>
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="description" class="col-sm-1 col-form-label col-form-label-sm text-center">외사활동이<br>필요한 이유</label>
-      <div class="col-sm-11">
-        <textarea class="form-control form-control-sm"  id="description" name="description" th:value="${activityCaseInfo.description}"></textarea>
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="suspectAddBtn" class="col-sm-1 col-form-label col-form-label-sm text-center">
-        결재자
-        <button type="button" class="border-0 bg-white" id="apprvAddBtn">
-          <i class="bi bi-plus-square text-primary"></i>
-        </button>
-      </label>
-      <div class="col-sm-11">
-        <div class="border h-100">
-          <div class="row" id="apprvHome">
-
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="row mb-3">
-      <label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">첨부파일</label>
-      <div class="col-sm-11" style="min-height: 70px;">
-        <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
-          <th:block th:if="${#arrays.isEmpty(activityCaseInfo.fileList)}">
-            <br>클릭 & 드레그로 파일을 업로드 해주세요.
-          </th:block>
-          <th:block th:unless="${#arrays.isEmpty(activityCaseInfo.fileList)}">
-            <div class='row-col-6' th:each="file:${activityCaseInfo.fileList}">
-              <span th:data-fileseq="${file.fileSeq}" th:text="|${file.origNm}.${file.fileExtn} ${file.fileSize}|"></span>
-              <a href='#' class='uploadedFileDelete text-danger text-decoration-none'>삭제</a>
-            </div>
-          </th:block>
-        </div>
-      </div>
-      <input type="file" class="d-none" id="fileInputer" multiple>
-    </div>
-  </form>
-</div>
-<div class="modal-footer bg-light">
-  <th:block th:if="${activityCaseInfo.caseKey ne null and accessAuth eq 'ACC003'}">
-    <button type="button" class="btn btn-danger" id="deleteActivityCaseBtn" th:data-casekey="${activityCaseInfo.caseKey}">삭제</button>
-  </th:block>
-  <button type="button" class="btn btn-warning saveBtn" data-status="DST001">임시저장</button>
-  <button type="button" class="btn btn-primary saveBtn" data-status="DST007">저장</button>
-<!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
-</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCase2EditModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCase2EditModal.html
deleted file mode 100644
index 1206e1be..00000000
--- a/src/main/resources/templates/counterIntelligence/activityCase/activityCase2EditModal.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko" xmlns:th="http://www.thymeleaf.org">
-<div class="modal-header bg-dark">
-  <h5 class="modal-title text-white" id="activityCaseEditModalLabel">
-    <th:block th:each="code:${session.commonCode.get('ACT')}">
-      <th:block th:if="${code.itemCd eq activityCaseInfo.caseType}" th:text="${code.itemValue}"></th:block>
-    </th:block>
-    <th:block th:text="${activityCaseInfo.caseKey eq null?'작성':'수정'}"></th:block>
-  </h5>
-  <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
-</div>
-<div class="modal-body" id="activityCaseEditBody">
-  <form action="#" method="post" id="activityCaseEditForm">
-    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
-    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
-    <input type="hidden" name="receiptKey" th:value="${activityCase.receiptKey}">
-    <input type="hidden" name="wrtOrgan" th:value="${activityCase.wrtOrgan}">
-    <input type="hidden" name="wrtPart" th:value="${activityCase.wrtPart}">
-    <input type="hidden" name="wrtUserSeq" th:value="${activityCase.wrtUserSeq}">
-    <input type="hidden" name="wrtUserGrd" th:value="${activityCase.wrtUserGrd}">
-    <input type="hidden" name="wrtUserNm" th:value="${activityCase.wrtUserNm}">
-    <input type="hidden" name="caseKey" th:value="${activityCaseInfo.caseKey}">
-    <input type="hidden" name="wrtDt" th:value="${activityCaseInfo.wrtDt}">
-    <div class="row mb-1">
-      <label for="receiptNum" class="col-sm-1 col-form-label col-form-label-sm text-center">접수번호</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" id="receiptNum" name="receiptNum" th:value="${activityCase.receiptNum}" placeholder="저장시 생성" readonly>
-      </div>
-      <label for="caseNum" class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" id="caseNum" name="caseNum" th:value="${activityCaseInfo.caseNum}" placeholder="저장시 생성" readonly>
-      </div>
-      <label for="wrtUserNm" class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
-      <div class="col-sm-2">
-        <th:block th:if="${activityCase.wrtUserGrd eq null}">
-          <input type="text" class="form-control form-control-sm" id="wrtUserNm" th:value="${activityCase.wrtUserNm}" readonly>
-        </th:block>
-        <th:block th:unless="${activityCase.wrtUserGrd eq null}">
-          <th:block th:each="code:${session.commonCode.get('JT')}">
-            <th:block th:if="${code.itemCd eq activityCase.wrtUserGrd}">
-              <input type="text" class="form-control form-control-sm" id="wrtUserNm" th:value="|${code.itemValue} ${activityCase.wrtUserNm}|" readonly>
-            </th:block>
-          </th:block>
-        </th:block>
-      </div>
-      <label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(activityCaseInfo.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="title" class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
-      <div class="col-sm-11">
-        <input type="text" class="form-control form-control-sm" id="title" name="title" th:value="${activityCaseInfo.title}">
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="suspectAddBtn" class="col-sm-1 col-form-label col-form-label-sm text-center">
-        혐의자
-        <button type="button" class="border-0 bg-white" id="suspectAddBtn">
-          <i class="bi bi-plus-square text-primary"></i>
-        </button>
-      </label>
-      <div class="col-sm-11">
-        <div class="border h-100">
-          <div class="row" id="suspectHome">
-
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="caseProgress" class="col-sm-1 col-form-label col-form-label-sm text-center">외사활동 사항</label>
-      <div class="col-sm-11">
-        <textarea class="form-control form-control-sm" id="caseProgress" name="caseProgress" th:value="${activityCaseInfo.caseProgress}"></textarea>
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="description" class="col-sm-1 col-form-label col-form-label-sm text-center">외사활동이 필요한 이유</label>
-      <div class="col-sm-11">
-        <textarea class="form-control form-control-sm"  id="description" name="description" th:value="${activityCaseInfo.description}"></textarea>
-      </div>
-    </div>
-    <div class="row mb-3">
-      <label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">첨부파일</label>
-      <div class="col-sm-11" style="min-height: 70px;">
-        <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
-          <th:block th:if="${#arrays.isEmpty(activityCaseInfo.fileList)}">
-            <br>클릭 & 드레그로 파일을 업로드 해주세요.
-          </th:block>
-          <th:block th:unless="${#arrays.isEmpty(activityCaseInfo.fileList)}">
-            <div class='row-col-6' th:each="file:${activityCaseInfo.fileList}">
-              <span th:data-fileseq="${file.fileSeq}" th:text="|${file.origNm}.${file.fileExtn} ${file.fileSize}|"></span>
-              <a href='#' class='uploadedFileDelete text-danger text-decoration-none'>삭제</a>
-            </div>
-          </th:block>
-        </div>
-      </div>
-      <input type="file" class="d-none" id="fileInputer" multiple>
-    </div>
-  </form>
-</div>
-<div class="modal-footer bg-light">
-  <th:block th:if="${activityCaseInfo.caseKey ne null and accessAuth eq 'ACC003'}">
-    <button type="button" class="btn btn-danger" id="deleteActivityCaseBtn" th:data-casekey="${activityCaseInfo.caseKey}">삭제</button>
-  </th:block>
-  <button type="button" class="btn btn-warning saveBtn" data-status="DST001">임시저장</button>
-  <button type="button" class="btn btn-primary saveBtn" data-status="DST007">저장</button>
-<!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
-</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCase2ViewModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCase2ViewModal.html
deleted file mode 100644
index 4b08e8f6..00000000
--- a/src/main/resources/templates/counterIntelligence/activityCase/activityCase2ViewModal.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko" xmlns:th="http://www.thymeleaf.org">
-<div class="modal-header bg-dark">
-  <h5 class="modal-title text-white" id="ciWorkViewModalLabel">방첩공작 열람</h5>
-  <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
-</div>
-<div class="modal-body" id="ciWorkViewBody">
-  <input type="hidden" id="ciwKey" th:value="${ciWork.ciwKey}">
-  <ul class="nav nav-tabs" id="userTab" role="tablist">
-    <li class="nav-item" role="presentation">
-      <button class="nav-link active" id="boardTab" data-bs-toggle="tab" data-bs-target="#boardTabPanel" type="button" role="tab" aria-controls="boardTabPanel" aria-selected="true">본문</button>
-    </li>
-    <li class="nav-item" role="presentation" th:if="${#lists.size(ciWork.fileList)>0}">
-      <button class="nav-link" id="fileTab" data-bs-toggle="tab" data-bs-target="#fileTabPanel" type="button" role="tab" aria-controls="fileTabPanel" aria-selected="false" th:text="${#strings.concat('첨부파일(', #lists.size(ciWork.fileList), ')')}"></button>
-    </li>
-  </ul>
-  <div class="tab-content bg-white border border-top-0 p-2">
-    <div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
-      <div class="row mb-1">
-        <div class="col-sm-9"></div>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성일시</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">공작명</label>
-        <label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="|${ciWork.status eq 'DST001'?'[임시] ':''}${ciWork.title}|"></label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성자</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ciWork.wrtUserNm}"></label>
-      </div>
-      <hr class="my-1">
-      <div class="row mb-1">
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">착수일</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.workStartDate, 'yyyy-MM-dd')}"></label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">종결일(예정)</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.workEndDate, 'yyyy-MM-dd')}"></label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">1차재평가</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.reRatingDate1, 'yyyy-MM-dd')}"></label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">2차재평가</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.reRatingDate2, 'yyyy-MM-dd')}"></label>
-      </div>
-      <div class="row mb-1">
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">등급</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-          <th:block th:each="code:${session.commonCode.get('CIWR')}">
-            <th:block th:if="${code.itemCd eq ciWork.workRating}" th:text="${code.itemValue}"></th:block>
-          </th:block>
-        </label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">범죄테마</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-          <th:block th:each="code:${session.commonCode.get('AT')}">
-            <th:block th:if="${code.itemCd eq ciWork.arrestType1}" th:text="${code.itemValue}"></th:block>
-          </th:block>
-        </label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">위반유형</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-          <th:block th:each="code:${session.commonCode.get(ciWork.arrestType1)}">
-            <th:block th:if="${code.itemCd eq ciWork.arrestType2}" th:text="${code.itemValue}"></th:block>
-          </th:block>
-        </label>
-      </div>
-      <hr class="my-1">
-      <div class="row mb-1">
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건개요</label>
-        <div class="col-sm-11 form-control-sm" th:utext="${#strings.replace(ciWork.summaryInfo, lineSeparator, '<br>')}"></div>
-      </div>
-      <hr class="my-1">
-      <div class="row mb-1">
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">내용</label>
-        <div class="col-sm-11 form-control-sm" th:utext="${ciWork.content}"></div>
-      </div>
-      <hr class="my-1">
-      <div class="row mb-1">
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">해시태그</label>
-        <label class="col-sm-11 col-form-label col-form-label-sm text-start" th:text="${ciWork.hashTags}"></label>
-      </div>
-    </div>
-    <div class="tab-pane fade p-2" id="fileTabPanel" role="tabpanel" tabindex="0">
-      <div class="row mb-3">
-        <div class="col-sm-12">
-          <table class="table table-sm" id="fileTable">
-            <thead>
-            <tr>
-              <th>파일명</th>
-              <th>사이즈</th>
-            </tr>
-            </thead>
-            <tbody>
-            <th:block th:if="${#lists.isEmpty(ciWork.fileList)}">
-              <tr>
-                <td colspan="2">파일이 없습니다.</td>
-              </tr>
-            </th:block>
-            <th:block th:unless="${#lists.isEmpty(ciWork.fileList)}">
-              <th:block th:each="file:${ciWork.fileList}">
-                <tr class="fileInfoTr">
-                  <td>
-                    <a href="#" class="fileDownLink" data-board="ciWork"
-                         th:data-parentkey="${file.ciwKey}" th:data-fileseq="${file.fileSeq}"
-                         th:text="|${file.origNm}.${file.fileExtn}|"></a>
-                  </td>
-                  <td th:text="${file.fileSize}"></td>
-                </tr>
-              </th:block>
-            </th:block>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="modal-footer bg-light">
-  <th:block th:if="${accessAuth eq 'ACC003'}">
-    <button type="button" class="btn btn-danger" id="deleteCiWorkBtn" th:data-ciwkey="${ciWork.ciwKey}">삭제</button>
-  </th:block>
-  <th:block th:if="${viewUserSeq eq ciWork.wrtUserSeq}">
-    <button type="button" class="btn btn-warning" id="editCiWorkBtn" th:data-ciwkey="${ciWork.ciwKey}">수정</button>
-  </th:block>
-<!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
-</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCase3EditModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCase3EditModal.html
deleted file mode 100644
index 1206e1be..00000000
--- a/src/main/resources/templates/counterIntelligence/activityCase/activityCase3EditModal.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko" xmlns:th="http://www.thymeleaf.org">
-<div class="modal-header bg-dark">
-  <h5 class="modal-title text-white" id="activityCaseEditModalLabel">
-    <th:block th:each="code:${session.commonCode.get('ACT')}">
-      <th:block th:if="${code.itemCd eq activityCaseInfo.caseType}" th:text="${code.itemValue}"></th:block>
-    </th:block>
-    <th:block th:text="${activityCaseInfo.caseKey eq null?'작성':'수정'}"></th:block>
-  </h5>
-  <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
-</div>
-<div class="modal-body" id="activityCaseEditBody">
-  <form action="#" method="post" id="activityCaseEditForm">
-    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
-    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
-    <input type="hidden" name="receiptKey" th:value="${activityCase.receiptKey}">
-    <input type="hidden" name="wrtOrgan" th:value="${activityCase.wrtOrgan}">
-    <input type="hidden" name="wrtPart" th:value="${activityCase.wrtPart}">
-    <input type="hidden" name="wrtUserSeq" th:value="${activityCase.wrtUserSeq}">
-    <input type="hidden" name="wrtUserGrd" th:value="${activityCase.wrtUserGrd}">
-    <input type="hidden" name="wrtUserNm" th:value="${activityCase.wrtUserNm}">
-    <input type="hidden" name="caseKey" th:value="${activityCaseInfo.caseKey}">
-    <input type="hidden" name="wrtDt" th:value="${activityCaseInfo.wrtDt}">
-    <div class="row mb-1">
-      <label for="receiptNum" class="col-sm-1 col-form-label col-form-label-sm text-center">접수번호</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" id="receiptNum" name="receiptNum" th:value="${activityCase.receiptNum}" placeholder="저장시 생성" readonly>
-      </div>
-      <label for="caseNum" class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" id="caseNum" name="caseNum" th:value="${activityCaseInfo.caseNum}" placeholder="저장시 생성" readonly>
-      </div>
-      <label for="wrtUserNm" class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
-      <div class="col-sm-2">
-        <th:block th:if="${activityCase.wrtUserGrd eq null}">
-          <input type="text" class="form-control form-control-sm" id="wrtUserNm" th:value="${activityCase.wrtUserNm}" readonly>
-        </th:block>
-        <th:block th:unless="${activityCase.wrtUserGrd eq null}">
-          <th:block th:each="code:${session.commonCode.get('JT')}">
-            <th:block th:if="${code.itemCd eq activityCase.wrtUserGrd}">
-              <input type="text" class="form-control form-control-sm" id="wrtUserNm" th:value="|${code.itemValue} ${activityCase.wrtUserNm}|" readonly>
-            </th:block>
-          </th:block>
-        </th:block>
-      </div>
-      <label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
-      <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(activityCaseInfo.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="title" class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
-      <div class="col-sm-11">
-        <input type="text" class="form-control form-control-sm" id="title" name="title" th:value="${activityCaseInfo.title}">
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="suspectAddBtn" class="col-sm-1 col-form-label col-form-label-sm text-center">
-        혐의자
-        <button type="button" class="border-0 bg-white" id="suspectAddBtn">
-          <i class="bi bi-plus-square text-primary"></i>
-        </button>
-      </label>
-      <div class="col-sm-11">
-        <div class="border h-100">
-          <div class="row" id="suspectHome">
-
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="caseProgress" class="col-sm-1 col-form-label col-form-label-sm text-center">외사활동 사항</label>
-      <div class="col-sm-11">
-        <textarea class="form-control form-control-sm" id="caseProgress" name="caseProgress" th:value="${activityCaseInfo.caseProgress}"></textarea>
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="description" class="col-sm-1 col-form-label col-form-label-sm text-center">외사활동이 필요한 이유</label>
-      <div class="col-sm-11">
-        <textarea class="form-control form-control-sm"  id="description" name="description" th:value="${activityCaseInfo.description}"></textarea>
-      </div>
-    </div>
-    <div class="row mb-3">
-      <label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">첨부파일</label>
-      <div class="col-sm-11" style="min-height: 70px;">
-        <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
-          <th:block th:if="${#arrays.isEmpty(activityCaseInfo.fileList)}">
-            <br>클릭 & 드레그로 파일을 업로드 해주세요.
-          </th:block>
-          <th:block th:unless="${#arrays.isEmpty(activityCaseInfo.fileList)}">
-            <div class='row-col-6' th:each="file:${activityCaseInfo.fileList}">
-              <span th:data-fileseq="${file.fileSeq}" th:text="|${file.origNm}.${file.fileExtn} ${file.fileSize}|"></span>
-              <a href='#' class='uploadedFileDelete text-danger text-decoration-none'>삭제</a>
-            </div>
-          </th:block>
-        </div>
-      </div>
-      <input type="file" class="d-none" id="fileInputer" multiple>
-    </div>
-  </form>
-</div>
-<div class="modal-footer bg-light">
-  <th:block th:if="${activityCaseInfo.caseKey ne null and accessAuth eq 'ACC003'}">
-    <button type="button" class="btn btn-danger" id="deleteActivityCaseBtn" th:data-casekey="${activityCaseInfo.caseKey}">삭제</button>
-  </th:block>
-  <button type="button" class="btn btn-warning saveBtn" data-status="DST001">임시저장</button>
-  <button type="button" class="btn btn-primary saveBtn" data-status="DST007">저장</button>
-<!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
-</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCase3ViewModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCase3ViewModal.html
deleted file mode 100644
index 4b08e8f6..00000000
--- a/src/main/resources/templates/counterIntelligence/activityCase/activityCase3ViewModal.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko" xmlns:th="http://www.thymeleaf.org">
-<div class="modal-header bg-dark">
-  <h5 class="modal-title text-white" id="ciWorkViewModalLabel">방첩공작 열람</h5>
-  <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
-</div>
-<div class="modal-body" id="ciWorkViewBody">
-  <input type="hidden" id="ciwKey" th:value="${ciWork.ciwKey}">
-  <ul class="nav nav-tabs" id="userTab" role="tablist">
-    <li class="nav-item" role="presentation">
-      <button class="nav-link active" id="boardTab" data-bs-toggle="tab" data-bs-target="#boardTabPanel" type="button" role="tab" aria-controls="boardTabPanel" aria-selected="true">본문</button>
-    </li>
-    <li class="nav-item" role="presentation" th:if="${#lists.size(ciWork.fileList)>0}">
-      <button class="nav-link" id="fileTab" data-bs-toggle="tab" data-bs-target="#fileTabPanel" type="button" role="tab" aria-controls="fileTabPanel" aria-selected="false" th:text="${#strings.concat('첨부파일(', #lists.size(ciWork.fileList), ')')}"></button>
-    </li>
-  </ul>
-  <div class="tab-content bg-white border border-top-0 p-2">
-    <div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
-      <div class="row mb-1">
-        <div class="col-sm-9"></div>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성일시</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">공작명</label>
-        <label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="|${ciWork.status eq 'DST001'?'[임시] ':''}${ciWork.title}|"></label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성자</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ciWork.wrtUserNm}"></label>
-      </div>
-      <hr class="my-1">
-      <div class="row mb-1">
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">착수일</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.workStartDate, 'yyyy-MM-dd')}"></label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">종결일(예정)</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.workEndDate, 'yyyy-MM-dd')}"></label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">1차재평가</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.reRatingDate1, 'yyyy-MM-dd')}"></label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">2차재평가</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ciWork.reRatingDate2, 'yyyy-MM-dd')}"></label>
-      </div>
-      <div class="row mb-1">
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">등급</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-          <th:block th:each="code:${session.commonCode.get('CIWR')}">
-            <th:block th:if="${code.itemCd eq ciWork.workRating}" th:text="${code.itemValue}"></th:block>
-          </th:block>
-        </label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">범죄테마</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-          <th:block th:each="code:${session.commonCode.get('AT')}">
-            <th:block th:if="${code.itemCd eq ciWork.arrestType1}" th:text="${code.itemValue}"></th:block>
-          </th:block>
-        </label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">위반유형</label>
-        <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-          <th:block th:each="code:${session.commonCode.get(ciWork.arrestType1)}">
-            <th:block th:if="${code.itemCd eq ciWork.arrestType2}" th:text="${code.itemValue}"></th:block>
-          </th:block>
-        </label>
-      </div>
-      <hr class="my-1">
-      <div class="row mb-1">
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건개요</label>
-        <div class="col-sm-11 form-control-sm" th:utext="${#strings.replace(ciWork.summaryInfo, lineSeparator, '<br>')}"></div>
-      </div>
-      <hr class="my-1">
-      <div class="row mb-1">
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">내용</label>
-        <div class="col-sm-11 form-control-sm" th:utext="${ciWork.content}"></div>
-      </div>
-      <hr class="my-1">
-      <div class="row mb-1">
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">해시태그</label>
-        <label class="col-sm-11 col-form-label col-form-label-sm text-start" th:text="${ciWork.hashTags}"></label>
-      </div>
-    </div>
-    <div class="tab-pane fade p-2" id="fileTabPanel" role="tabpanel" tabindex="0">
-      <div class="row mb-3">
-        <div class="col-sm-12">
-          <table class="table table-sm" id="fileTable">
-            <thead>
-            <tr>
-              <th>파일명</th>
-              <th>사이즈</th>
-            </tr>
-            </thead>
-            <tbody>
-            <th:block th:if="${#lists.isEmpty(ciWork.fileList)}">
-              <tr>
-                <td colspan="2">파일이 없습니다.</td>
-              </tr>
-            </th:block>
-            <th:block th:unless="${#lists.isEmpty(ciWork.fileList)}">
-              <th:block th:each="file:${ciWork.fileList}">
-                <tr class="fileInfoTr">
-                  <td>
-                    <a href="#" class="fileDownLink" data-board="ciWork"
-                         th:data-parentkey="${file.ciwKey}" th:data-fileseq="${file.fileSeq}"
-                         th:text="|${file.origNm}.${file.fileExtn}|"></a>
-                  </td>
-                  <td th:text="${file.fileSize}"></td>
-                </tr>
-              </th:block>
-            </th:block>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="modal-footer bg-light">
-  <th:block th:if="${accessAuth eq 'ACC003'}">
-    <button type="button" class="btn btn-danger" id="deleteCiWorkBtn" th:data-ciwkey="${ciWork.ciwKey}">삭제</button>
-  </th:block>
-  <th:block th:if="${viewUserSeq eq ciWork.wrtUserSeq}">
-    <button type="button" class="btn btn-warning" id="editCiWorkBtn" th:data-ciwkey="${ciWork.ciwKey}">수정</button>
-  </th:block>
-<!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
-</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html
index ad20da58..805c66c2 100644
--- a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html
+++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html
@@ -143,7 +143,7 @@
                         </th:block>
                       </td>
                       <td th:text="${case.caseNum}"></td>
-                      <td th:text="${case.title}"></td>
+                      <td th:text="|${case.status eq 'DST001'?'[임시]':''}${case.title}|"></td>
                       <td th:text="${#temporals.format(case.reportDate, 'yyyy-MM-dd')}"></td>
                       <td th:text="${#temporals.format(case.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                     </tr>
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseEditModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseEditModal.html
new file mode 100644
index 00000000..12dd0acc
--- /dev/null
+++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseEditModal.html
@@ -0,0 +1,256 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<div class="modal-header bg-dark">
+  <h5 class="modal-title text-white" id="activityCaseEditModalLabel">
+    <th:block th:if="${activityCaseInfo.caseType eq 'ACT001'}">
+      <th:block th:text="|착수보고서 ${activityCaseInfo.caseKey eq null?'작성':'수정'}|"></th:block>
+    </th:block>
+    <th:block th:if="${activityCaseInfo.caseType eq 'ACT002'}">
+      <th:block th:text="|진행보고서 ${activityCaseInfo.caseKey eq null?'작성':'수정'}|"></th:block>
+    </th:block>
+    <th:block th:if="${activityCaseInfo.caseType eq 'ACT003'}">
+      <th:block th:text="|결과보고서 ${activityCaseInfo.caseKey eq null?'작성':'수정'}|"></th:block>
+    </th:block>
+  </h5>
+  <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
+</div>
+<div class="modal-body" id="activityCaseEditBody">
+  <form action="#" method="post" id="activityCaseEditForm">
+    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+    <input type="hidden" name="receiptKey" th:value="${activityCase.receiptKey}">
+    <input type="hidden" name="wrtOrgan" th:value="${activityCase.wrtOrgan}">
+    <input type="hidden" name="wrtPart" th:value="${activityCase.wrtPart}">
+    <input type="hidden" name="wrtUserSeq" th:value="${activityCase.wrtUserSeq}">
+    <input type="hidden" name="wrtUserGrd" th:value="${activityCase.wrtUserGrd}">
+    <input type="hidden" name="wrtUserNm" th:value="${activityCase.wrtUserNm}">
+    <input type="hidden" name="caseKey" th:value="${activityCaseInfo.caseKey}">
+    <input type="hidden" name="status" id="status" th:value="${activityCaseInfo.status}">
+    <input type="hidden" id="caseType" name="caseType" th:value="${activityCaseInfo.caseType}">
+    <div class="row mb-1">
+      <label for="receiptNum" class="col-sm-1 col-form-label col-form-label-sm text-center">접수번호</label>
+      <div class="col-sm-2">
+        <input type="text" class="form-control form-control-sm" id="receiptNum" name="receiptNum" th:value="${activityCase.receiptNum}" placeholder="저장시 생성" readonly>
+      </div>
+      <label for="caseNum" class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
+      <div class="col-sm-2">
+        <input type="text" class="form-control form-control-sm" id="caseNum" name="caseNum" th:value="${activityCaseInfo.caseNum}" placeholder="저장시 생성" readonly>
+      </div>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
+      <div class="col-sm-2">
+        <th:block th:if="${activityCase.wrtUserGrd eq null}">
+          <input type="text" class="form-control form-control-sm" th:value="${activityCase.wrtUserNm}" readonly>
+        </th:block>
+        <th:block th:unless="${activityCase.wrtUserGrd eq null}">
+          <th:block th:each="code:${session.commonCode.get('JT')}">
+            <th:block th:if="${code.itemCd eq activityCase.wrtUserGrd}">
+              <input type="text" class="form-control form-control-sm" th:value="|${code.itemValue} ${activityCase.wrtUserNm}|" readonly>
+            </th:block>
+          </th:block>
+        </th:block>
+      </div>
+      <label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
+      <div class="col-sm-2">
+        <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(activityCaseInfo.wrtDt, 'yyyy-MM-dd HH:mm')}" placeholder="저장시 생성" readonly>
+      </div>
+    </div>
+    <div class="row mb-1">
+      <label for="title" class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
+      <div class="col-sm-5">
+        <input type="text" class="form-control form-control-sm" id="title" name="title" th:value="${activityCaseInfo.title}">
+      </div>
+      <th:block th:if="${activityCaseInfo.caseType ne 'ACT003'}">
+        <div class="col-sm-3"></div>
+      </th:block>
+      <th:block th:if="${activityCaseInfo.caseType eq 'ACT003'}">
+        <label for="activityResult" class="col-sm-1 col-form-label col-form-label-sm text-center">결과</label>
+        <div class="col-sm-2">
+          <select class="form-select form-select-sm" id="activityResult" name="activityResult">
+            <option value="">선택</option>
+          </select>
+        </div>
+      </th:block>
+      <label for="reportDate" class="col-sm-1 col-form-label col-form-label-sm text-center">보고일자</label>
+      <div class="col-sm-2">
+        <input type="text" class="form-control form-control-sm dateSelector" id="reportDate" name="reportDate" th:value="${#temporals.format(activityCaseInfo.reportDate, 'yyyy-MM-dd')}">
+      </div>
+    </div>
+    <div class="row mb-1">
+      <label for="suspectAddBtn" class="col-sm-1 col-form-label col-form-label-sm text-center">
+        혐의자
+        <button type="button" class="border-0 bg-white" id="suspectAddBtn">
+          <i class="bi bi-plus-square text-primary"></i>
+        </button>
+      </label>
+      <div class="col-sm-11">
+        <div class="border h-100">
+          <div class="row" id="suspectHome">
+            <th:block th:each="suspect:${activityCase.suspectList}">
+              <div class="col-sm-12 suspectDiv">
+                <div class="row mx-2 my-1">
+                  <div class="col-12 mb-1">
+                    <div class="row">
+                      <label class="col-sm-1 col-form-label col-form-label-sm text-center">분류</label>
+                      <div class="col-sm-2">
+                        <select class="form-select form-select-sm suspectType">
+                          <option value="">선택</option>
+                          <th:block th:each="code:${session.commonCode.get('ACS')}">
+                            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq suspect.type}"></option>
+                          </th:block>
+                        </select>
+                      </div>
+                      <label class="col-sm-1 col-form-label col-form-label-sm text-center">성명</label>
+                      <div class="col-sm-2">
+                        <input type="text" class="form-control form-control-sm suspectName" th:value="${suspect.name}">
+                      </div>
+                      <label class="col-sm-1 col-form-label col-form-label-sm text-center">성별</label>
+                      <div class="col-sm-2">
+                        <select class="form-select form-select-sm suspectSex">
+                          <option value="">선택</option>
+                          <th:block th:each="code:${session.commonCode.get('SEX')}">
+                            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq suspect.sex}"></option>
+                          </th:block>
+                        </select>
+                      </div>
+                      <label class="col-sm-1 col-form-label col-form-label-sm text-center">생년월일</label>
+                      <div class="col-sm-2">
+                        <input type="text" class="form-control form-control-sm suspectBirthDate" placeholder="0000-00-00" th:value="${#temporals.format(suspect.birthDate, 'yyyy-MM-dd')}">
+                      </div>
+                    </div>
+                  </div>
+                  <div class="col-12 mb-1">
+                    <div class="row">
+                      <label class="col-sm-1 col-form-label col-form-label-sm text-center">핸드폰</label>
+                      <div class="col-sm-2">
+                        <input type="text" class="form-control form-control-sm suspectPhone" th:value="${suspect.phone}">
+                      </div>
+                      <label class="col-sm-1 col-form-label col-form-label-sm text-center">주소</label>
+                      <div class="col-sm-2">
+                        <input type="text" class="form-control form-control-sm suspectAddr" th:value="${suspect.address}">
+                      </div>
+                      <label class="col-sm-1 col-form-label col-form-label-sm text-center">직업</label>
+                      <div class="col-sm-2">
+                        <input type="text" class="form-control form-control-sm suspectJob" th:value="${suspect.job}">
+                      </div>
+                      <label class="col-sm-1 col-form-label col-form-label-sm text-center">등록기준지</label>
+                      <div class="col-sm-2">
+                        <input type="text" class="form-control form-control-sm suspectArea" th:value="${suspect.area}">
+                      </div>
+                    </div>
+                  </div>
+                  <div class="col-12 mb-1">
+                    <div class="row">
+                      <label class="col-sm-1 col-form-label col-form-label-sm text-center">비고</label>
+                      <div class="col-sm-10">
+                        <input type="text" class="form-control form-control-sm suspectEtc" th:value="${suspect.etc}">
+                      </div>
+                      <div class="col-1">
+                        <button type="button" class="btn btn-sm btn-outline-danger rowDeleteBtn"><i class="bi bi-x"></i></button>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <hr class="my-1 mx-2">
+              </div>
+            </th:block>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="row mb-1">
+      <label for="editor" class="col-sm-1 col-form-label col-form-label-sm text-center">외사활동사항</label>
+      <div class="col-sm-11">
+        <div id="editor"></div>
+        <textarea id="content" class="d-none" th:utext="${activityCaseInfo.content}"></textarea>
+      </div>
+    </div>
+    <div class="row mb-1">
+      <label for="description" class="col-sm-1 col-form-label col-form-label-sm text-center">
+        비고
+      </label>
+      <div class="col-sm-11">
+        <textarea class="form-control form-control-sm"  id="description" name="description" th:value="${activityCaseInfo.description}"></textarea>
+      </div>
+    </div>
+    <div class="row mb-1">
+      <label for="suspectAddBtn" class="col-sm-1 col-form-label col-form-label-sm text-center">
+        결재자
+        <button type="button" class="border-0 bg-white" id="apprvAddBtn">
+          <i class="bi bi-plus-square text-primary"></i>
+        </button>
+      </label>
+      <div class="col-sm-11">
+        <div class="border h-100">
+          <div class="row" id="apprvHome">
+            <th:block th:each="user:${activityCaseInfo.apprvList}">
+              <div class="col-sm-12 apprvDiv">
+                <input type="hidden" class="userSeq" th:value="${user.userSeq}">
+                <input type="hidden" class="ogCd" th:value="${user.ogCd}">
+                <input type="hidden" class="ofcCd" th:value="${user.ofcCd}">
+                <input type="hidden" class="titleCd" th:value="${user.titleCd}">
+                <input type="hidden" class="userNm" th:value="${user.userNm}">
+                <div class="row mx-2 my-1">
+                  <div class="col-12 mb-1">
+                    <div class="row">
+                      <label class="col-sm-1 col-form-label col-form-label-sm text-center">경로</label>
+                      <label class="col-sm-3 col-form-label col-form-label-sm text-start">
+                        <th:block th:each="code:${session.commonCode.get('OG')}">
+                          <th:block th:if="${code.itemCd eq user.ogCd}" th:text="${code.itemValue}"></th:block>
+                        </th:block>
+                        <th:block th:each="code:${session.commonCode.get(user.ogCd)}">
+                          <th:block th:if="${code.itemCd eq user.ofcCd}" th:text="${code.itemValue}"></th:block>
+                        </th:block>
+                        <th:block th:each="code:${session.commonCode.get('JT')}">
+                          <th:block th:if="${code.itemCd eq user.titleCd}" th:text="${code.itemValue}"></th:block>
+                        </th:block>
+                        <th:block th:text="${user.userNm}"></th:block>
+                      </label>
+                      <label class="col-sm-1 col-form-label col-form-label-sm text-center">구분</label>
+                      <div class="col-2">
+                        <select class="form-select form-select-sm apprvType">
+                          <option value="">선택</option>
+                          <th:block th:each="code:${session.commonCode.get('ACAT')}">
+                            <th:block th:if="${code.useChk eq 'Y'}" th:value="${code.itemCd}" th:text="${code.itemValue}"></th:block>
+                          </th:block>
+                        </select>
+                      </div>
+                      <div class="col-1">
+                        <button type="button" class="btn btn-sm btn-outline-danger rowDeleteBtn"><i class="bi bi-x"></i></button>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <hr class="my-1 mx-2">
+              </div>
+            </th:block>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="row mb-3">
+      <label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">첨부파일</label>
+      <div class="col-sm-11" style="min-height: 70px;">
+        <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
+          <th:block th:if="${#arrays.isEmpty(activityCaseInfo.fileList)}">
+            <br>클릭 & 드레그로 파일을 업로드 해주세요.
+          </th:block>
+          <th:block th:unless="${#arrays.isEmpty(activityCaseInfo.fileList)}">
+            <div class='row-col-6' th:each="file:${activityCaseInfo.fileList}">
+              <span th:data-fileseq="${file.fileSeq}" th:text="|${file.origNm}.${file.fileExtn} ${file.fileSize}|"></span>
+              <a href='#' class='uploadedFileDelete text-danger text-decoration-none'>삭제</a>
+            </div>
+          </th:block>
+        </div>
+      </div>
+      <input type="file" class="d-none" id="fileInputer" multiple>
+    </div>
+  </form>
+</div>
+<div class="modal-footer bg-light">
+  <th:block th:if="${activityCaseInfo.caseKey ne null and accessAuth eq 'ACC003'}">
+    <button type="button" class="btn btn-danger" id="deleteActivityCaseBtn" th:data-casekey="${activityCaseInfo.caseKey}">삭제</button>
+  </th:block>
+  <button type="button" class="btn btn-warning saveBtn" data-status="DST001">임시저장</button>
+  <button type="button" class="btn btn-primary saveBtn" data-status="DST007">저장</button>
+<!--  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
+</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseSummaryModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseSummaryModal.html
index 58e65e51..8215511d 100644
--- a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseSummaryModal.html
+++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseSummaryModal.html
@@ -21,6 +21,7 @@
     </thead>
     <tbody class="table-group-divider">
     <tr class="summaryTr" th:each="case,cnt:${activityCaseList}">
+      <input type="hidden" class="receiptKey" th:value="${case.receiptKey}">
       <input type="hidden" class="caseKey" th:value="${case.caseKey}">
       <td>
         <th:block th:each="code:${session.commonCode.get('ACT')}">
@@ -29,7 +30,7 @@
       </td>
       <td th:text="${case.receiptNum}"></td>
       <td th:text="${case.caseNum}"></td>
-      <td th:text="${case.title}"></td>
+      <td th:text="|${case.status eq 'DST001'?'[임시]':''}${case.title}|"></td>
       <td th:text="${#temporals.format(case.reportDate, 'yyyy-MM-dd')}"></td>
       <td>
         <th:block th:each="code:${session.commonCode.get('JT')}">
@@ -44,6 +45,6 @@
   </table>
 </div>
 <div class="modal-footer bg-light">
-  <button type="button" class="btn btn-outline-dark">진행보고서 작성</button>
-  <button type="button" class="btn btn-outline-dark">결과보고서 작성</button>
+  <button type="button" class="btn btn-outline-dark addInfoBtn" th:data-receiptkey="${receiptKey}" data-casetype="ACT002" th:if="${lastCaseType ne 'ACT003'}">진행보고서 작성</button>
+  <button type="button" class="btn btn-outline-dark addInfoBtn" th:data-receiptkey="${receiptKey}" data-casetype="ACT003" th:if="${lastCaseType ne 'ACT003'}">결과보고서 작성</button>
 </div>
\ No newline at end of file
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCase1ViewModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html
similarity index 94%
rename from src/main/resources/templates/counterIntelligence/activityCase/activityCase1ViewModal.html
rename to src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html
index 8f8b2af5..8adef203 100644
--- a/src/main/resources/templates/counterIntelligence/activityCase/activityCase1ViewModal.html
+++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseViewModal.html
@@ -1,7 +1,11 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
 <div class="modal-header bg-dark">
-  <h5 class="modal-title text-white" id="activityCaseViewModalLabel">착수보고서 열람</h5>
+  <h5 class="modal-title text-white" id="activityCaseViewModalLabel">
+    <th:block th:if="${activityCaseInfo.caseType eq 'ACT001'}">착수보고서 열람</th:block>
+    <th:block th:if="${activityCaseInfo.caseType eq 'ACT002'}">진행보고서 열람</th:block>
+    <th:block th:if="${activityCaseInfo.caseType eq 'ACT003'}">결과보고서 열람</th:block>
+  </h5>
   <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 <div class="modal-body" id="activityCaseViewModalBody">