From c003fef7a6e95b9b13a4ba4ddb227d2c5068bf9a 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: Fri, 10 Mar 2023 11:27:43 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=ED=99=9C=EB=8F=99=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.=20=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EB=B3=B4=EC=B6=A9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ActivityCaseService.java          |  4 +-
 .../mybatisMapper/ActivityCaseMapper.xml      | 60 +++++++++++++------
 .../js/counterIntelligence/activityCase.js    | 13 +++-
 .../activityCase/activityCaseBoard.html       | 13 ++--
 .../activityCase/activityCaseEditModal.html   |  2 +-
 5 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java
index e9c1b3a3..69eb8dd3 100644
--- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java
+++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/activityCase/service/ActivityCaseService.java
@@ -72,7 +72,9 @@ public class ActivityCaseService extends BaseService {
     activityCaseInfo.setReceiptKey(receiptKey);
     activityCaseInfo.setWrtDt(LocalDateTime.now());
     Integer caseKey = aciRepository.save(activityCaseInfo).getCaseKey();
-    deleteActivityCaseFile(caseKey, deleteFileSeq);
+    if(deleteFileSeq != null && deleteFileSeq.size()>0){
+      deleteActivityCaseFile(caseKey, deleteFileSeq);
+    }
     if(activityCaseInfo.getMultipartFileList()!=null && activityCaseInfo.getMultipartFileList().size()>0){
       saveUploadFiles(caseKey, activityCaseInfo.getMultipartFileList());
     }
diff --git a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml
index c56f881b..6fd46929 100644
--- a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml
+++ b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml
@@ -9,10 +9,10 @@
       <if test='wrtUserSeq != null and wrtUserSeq != 0'>
         and (a.wrt_user_seq = #{wrtUserSeq}
           or a.receipt_key in (select a.receipt_key
-                              from activity_case_info a
-                                inner join activity_case_apprv b
-                                  on a.case_key = b.case_key
-                              where b.user_seq = #{wrtUserSeq}))
+                               from activity_case_info a
+                                 inner join activity_case_apprv b
+                                   on a.case_key = b.case_key
+                               where b.user_seq = #{wrtUserSeq}))
       </if>
       <if test='receiptKey != null and receiptKey != ""'>
         and a.receipt_key = #{receiptKey}
@@ -20,24 +20,46 @@
       <if test='receiptNum != null and receiptNum != ""'>
         and a.receipt_num like '%'||#{receiptNum}||'%'
       </if>
+      <if test='caseNum != null and caseNum != ""'>
+        and a.receipt_key in (select receipt_key
+                              from activity_case_info
+                              where case_num like '%'||#{caseNum}||'%')
+      </if>
+      <if test='title != null and title != ""'>
+        and a.receipt_key in (select receipt_key
+                              from activity_case_info
+                              where title like '%'||#{title}||'%')
+      </if>
+      <if test='suspectNm != null and suspectNm != ""'>
+        and a.receipt_key in (select receipt_key
+                              from activity_case_suspect
+                              where name like '%'||#{suspectNm}||'%')
+      </if>
       <if test='wrtUserNm != null and wrtUserNm != ""'>
         and a.wrt_user_nm like '%'||#{wrtUserNm}||'%'
       </if>
-      <if test='dateSelector == "reportDate"'>
-        <if test='startDate != null and startDate != ""'>
-          and c.report_date >= #{startDate}::date
-        </if>
-        <if test='endDate != null and endDate != ""'>
-          and c.report_date &lt;= #{endDate}::date+1
-        </if>
-      </if>
-      <if test='dateSelector == "wrtDt"'>
-        <if test='startDate != null and startDate != ""'>
-          and c.wrt_dt >= #{startDate}::date
-        </if>
-        <if test='endDate != null and endDate != ""'>
-          and c.wrt_dt &lt;= #{endDate}::date+1
-        </if>
+      <if test='(startDate != null and startDate != "") or (endDate != null and endDate != "")'>
+        and a.receipt_key in (select receipt_key
+                            from activity_case_info
+                            <where>
+                              <if test='dateSelector == "wrtDt"'>
+                                <if test='startDate != null and startDate != ""'>
+                                  and wrt_dt >= #{startDate}::date
+                                </if>
+                                <if test='endDate != null and endDate != ""'>
+                                  and wrt_dt &lt;= #{endDate}::date
+                                </if>
+                              </if>
+                              <if test='dateSelector == "reportDate"'>
+                                <if test='startDate != null and startDate != ""'>
+                                  and report_date >= #{startDate}::date
+                                </if>
+                                <if test='endDate != null and endDate != ""'>
+                                  and report_date &lt;= #{endDate}::date
+                                </if>
+                              </if>
+                            </where>
+                            )
       </if>
       <if test='wrtOrgan != null and wrtOrgan != ""'>
         and a.wrt_organ = #{wrtOrgan}
diff --git a/src/main/resources/static/js/counterIntelligence/activityCase.js b/src/main/resources/static/js/counterIntelligence/activityCase.js
index 3804fb43..9f8012db 100644
--- a/src/main/resources/static/js/counterIntelligence/activityCase.js
+++ b/src/main/resources/static/js/counterIntelligence/activityCase.js
@@ -1,5 +1,11 @@
 let selectedList= [];
-
+$(function(){
+  $("#dateSelectorDiv").datepicker({
+    format: "yyyy-mm-dd",
+    language: "ko",
+    autoclose: true
+  });
+})
 $(document).on('click', '.addActivityCaseInfoBtn', function (){
   getActivityCaseEditModal(null, null, $(this).attr('data-casetype'));
 })
@@ -78,7 +84,8 @@ function getActivityCaseEditModal(receiptKey, caseKey, caseType){
       $(".dateSelector").datepicker({
         format: "yyyy-mm-dd",
         language: "ko",
-        autoclose: true
+        autoclose: true,
+        endDate: "now"
       });
       setEditor('editor', '470');
       setUploadDiv();
@@ -186,7 +193,7 @@ function saveActivityCase(status){
         formData.append('suspectList['+idx+'].sex', $(el).find(".suspectSex").val());
         formData.append('suspectList['+idx+'].birthDate', $(el).find(".suspectBirthDate").val());
         formData.append('suspectList['+idx+'].phone', $(el).find(".suspectPhone").val());
-        formData.append('suspectList['+idx+'].addr', $(el).find(".suspectAddr").val());
+        formData.append('suspectList['+idx+'].address', $(el).find(".suspectAddr").val());
         formData.append('suspectList['+idx+'].job', $(el).find(".suspectJob").val());
         formData.append('suspectList['+idx+'].area', $(el).find(".suspectArea").val());
         formData.append('suspectList['+idx+'].etc', $(el).find(".suspectEtc").val());
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html
index 805c66c2..9bed1bc8 100644
--- a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html
+++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseBoard.html
@@ -72,19 +72,24 @@
                         </select>
                       </div>-->
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="제목" name="title">
+                        <input type="text" class="form-control form-control-sm" placeholder="접수번호" name="receiptNum" th:value="${searchParams.receiptNum}">
+                      </div>
+                      <div class="col-2">
+                        <input type="text" class="form-control form-control-sm" placeholder="문서번호" name="caseNum" th:value="${searchParams.caseNum}">
+                      </div>
+                      <div class="col-2">
+                        <input type="text" class="form-control form-control-sm" placeholder="혐의자" name="suspectNm" th:value="${searchParams.suspectNm}">
                       </div>
                     </div>
                     <div class="row justify-content-end">
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="작성자" name="wrtUserNm" th:value="${searchParams.wrtUserNm}">
+                        <input type="text" class="form-control form-control-sm" placeholder="제목" name="title" th:value="${searchParams.title}">
                       </div>
                       <div class="col-4">
                         <div class="input-group input-daterange" id="dateSelectorDiv">
                           <select class="form-select form-select-sm w-30" name="dateSelector">
                             <option value="wrtDt" th:selected="${searchParams.dateSelector eq 'wrtDt'}">작성일</option>
-                            <option value="workStartDate" th:selected="${searchParams.dateSelector eq 'receiptDt'}">접수일</option>
-                            <option value="workEndDate" th:selected="${searchParams.dateSelector eq 'resultDt'}">종결일</option>
+                            <option value="reportDate" th:selected="${searchParams.dateSelector eq 'reportDate'}">보고일</option>
                           </select>
                           <input type="text" class="form-control form-control-sm w-35" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
                           <input type="text" class="form-control form-control-sm w-35" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseEditModal.html b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseEditModal.html
index 9c3c327d..53c1d584 100644
--- a/src/main/resources/templates/counterIntelligence/activityCase/activityCaseEditModal.html
+++ b/src/main/resources/templates/counterIntelligence/activityCase/activityCaseEditModal.html
@@ -214,7 +214,7 @@
                         <select class="form-select form-select-sm apprvType">
                           <option value="">선택</option>
                           <th:block th:each="code:${session.commonCode.get('ACAT')}">
-                            <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}"></option>
+                            <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:selected="${code.itemCd eq user.apprvType}" th:text="${code.itemValue}"></option>
                           </th:block>
                         </select>
                       </div>