외사활동 착수보고서 등록 작업중.

src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/ActivityCaseController.java

@@ -3,6 +3,7 @@ package com.dbnt.faisp.main.counterIntelligence.activityCase;
 import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
 import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
 import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCase;
+import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseInfo;
 import com.dbnt.faisp.main.counterIntelligence.activityCase.service.ActivityCaseService;
 import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork;
 import com.dbnt.faisp.main.userInfo.model.UserInfo;
@@ -44,23 +45,35 @@ public class ActivityCaseController {
   }
 
   @GetMapping("/activityCaseEditModal")
-  public ModelAndView activityCaseEditModal(@AuthenticationPrincipal UserInfo loginUser, ActivityCase activityCase){
+  public ModelAndView activityCaseEditModal(@AuthenticationPrincipal UserInfo loginUser, ActivityCase activityCase, ActivityCaseInfo activityCaseInfo){
-    ModelAndView mav = new ModelAndView("counterIntelligence/activityCase/activityCaseEditModal");
+    ModelAndView mav = null;
-
+    switch (activityCaseInfo.getCaseType()){
-    if(activityCase.getCaseKey()==null){
+      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;
+    }
+    if(activityCase.getReceiptKey()==null){
       activityCase.setWrtOrgan(loginUser.getOgCd());
       activityCase.setWrtPart(loginUser.getOfcCd());
       activityCase.setWrtUserSeq(loginUser.getUserSeq());
       activityCase.setWrtUserGrd(loginUser.getTitleCd());
       activityCase.setWrtUserNm(loginUser.getUserNm());
-      activityCase.setWrtDt(LocalDateTime.now());
+      activityCaseInfo.setWrtDt(LocalDateTime.now());
     }else{
-      activityCase = activityCaseService.selectActivityCase(activityCase.getCaseKey());
+      activityCase = activityCaseService.selectActivityCase(activityCase.getReceiptKey());
+      activityCaseInfo = activityCaseService.selectActivityCaseInfo(activityCaseInfo.getCaseKey());
     }
     String accessAuth = authMgtService.selectAccessConfigList
         (loginUser.getUserSeq(), "/counterIntelligence/activityCaseList").get(0).getAccessAuth();
     mav.addObject("accessAuth", accessAuth);
     mav.addObject("activityCase", activityCase);
+    mav.addObject("activityCaseInfo", activityCaseInfo);
     return mav;
   }
 
@@ -88,15 +101,16 @@ public class ActivityCaseController {
     String accessAuth = authMgtService.selectAccessConfigList
         (loginUser.getUserSeq(), "/counterIntelligence/activityCaseList").get(0).getAccessAuth();
     mav.addObject("accessAuth", accessAuth);
-    mav.addObject("activityCase", activityCaseService.selectActivityCase(activityCase.getCaseKey()));
+    mav.addObject("activityCase", activityCaseService.selectActivityCase(activityCase.getReceiptKey()));
     return mav;
   }
   @PostMapping("/saveActivityCase")
   public Integer saveActivityCase(ActivityCase activityCase,
+                            ActivityCaseInfo activityCaseInfo,
                             MultipartHttpServletRequest request,
                             @RequestParam(value = "fileSeq", required = false) List<Integer> deleteFileSeq){
-    activityCase.setMultipartFileList(request.getMultiFileMap().get("uploadFiles"));
+    activityCaseInfo.setMultipartFileList(request.getMultiFileMap().get("uploadFiles"));
-    return activityCaseService.saveActivityCase(activityCase, deleteFileSeq);
+    return activityCaseService.saveActivityCase(activityCase, activityCaseInfo, deleteFileSeq);
   }
 
   @PostMapping("/deleteActivityCase")
@@ -104,7 +118,7 @@ public class ActivityCaseController {
     String accessAuth = authMgtService.selectAccessConfigList
         (loginUser.getUserSeq(), "/counterIntelligence/activityCaseList").get(0).getAccessAuth();
     if(accessAuth.equals("ACC003")){
-      return activityCaseService.deleteActivityCase(activityCase.getCaseKey());
+      return activityCaseService.deleteActivityCase(activityCase.getReceiptKey());
     }else{
       return 0;
     }

src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCase.java

@@ -26,22 +26,10 @@ import java.util.List;
 public class ActivityCase extends BaseModel {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)
-  @Column(name = "case_key")
+  @Column(name = "receipt_key")
-  private Integer caseKey;
+  private Integer receiptKey;
-  @Column(name = "status")
-  private String status;
   @Column(name = "receipt_num")
   private String receiptNum;
-  @Column(name = "receipt_dt")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-  private LocalDateTime receiptDt;
-  @Column(name = "result_dt")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-  private LocalDateTime resultDt;
-  @Column(name = "receipt_clue")
-  private String receiptClue;
-  @Column(name = "etc")
-  private String etc;
   @Column(name = "wrt_organ")
   private String wrtOrgan;
   @Column(name = "wrt_part")
@@ -52,18 +40,7 @@ public class ActivityCase extends BaseModel {
   private String wrtUserGrd;
   @Column(name = "wrt_user_nm")
   private String wrtUserNm;
-  @Column(name = "wrt_dt")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-  private LocalDateTime wrtDt;
 
-  @Transient
-  private Integer fileCnt;
-  @Transient
-  private List<ActivityCaseFile> fileList;
-  @Transient
-  private List<ActivityCaseOfficer> officerList;
   @Transient
   private List<ActivityCaseSuspect> suspectList;
-  @Transient
-  private List<MultipartFile> multipartFileList;
 }

src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseApprv.java

@@ -0,0 +1,55 @@
+package com.dbnt.faisp.main.counterIntelligence.activityCase.model;
+
+import lombok.*;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "activity_case_apprv")
+@IdClass(ActivityCaseApprv.ActivityCaseApprvId.class)
+public class ActivityCaseApprv {
+  @Id
+  @Column(name = "case_key")
+  private Integer caseKey;
+  @Id
+  @Column(name = "user_seq")
+  private Integer userSeq;
+  @Column(name = "apprv_path")
+  private String apprvPath;
+  @Column(name = "og_cd")
+  private String ogCd;
+  @Column(name = "ofc_cd")
+  private String ofcCd;
+  @Column(name = "title_cd")
+  private String titleCd;
+  @Column(name = "user_nm")
+  private String userNm;
+  @Column(name = "instructions")
+  private String instructions;
+  @Column(name = "apprv_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+  private LocalDateTime apprvDt;
+  @Column(name = "apprv_yn")
+  private String apprvYn;
+
+
+  @Embeddable
+  @Data
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class ActivityCaseApprvId implements Serializable {
+    private Integer caseKey;
+    private Integer userSeq;
+  }
+}

src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseInfo.java

@@ -0,0 +1,56 @@
+package com.dbnt.faisp.main.counterIntelligence.activityCase.model;
+
+import com.dbnt.faisp.config.BaseModel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "activity_case_info")
+public class ActivityCaseInfo extends BaseModel {
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "case_key")
+  private Integer caseKey;
+  @Column(name = "receipt_key")
+  private Integer receiptKey;
+  @Column(name = "case_num")
+  private String caseNum;
+  @Column(name = "case_type")
+  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 = "description")
+  private String description;
+  @Column(name = "activity_result")
+  private String activityResult;
+  @Column(name = "wrt_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+  private LocalDateTime wrtDt;
+
+  @Transient
+  private List<ActivityCaseApprv> apprvList;
+  @Transient
+  private List<ActivityCaseFile> fileList;
+  @Transient
+  private List<MultipartFile> multipartFileList;
+}

src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseOfficer.java

@@ -1,46 +0,0 @@
-package com.dbnt.faisp.main.counterIntelligence.activityCase.model;
-
-import com.dbnt.faisp.config.FileInfo;
-import lombok.*;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Getter
-@Setter
-@Entity
-@NoArgsConstructor
-@DynamicInsert
-@DynamicUpdate
-@Table(name = "activity_case_file")
-@IdClass(ActivityCaseOfficer.ActivityCaseOfficerId.class)
-public class ActivityCaseOfficer {
-  @Id
-  @Column(name = "case_key")
-  private Integer caseKey;
-  @Id
-  @Column(name = "officer_seq")
-  private Integer officerSeq;
-  @Column(name = "orig_nm")
-  private String origNm;
-  @Column(name = "conv_nm")
-  private String convNm;
-  @Column(name = "file_extn")
-  private String fileExtn;
-  @Column(name = "file_size")
-  private String fileSize;
-  @Column(name = "save_path")
-  private String savePath;
-
-
-  @Embeddable
-  @Data
-  @NoArgsConstructor
-  @AllArgsConstructor
-  public static class ActivityCaseOfficerId implements Serializable {
-    private Integer caseKey;
-    private Integer officerSeq;
-  }
-}

src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/model/ActivityCaseSuspect.java

@@ -19,8 +19,8 @@ import java.time.LocalDate;
 @IdClass(ActivityCaseSuspect.ActivityCaseSuspectId.class)
 public class ActivityCaseSuspect {
   @Id
-  @Column(name = "case_key")
+  @Column(name = "receipt_key")
-  private Integer caseKey;
+  private Integer receiptKey;
   @Id
   @Column(name = "suspect_seq")
   private Integer suspectSeq;
@@ -35,8 +35,8 @@ public class ActivityCaseSuspect {
   private LocalDate birthDate;
   @Column(name = "phone")
   private String phone;
-  @Column(name = "job")
+  @Column(name = "address")
-  private String job;
+  private String address;
   @Column(name = "area")
   private String area;
   @Column(name = "etc")
@@ -48,7 +48,7 @@ public class ActivityCaseSuspect {
   @NoArgsConstructor
   @AllArgsConstructor
   public static class ActivityCaseSuspectId implements Serializable {
-    private Integer caseKey;
+    private Integer receiptKey;
     private Integer suspectSeq;
   }
 }

src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/repository/ActivityCaseApprvRepository.java

@@ -1,12 +1,13 @@
 package com.dbnt.faisp.main.counterIntelligence.activityCase.repository;
 
-import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseOfficer;
+import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseApprv;
+import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseFile;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
 import java.util.Optional;
 
 
-public interface ActivityCaseOfficerRepository extends JpaRepository<ActivityCaseOfficer, ActivityCaseOfficer.ActivityCaseOfficerId> {
+public interface ActivityCaseApprvRepository extends JpaRepository<ActivityCaseApprv, ActivityCaseApprv.ActivityCaseApprvId> {
-  void deleteByCaseKey(Integer caseKey);
+
 }

src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/repository/ActivityCaseInfoRepository.java

@@ -0,0 +1,9 @@
+package com.dbnt.faisp.main.counterIntelligence.activityCase.repository;
+
+import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+
+public interface ActivityCaseInfoRepository extends JpaRepository<ActivityCaseInfo, Integer> {
+
+}

src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/repository/ActivityCaseSuspectRepository.java

@@ -9,5 +9,4 @@ import java.util.Optional;
 
 public interface ActivityCaseSuspectRepository extends JpaRepository<ActivityCaseSuspect, ActivityCaseSuspect.ActivityCaseSuspectId> {
 
-  void deleteByCaseKey(Integer caseKey);
 }

src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java

@@ -3,14 +3,8 @@ package com.dbnt.faisp.main.counterIntelligence.activityCase.service;
 import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.config.FileInfo;
 import com.dbnt.faisp.main.counterIntelligence.activityCase.mapper.ActivityCaseMapper;
-import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCase;
+import com.dbnt.faisp.main.counterIntelligence.activityCase.model.*;
-import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseFile;
+import com.dbnt.faisp.main.counterIntelligence.activityCase.repository.*;
-import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseOfficer;
-import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseSuspect;
-import com.dbnt.faisp.main.counterIntelligence.activityCase.repository.ActivityCaseFileRepository;
-import com.dbnt.faisp.main.counterIntelligence.activityCase.repository.ActivityCaseOfficerRepository;
-import com.dbnt.faisp.main.counterIntelligence.activityCase.repository.ActivityCaseSuspectRepository;
-import com.dbnt.faisp.main.counterIntelligence.activityCase.repository.ActivityCaseRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -23,52 +17,40 @@ import java.util.UUID;
 @Service
 @RequiredArgsConstructor
 public class ActivityCaseService extends BaseService {
-  private final ActivityCaseRepository activityCaseRepository;
+  private final ActivityCaseRepository acRepository;
-  private final ActivityCaseFileRepository acfRepository;
   private final ActivityCaseSuspectRepository acsRepository;
-  private final ActivityCaseOfficerRepository acoRepository;
+  private final ActivityCaseInfoRepository aciRepository;
-  private final ActivityCaseMapper activityCaseMapper;
+  private final ActivityCaseFileRepository acfRepository;
+  private final ActivityCaseApprvRepository acaRepository;
+  private final ActivityCaseMapper acMapper;
 
   public List<ActivityCase> selectActivityCaseList(ActivityCase activityCase){
-    return activityCaseMapper.selectActivityCaseList(activityCase);
+    return acMapper.selectActivityCaseList(activityCase);
   }
   public Integer selectActivityCaseCnt(ActivityCase activityCase){
-    return activityCaseMapper.selectActivityCaseCnt(activityCase);
+    return acMapper.selectActivityCaseCnt(activityCase);
-  }
-  public ActivityCase selectActivityCase(Integer caseKey) {
-    ActivityCase activityCase = activityCaseRepository.findById(caseKey).orElse(null);
-    if(activityCase!=null){
-      activityCase.setFileList(acfRepository.findByCaseKey(caseKey));
   }
+  public ActivityCase selectActivityCase(Integer receiptKey) {
+    ActivityCase activityCase = acRepository.findById(receiptKey).orElse(null);
+
     return activityCase;
   }
 
-  @Transactional
+  public ActivityCaseInfo selectActivityCaseInfo(Integer caseKey) {
-  public Integer saveActivityCase(ActivityCase activityCase, List<Integer> deleteFileSeq) {
+    ActivityCaseInfo activityCaseInfo = aciRepository.findById(caseKey).orElse(null);
-    Integer caseKey = activityCaseRepository.save(activityCase).getCaseKey();
+    return activityCaseInfo;
-    saveActivityCaseSuspect(caseKey, activityCase.getSuspectList());
-    saveActivityCaseOfficer(caseKey, activityCase.getOfficerList());
-    if(deleteFileSeq != null && deleteFileSeq.size()>0){
-      deleteActivityCaseFile(caseKey, deleteFileSeq);
-    }
-    if(activityCase.getMultipartFileList()!=null){
-      saveUploadFiles(caseKey, activityCase.getMultipartFileList());
   }
 
-    return caseKey;
+  @Transactional
+  public Integer saveActivityCase(ActivityCase activityCase, ActivityCaseInfo activityCaseInfo, List<Integer> deleteFileSeq) {
+    Integer receiptKey = acRepository.save(activityCase).getReceiptKey();
+
+    return receiptKey;
   }
 
   private void saveActivityCaseSuspect(Integer caseKey, List<ActivityCaseSuspect> suspectList) {
     if(suspectList==null){
-      acsRepository.deleteByCaseKey(caseKey);
-    }else{
 
-    }
-  }
-
-  private void saveActivityCaseOfficer(Integer caseKey, List<ActivityCaseOfficer> officerList) {
-    if(officerList==null){
-      acoRepository.deleteByCaseKey(caseKey);
     }else{
 
     }
@@ -111,10 +93,9 @@ public class ActivityCaseService extends BaseService {
   }
 
   @Transactional
-  public Integer deleteActivityCase(Integer caseKey) {
+  public Integer deleteActivityCase(Integer receiptKey) {
-    ActivityCase activityCase = activityCaseRepository.findById(caseKey).orElse(null);
+    ActivityCase activityCase = acRepository.findById(receiptKey).orElse(null);
-    activityCase.setStatus("DST008");
-    return caseKey;
-  }
 
+    return receiptKey;
+  }
 }

src/main/resources/static/js/counterIntelligence/activityCase.js

@@ -1,24 +1,18 @@
 let selectedList= [];
-$(document).on('click', '#addActivityCaseBtn', function (){
+
-  getActivityCaseEditModal(null);
+$(document).on('click', '.addActivityCaseInfoBtn', function (){
+  getActivityCaseEditModal(null, $(this).attr('data-casetype'));
 })
 
 $(document).on('click', '#suspectAddBtn', function (){
   getSuspectDiv()
 })
-$(document).on('click', '#officerAddBtn', function (){
+
-  searchModalSubmit(1);
-  $("#userModal").modal('show');
-})
-$(document).on('click', '#getUserBtn', function (){
-  getOfficerDiv();
-})
 $(document).on('click', '.rowDeleteBtn', function (){
   $(this).parents(".suspectDiv").remove();
-  $(this).parents(".officerRow").remove();
 })
 
-$(document).on('click', '#saveTempBtn,#saveActivityCaseBtn', function(){
+$(document).on('click', '.saveBtn', function(){
   saveActivityCase($(this).attr("data-status"));
 })
 
@@ -35,10 +29,10 @@ $(document).on('click', '#deleteActivityCaseBtn', function (){
   deleteActivityCase($(this).attr("data-casekey"));
 })
 
-function getActivityCaseEditModal(caseKey){
+function getActivityCaseEditModal(caseKey, caseType){
   $.ajax({
     url: '/counterIntelligence/activityCaseEditModal',
-    data: {caseKey: caseKey},
+    data: {caseKey: caseKey, caseType: caseType},
     type: 'GET',
     dataType:"html",
     success: function(html){
@@ -70,25 +64,6 @@ function getSuspectDiv(){
     }
   });
 }
-function getOfficerDiv(){
-  $.ajax({
-    type: 'POST',
-    url: '/counterIntelligence/getOfficerDiv',
-    data: JSON.stringify(selectedList),
-    contentType: 'application/json',
-    dataType:"html",
-    beforeSend: function (xhr){
-      xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
-    },
-    success: function(html){
-      $("#officerHome").append(html)
-      $("#userModal").modal("hide");
-    },
-    error:function(e){
-      ajaxErrorAction(e);
-    }
-  });
-}
 
 function getActivityCaseViewModal(caseKey){
   $.ajax({

src/main/resources/templates/counterIntelligence/activityCase/activityCase1EditModal.html

@@ -1,21 +1,32 @@
 <!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:text="${activityCase.caseKey eq null?'사건 등록':'사건 수정'}"></h5>
+  <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="caseKey" th:value="${activityCase.caseKey}">
+    <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="status" id="status" th:value="${activityCase.status}">
+    <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}">
@@ -31,34 +42,13 @@
       </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(activityCase.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
+        <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="receiptNum" class="col-sm-1 col-form-label col-form-label-sm text-center">접수번호</label>
+      <label for="title" 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}">
-      </div>
-      <label for="receiptDt" 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="receiptDt" name="receiptDt" th:value="${#temporals.format(activityCase.receiptDt, 'yyyy-MM-dd')}" readonly>
-      </div>
-      <div class="col-sm-3"></div>
-      <label for="resultDt" 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="resultDt" name="resultDt" th:value="${#temporals.format(activityCase.resultDt, 'yyyy-MM-dd')}" readonly>
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="receiptClue" 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="receiptClue" name="receiptClue" th:value="${activityCase.receiptClue}">
+        <input type="text" class="form-control form-control-sm" id="title" name="title" th:value="${activityCaseInfo.title}">
-      </div>
-    </div>
-    <div class="row mb-1 justify-content-center">
-      <label for="caseInfo" 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="caseInfo" name="caseInfo"></textarea>
       </div>
     </div>
     <div class="row mb-1">
@@ -77,33 +67,26 @@
       </div>
     </div>
     <div class="row mb-1">
-      <label for="officerAddBtn" class="col-sm-1 col-form-label col-form-label-sm text-center">
+      <label for="caseProgress" class="col-sm-1 col-form-label col-form-label-sm text-center">외사활동 사항</label>
-        담당관
-        <button type="button" class="border-0 bg-white" id="officerAddBtn">
-          <i class="bi bi-plus-square text-primary"></i>
-        </button>
-      </label>
       <div class="col-sm-11">
-        <div class="border h-100" id="officerHome">
+        <textarea class="form-control form-control-sm" id="caseProgress" name="caseProgress" th:value="${activityCaseInfo.caseProgress}"></textarea>
-          
-        </div>
       </div>
     </div>
     <div class="row mb-1">
-      <label for="etc" class="col-sm-1 col-form-label col-form-label-sm text-center">비고</label>
+      <label for="description" 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="etc" name="etc" th:value="${activityCase.etc}">
+        <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(activityCase.fileList)}">
+          <th:block th:if="${#arrays.isEmpty(activityCaseInfo.fileList)}">
             <br>클릭 & 드레그로 파일을 업로드 해주세요.
           </th:block>
-          <th:block th:unless="${#arrays.isEmpty(activityCase.fileList)}">
+          <th:block th:unless="${#arrays.isEmpty(activityCaseInfo.fileList)}">
-            <div class='row-col-6' th:each="file:${activityCase.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>
@@ -115,10 +98,10 @@
   </form>
 </div>
 <div class="modal-footer bg-light">
-  <th:block th:if="${activityCase.caseKey ne null and accessAuth eq 'ACC003'}">
+  <th:block th:if="${activityCaseInfo.caseKey ne null and accessAuth eq 'ACC003'}">
-    <button type="button" class="btn btn-danger" id="deleteActivityCaseBtn" th:data-casekey="${activityCase.caseKey}">삭제</button>
+    <button type="button" class="btn btn-danger" id="deleteActivityCaseBtn" th:data-casekey="${activityCaseInfo.caseKey}">삭제</button>
   </th:block>
-  <button type="button" class="btn btn-warning" id="saveTempBtn" data-status="DST001">임시저장</button>
+  <button type="button" class="btn btn-warning saveBtn" data-status="DST001">임시저장</button>
-  <button type="button" class="btn btn-primary" id="saveActivityCaseBtn" data-status="DST007">저장</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>

src/main/resources/templates/counterIntelligence/activityCase/activityCase2EditModal.html

@@ -0,0 +1,110 @@
+<!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>

src/main/resources/templates/counterIntelligence/activityCase/activityCase2ViewModal.html

@@ -0,0 +1,118 @@
+<!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>

src/main/resources/templates/counterIntelligence/activityCase/activityCase3EditModal.html

@@ -0,0 +1,110 @@
+<!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>

src/main/resources/templates/counterIntelligence/activityCase/activityCase3ViewModal.html

@@ -0,0 +1,118 @@
+<!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>

src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html

@@ -193,7 +193,7 @@
                   </nav>
                 </div>
                 <div class="col-auto">
-                  <input type="button" class="btn btn-success" value="등록" id="addActivityCaseBtn" th:unless="${accessAuth eq 'ACC001'}">
+                  <input type="button" class="btn btn-success addActivityCaseInfoBtn" value="착수보고서 작성" data-casetype="ACT001" th:unless="${accessAuth eq 'ACC001'}">
                 </div>
               </div>
             </div>

src/main/resources/templates/counterIntelligence/activityCase/officerDiv.html

@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko" xmlns:th="http://www.thymeleaf.org">
-<div class="row my-1 mx-3 officerRow" th:each="officer:${officerList}">
-  <input type="hidden" class="userSeq" th:value="${officer.userSeq}">
-  <input type="hidden" class="ogCd" th:value="${officer.ogCd}">
-  <input type="hidden" class="ofcCd" th:value="${officer.ofcCd}">
-  <input type="hidden" class="titleCd" th:value="${officer.titleCd}">
-  <input type="hidden" class="userNm" th:value="${officer.userNm}">
-  <div class="col-auto">
-    <select class="form-select form-select-sm officerType">
-      <option value="">선택</option>
-      <th:block th:each="code:${acoList}">
-        <option th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
-      </th:block>
-    </select>
-  </div>
-  <div class="col-auto">
-    <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-      <th:block th:if="${commonCode.itemCd eq officer.ogCd}" th:text="${commonCode.itemValue}"></th:block>
-    </th:block>
-    <th:block th:each="commonCode:${session.commonCode.get(officer.ogCd)}">
-      <th:block th:if="${commonCode.itemCd eq officer.ofcCd}" th:text="${commonCode.itemValue}"></th:block>
-    </th:block>
-    <th:block th:each="commonCode:${session.commonCode.get('JT')}">
-      <th:block th:if="${commonCode.itemCd eq officer.titleCd}" th:text="${commonCode.itemValue}"></th:block>
-    </th:block>
-    <th:block th:text="${officer.userNm}"></th:block>
-  </div>
-  <div class="col-auto">
-    <button type="button" class="btn btn-sm btn-outline-danger rowDeleteBtn"><i class="bi bi-x"></i></button>
-  </div>
-</div>
-</html>