사건보고서 작업중.

src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java

@@ -5,6 +5,7 @@ import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.InvestigationBoard;
 import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.InvestigationRelatedReports;
 import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.service.IvsgtService;
 import com.dbnt.faisp.main.userInfo.model.UserInfo;
+import com.dbnt.faisp.util.Utils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
@@ -22,13 +23,15 @@ public class IvsgtController {
   private final AuthMgtService authMgtService;
   private final IvsgtService ivsgtService;
 
-  @GetMapping("/{ivsgtType}")
+  @GetMapping("/arrestReport")
-  public ModelAndView arrest(@AuthenticationPrincipal UserInfo loginUser, @PathVariable("ivsgtType") String ivsgtType, InvestigationBoard investigationBoard) {
+  public ModelAndView arrest(@AuthenticationPrincipal UserInfo loginUser, InvestigationBoard investigationBoard) {
     ModelAndView mav = new ModelAndView("ivsgt/ivsgt");
-    investigationBoard.setIvsgtType(ivsgtType);
+    if(Utils.isEmpty(investigationBoard.getIvsgtType())){
+      investigationBoard.setIvsgtType("IVT001");
+    }
 
     //메뉴권한 확인
-    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/ivsgt/arrest").get(0).getAccessAuth();
+    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/ivsgt/arrestReport").get(0).getAccessAuth();
 
     mav.addObject("accessAuth", accessAuth);
     mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
@@ -64,7 +67,7 @@ public class IvsgtController {
   public ModelAndView ivsgtViewModal(@AuthenticationPrincipal UserInfo loginUser, InvestigationBoard investigationBoard){
     ModelAndView mav = new ModelAndView("ivsgt/ivsgtViewModal");
     investigationBoard = ivsgtService.selectBoardInvestigation(investigationBoard.getIvsgtKey());
-    mav.addObject("boardInvestigation", investigationBoard);
+    mav.addObject("investigation", investigationBoard);
     mav.addObject("userSeq",loginUser.getUserSeq());
     //메뉴권한 확인
     mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/ivsgt/arrest").get(0).getAccessAuth());

src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/InvestigationFile.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @DynamicInsert
 @DynamicUpdate
-@Table(name = "ivsgt_file")
+@Table(name = "investigation_file")
 @IdClass(InvestigationFile.InvestigationFileId.class)
 public class InvestigationFile extends FileInfo {
     @Id

src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/IvsgtService.java

@@ -54,7 +54,7 @@ public class IvsgtService extends BaseService {
     if(deleteFileSeq != null && deleteFileSeq.size()>0){
       deletIvsgtFile(ivsgtKey, deleteFileSeq);
     }
-    if(investigationBoard.getRelatedReportsList().size()>0){
+    if(investigationBoard.getRelatedReportsList() != null && investigationBoard.getRelatedReportsList().size()>0){
       ivsgtRelatedReportsRepository.deleteByParentIvsgtKey(ivsgtKey);
       ivsgtRelatedReportsRepository.saveAll(investigationBoard.getRelatedReportsList());
     }

src/main/resources/mybatisMapper/InvestigationBoardMapper.xml

@@ -98,11 +98,11 @@
   </select>
 
   <select id="selectRelatedReportsList" resultType="InvestigationRelatedReports" parameterType="int">
-        SELECT
+        SELECT a.child_ivsgt_key,
-            a.related_reports_key,
+               a.parent_ivsgt_key,
-            a.child_ivsgt_key,
+               i.ivsgt_type,
-            a.parent_ivsgt_key,
+               i.title,
-            i.content_title
+               i.wrt_dt
         FROM investigation_related_reports a
         INNER JOIN investigation_board i
         ON i.ivsgt_key = a.child_ivsgt_key

src/main/resources/static/js/ivsgt/ivsgt.js

@@ -20,7 +20,7 @@ $(document).on('click', '.tr', function (){
 });
 
 $(document).on('click', '.ivsgtTab', function (){
-  location.href = "/ivsgt/"+ $(this).data("ivsgt-type");
+  location.href = "/ivsgt/arrestReport?ivsgtType="+ $(this).data("ivsgttype");
 });
 
 $(document).on('click', '#relatedReportSearchBtn', function (){
@@ -138,7 +138,7 @@ function saveBoardInvestigation(state){
       $(".text-decoration-line-through").each(function (idx, el){
         formData.append('fileSeq', $(el).attr("data-fileseq"));
       })
-      formData.append('contentMain', CrossEditor.GetBodyValue());
+      formData.append('content', CrossEditor.GetBodyValue());
       $.ajax({
         type : 'POST',
         data : formData,

src/main/resources/templates/ivsgt/ivsgt.html

@@ -15,9 +15,13 @@
     <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <div class="row justify-content-between">
-      <div class="col-auto"><h5><i class="bi bi-square-fill"></i></i> 사건보고서</h5></div>
+      <div class="col-auto"><h5><i class="bi bi-square-fill"></i> 사건보고서</h5></div>
       <div class="col-auto">
-        <p class="mb-0 mt-2" th:text="${#strings.concat('외사수사관리 > 사건보고서 > ', (searchParams.ivsgtType eq 'arrest'?'검거보고서':(searchParams.ivsgtType eq 'proceeding'?'진행보고서':'결과보고서')))}"></p>
+        <th:block th:each="code:${session.commonCode.get('IVT')}">
+          <th:block th:if="${code.itemCd eq searchParams.ivsgtType}">
+            <p class="mb-0 mt-2" th:text="${#strings.concat('외사수사관리 > 사건보고서 > ', code.itemValue)}"></p>
+          </th:block>
+        </th:block>
       </div>
     </div>
     <div class="row mx-0">
@@ -26,25 +30,19 @@
           <div class="row justify-content-start">
             <!-- 탭 메뉴 -->
             <ul class="nav nav-tabs" role="tablist">
-              <li class="nav-item" role="presentation">
+              <th:block th:each="code:${session.commonCode.get('IVT')}">
-                <button class="nav-link ivsgtTab" th:classappend="${searchParams.ivsgtType eq 'arrest'?' active':''}" id="arrest-tab"
+                <li class="nav-item" role="presentation">
-                        data-bs-toggle="tab" type="button" role="tab" data-ivsgt-type="arrest">검거보고서</button>
+                  <button class="nav-link ivsgtTab" th:classappend="${searchParams.ivsgtType eq code.itemCd?' active':''}"
-              </li>
+                        data-bs-toggle="tab" type="button" role="tab" th:data-ivsgtType="${code.itemCd}" th:text="${code.itemValue}"></button>
-              <li class="nav-item" role="presentation">
+                </li>
-                <button class="nav-link ivsgtTab" th:classappend="${searchParams.ivsgtType eq 'proceeding'?' active':''}" id="proceeding-tab"
+              </th:block>
-                        data-bs-toggle="tab" type="button" role="tab" data-ivsgt-type="proceeding" >진행보고서</button>
-              </li>
-              <li class="nav-item" role="presentation">
-                <button class="nav-link ivsgtTab" th:classappend="${searchParams.ivsgtType eq 'result'?' active':''}" id="result-tab"
-                        data-bs-toggle="tab" type="button" role="tab" data-ivsgt-type="result">결과보고서</button>
-              </li>
             </ul>
             <!-- 내용 -->
             <div class="tab-content bg-white border border-top-0 p-2">
               <div class="tab-pane fade show active" id="arrest" role="tabpanel" aria-labelledby="arrest-tab">
                 <div class="row">
                   <div class="col-12">
-                    <form method="get" th:action="@{/ivsgt/{ivsgtType}(ivsgtType = ${searchParams.ivsgtType})}">
+                    <form method="get" th:action="@{/ivsgt/arrestReport?ivsgtType=${searchParams.ivsgtType}}">
                       <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
                       <input type="hidden" name="dateSelector" value="wrtDt">
                       <input type="hidden" name="ivsgtType" th:value="${searchParams.ivsgtType}">
@@ -123,6 +121,7 @@
                     <th>범죄테마</th>
                     <th>위반유형</th>
                     <th>제목</th>
+                    <th>첨부파일</th>
                     <th>작성자</th>
                     <th>작성일</th>
                   </tr>
@@ -136,9 +135,18 @@
                         <th:block th:if="${ivsgt.wrtOrgan eq code.itemCd}" th:text="${code.itemValue}"></th:block>
                       </th:block>
                     </td>
-                    <td th:text="${ivsgt.arrestCd}"></td>
+                    <td>
-                    <td th:text="${ivsgt.arrestCd2}"></td>
+                      <th:block th:each="code:${session.commonCode.get('CTH')}">
-                    <td class="titleLeft" th:text="${ivsgt.status == 'Y' ? '[임시저장]' : ''} + ${ivsgt.title}"></td>
+                        <th:block th:if="${code.itemCd eq ivsgt.arrestCd}" th:text="${code.itemValue}"></th:block>
+                      </th:block>
+                    </td>
+                    <td>
+                      <th:block th:each="code:${session.commonCode.get(ivsgt.arrestCd)}">
+                        <th:block th:if="${code.itemCd eq ivsgt.arrestCd2}" th:text="${code.itemValue}"></th:block>
+                      </th:block>
+                    </td>
+                    <td class="titleLeft" th:text="${ivsgt.status eq 'DST001' ? '[임시저장]' : ''} + ${ivsgt.title}"></td>
+                    <td th:text="${ivsgt.fileCnt eq null?'없음':ivsgt.fileCnt+'건'}"></td>
                     <td th:text="${ivsgt.wrtUserNm}"></td>
                     <td th:text="${#temporals.format(ivsgt.wrtDt, 'yyyy-MM-dd')}"></td>
                   </tr>
@@ -197,6 +205,13 @@
       <div class="modal-dialog modal-xl modal-dialog-scrollable">
         <div class="modal-content" id="ivsgtViewBody">
 
+        </div>
+      </div>
+    </div>
+    <div class="modal fade" id="searchViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="searchViewModalLabel" aria-hidden="true">
+      <div class="modal-dialog modal-s modal-dialog-scrollable">
+        <div class="modal-content" id="searchViewBody">
+
         </div>
       </div>
     </div>

src/main/resources/templates/ivsgt/ivsgtEditModal.html

@@ -80,9 +80,9 @@
       </div>
     </div>
     <div class="row mb-1">
-      <label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">사건개요</label>
+      <label for="summaryInfo" class="col-sm-1 col-form-label col-form-label-sm text-center">사건개요</label>
-      <div class="col-sm-11" id="contentInfoDiv">
+      <div class="col-sm-11">
-        <textarea class="form-control form-control-sm" name='summaryInfo' th:text="${investigation.summaryInfo}"></textarea>
+        <textarea class="form-control form-control-sm" id="summaryInfo" name='summaryInfo' th:text="${investigation.summaryInfo}"></textarea>
       </div>
     </div>
     <div class="row mb-1">
@@ -133,7 +133,7 @@
         </div>
       </div>
       <div class="row">
-        <label for="relatedReportDiv" class="col-sm-1 col-form-label col-form-label-sm text-center"></label>
+        <label for="relatedReportDiv" class="col-sm-1 col-form-label col-form-label-sm text-center border-0 bg-white"></label>
         <div class="col-sm-11 row mb-1" id="relatedReportSearchDiv">
           <th:block th:each="relatedReports:${investigation.relatedReportsList}">
             <div class="col-auto">
@@ -148,14 +148,6 @@
           </th:block>
         </div>
       </div>
-
-      <div class="modal fade" id="searchViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="searchViewModalLabel" aria-hidden="true" style="background-color: var(--bs-border-color-translucent);">
-        <div class="modal-dialog modal-s modal-dialog-scrollable">
-          <div class="modal-content" id="searchViewBody">
-
-          </div>
-        </div>
-      </div>
     </th:block>
   </form>
 </div>

src/main/resources/templates/ivsgt/ivsgtViewModal.html

@@ -2,26 +2,26 @@
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
   <div class="modal-header bg-dark">
     <h5 class="modal-title text-white" id="ivsgtViewModalLabel">
-    <th:block th:if="${investigationBoard.ivsgtType eq 'arrest'}">
+    <th:block th:if="${investigation.ivsgtType eq 'arrest'}">
       검거보고서
     </th:block>
-    <th:block th:if="${investigationBoard.ivsgtType eq 'proceeding'}">
+    <th:block th:if="${investigation.ivsgtType eq 'proceeding'}">
       진행보고서
     </th:block>
-    <th:block th:if="${investigationBoard.ivsgtType eq 'result'}">
+    <th:block th:if="${investigation.ivsgtType eq 'result'}">
       결과보고서
     </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="ivsgtViewBody">
-    <input type="hidden" name="ivsgtKey" th:value="${investigationBoard.ivsgtKey}">
+    <input type="hidden" name="ivsgtKey" th:value="${investigation.ivsgtKey}">
     <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(investigationBoard.fileList)>0}">
+      <li class="nav-item" role="presentation" th:if="${#lists.size(investigation.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(investigationBoard.fileList), ')')}"></button>
+        <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(investigation.fileList), ')')}"></button>
       </li>
     </ul>
     <div class="tab-content bg-white border border-top-0 p-2">
@@ -30,41 +30,41 @@
           <label class="col-sm-1 col-form-label col-form-label-sm text-center">범죄테마</label>
           <label class="col-sm-2 col-form-label col-form-label-sm text-start">
             <th:block th:each="code:${session.commonCode.get('CTH')}">
-              <th:block th:if="${code.itemCd eq investigationBoard.arrestType.arrestCd}" th:text="${code.itemValue}"></th:block>
+              <th:block th:if="${code.itemCd eq investigation.arrestCd}" th:text="${code.itemValue}"></th:block>
             </th:block>
           </label>
           <label class="col-sm-1 col-form-label col-form-label-sm text-center">위반유형</label>
           <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-            <th:block th:each="code:${session.commonCode.get(investigationBoard.arrestType.arrestCd)}">
+            <th:block th:each="code:${session.commonCode.get(investigation.arrestCd)}">
-              <th:block th:if="${code.itemCd eq investigationBoard.arrestType.arrestCd2}" th:text="${code.itemValue}"></th:block>
+              <th:block th:if="${code.itemCd eq investigation.arrestCd2}" th:text="${code.itemValue}"></th:block>
             </th:block>
           </label>
           <div class="col-sm-3"></div>
           <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
-          <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(investigationBoard.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
+          <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(investigation.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
           <label class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
-          <label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="${investigationBoard.contentTitle}"></label>
+          <label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="${investigation.title}"></label>
           <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
-          <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${investigationBoard.wrtNm}"></label>
+          <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${investigation.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">사건개요</label>
           <div class="col-sm-11 form-control-sm">
-            <div class="form-control-sm" th:text="${investigationBoard.contentInfo}"></div>
+            <div class="form-control-sm" th:text="${investigation.summaryInfo}"></div>
           </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">주요내용</label>
           <div class="col-sm-11 form-control-sm">
-            <div class="form-control-sm" th:utext="${investigationBoard.contentMain}"></div>
+            <div class="form-control-sm" th:utext="${investigation.content}"></div>
           </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">해시태그</label>
-          <label class="col-sm-11 col-form-label col-form-label-sm text-start" th:text="${investigationBoard.hashTags}"></label>
+          <label class="col-sm-11 col-form-label col-form-label-sm text-start" th:text="${investigation.hashTags}"></label>
         </div>
       </div>
       <div class="tab-pane fade p-2" id="fileTabPanel" role="tabpanel" tabindex="0">
@@ -76,13 +76,13 @@
           </tr>
           </thead>
           <tbody>
-          <th:block th:if="${#lists.isEmpty(investigationBoard.fileList)}">
+          <th:block th:if="${#lists.isEmpty(investigation.fileList)}">
             <tr>
               <td colspan="2">파일이 없습니다.</td>
             </tr>
           </th:block>
-          <th:block th:unless="${#lists.isEmpty(investigationBoard.fileList)}">
+          <th:block th:unless="${#lists.isEmpty(investigation.fileList)}">
-            <th:block th:each="file:${investigationBoard.fileList}">
+            <th:block th:each="file:${investigation.fileList}">
               <tr class="fileInfoTr">
                 <td><a href="#" class="fileDownLink" data-board="ivsgt"
                        th:data-parentkey="${file.ivsgtKey}" th:data-fileseq="${file.fileSeq}" th:text="|${file.origNm}.${file.fileExtn}|"></a></td>
@@ -93,7 +93,7 @@
           </tbody>
         </table>
       </div>
-      <th:block th:if="${investigationBoard.ivsgtType eq 'proceeding' or investigationBoard.ivsgtType eq 'result'}">
+      <th:block th:if="${investigation.ivsgtType eq 'proceeding' or investigation.ivsgtType eq 'result'}">
         <div class="p-2 row mb-3">
           <label class="col-sm-1 col-form-label col-form-label-sm text-center">연관보고서</label>
           <div class="col-sm-11" id="relatedReportDiv">
@@ -109,7 +109,7 @@
 
   </div>
   <div class="modal-footer bg-light">
-    <th:block th:if="${userSeq eq investigationBoard.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
+    <th:block th:if="${userSeq eq investigation.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
       <button type="button" class="btn btn-warning" id="ivsgtEditBtn">수정</button>
     </th:block>
 <!--    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->