From a1170fa22f4a1bf0308976c3fe69e1ef033faf66 Mon Sep 17 00:00:00 2001
From: TaehunPark <qkrxogns21@gmail.com>
Date: Thu, 19 Jan 2023 13:04:46 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=B2=A9=EB=B3=B4=EC=88=98=EC=A7=91?=
 =?UTF-8?q?=ED=99=9C=EB=8F=99=20=EC=99=B8=EC=82=AC=EC=B2=A9=EB=B3=B4?=
 =?UTF-8?q?=EB=A7=9D=20=EA=B2=AC=EB=AC=B8=EA=B4=80=EB=A6=AC=20=EC=9A=B4?=
 =?UTF-8?q?=EC=98=81=EC=8B=A4=EC=A0=81=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IntelligenceNetworkMapper.xml             | 18 ++++++++++---
 .../IntelligenceAnalyzeList.html              | 25 +++++++------------
 .../intelligenceAnalyzeEditModal.html         |  6 ++---
 .../intelligenceAnalyzeViewModal.html         | 10 +++++---
 .../operationPlanList.html                    |  4 +--
 5 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml
index cb78929f..c771d9f1 100644
--- a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml
+++ b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml
@@ -134,11 +134,21 @@
       <if test='iaState != null and iaState != ""'>
         and ia_state = #{iaState}
       </if>
-      <if test='startDate != null and startDate != ""'>
-        and wrt_dt >= #{startDate}::date
+      <if test='dateSelector == "iaDt"'>
+        <if test='startDate != null and startDate != ""'>
+          and ia_sdate >= #{startDate}::date
+        </if>
+        <if test='endDate != null and endDate != ""'>
+          and ia_edate &lt;= #{endDate}::date
+        </if>
       </if>
-      <if test='endDate != null and endDate != ""'>
-        and wrt_dt &lt;= #{endDate}::date+1
+      <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+1
+        </if>
       </if>
       <if test="downOrganCdList != null">
         and wrt_organ in
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/IntelligenceAnalyzeList.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/IntelligenceAnalyzeList.html
index 64d46367..aa7ce149 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/IntelligenceAnalyzeList.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/IntelligenceAnalyzeList.html
@@ -28,7 +28,7 @@
             </li>
           </ul>
           <div class="tab-content bg-white border border-top-0 p-2" id="planContent">
-            <!-- <form method="get" th:action="${searchUrl}">
+            <form method="get" th:action="${searchUrl}">
               <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
               <div class="row justify-content-between py-1">
                 <div class="col-auto">
@@ -41,8 +41,8 @@
                 <div class="col-8">
                   <div class="row">
                     <div class="col-11">
-                      <div class="row justify-content-end pb-1" th:if="${accessAuth eq 'ACC003'}">
-                        <div class="col-2">
+                      <div class="row justify-content-end pb-1">
+                        <div class="col-2" th:if="${accessAuth eq 'ACC003'}">
                           <select class="form-select form-select-sm" name="wrtOrgan">
                             <option value="">관서 선택</option>
                             <th:block th:each="commonCode:${session.commonCode.get('OG')}">
@@ -52,20 +52,13 @@
                             </th:block>
                           </select>
                         </div>
-                        <div class="col-2">
-                          <input type="text" class="form-control form-control-sm" placeholder="협력자 성명" name="opName" th:value="${searchParams.opName}">
-                        </div>
-                        <div class="col-2">
-                          <select class="form-select form-select-sm" name="opState">
-                            <option value="">상태 선택</option>
-                            <th:block th:each="commonCode:${session.commonCode.get('DST')}">
-                              <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.opState}"></option>
-                            </th:block>
-                          </select>
-                        </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="">조건선택</option>
+                              <option value="iaDt" th:selected="${searchParams.dateSelector eq 'iaDt'}">실적기간</option>
+                              <option value="wrtDt" th:selected="${searchParams.dateSelector eq 'wrtDt'}">등록일</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}">
                           </div>
@@ -78,7 +71,7 @@
                   </div>
                 </div>
               </div>
-            </form> -->
+            </form>
             <div class="row justify-content-start">
               <div class="col-12">
                 <table class="table table-sm table-bordered table-hover">
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal.html
index 4c2663e5..c91d04d5 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
 <div class="modal-header bg-dark">
-  <h5 class="modal-title text-white" id="affairEditModalLabel" th:text="${ia.iaKey eq null?'운영 계획서 작성':'운영 계획서 수정'}"></h5>
+  <h5 class="modal-title text-white" id="affairEditModalLabel" th:text="${ia.iaKey eq null?'분석평가서 작성':'분석 평가서 수정'}"></h5>
   <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 <div class="modal-body" id="affairEditBody">
@@ -26,9 +26,9 @@
       <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm" placeholder="작성자 자동입력" readonly>
       </div>
-      <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label>
+      <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" placeholder="작성일 자동입력" readonly>
+        <input type="text" class="form-control form-control-sm" placeholder="등록일 자동입력" readonly>
       </div>
     </div>
     <hr>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html
index d1bc9bd4..bf4d16ca 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
 <div class="modal-header bg-dark">
-  <h5 class="modal-title text-white" id="affairViewModalLabel">운영 실적 열람</h5>
+  <h5 class="modal-title text-white" id="affairViewModalLabel">분석평가서 열람</h5>
   <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 <div class="modal-body">
@@ -16,16 +16,18 @@
       <div class="row mb-1">
         <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="|${ia.wrtUserGrd} ${ia.wrtUserNm}|"></label>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</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="${#temporals.format(ia.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-2 col-form-label col-form-label-sm text-start" th:text="${ia.iaState}"></label>
+        <th:block th:each="commonCode:${session.commonCode.get('DST')}">
+        	<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${commonCode.itemCd eq ia.iaState}" th:text="${commonCode.itemValue}"></label>
+        </th:block>
       </div>
       <hr>
       <div class="row mb-1">
 	    <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="|${ia.iaSdate} ~ ${ia.iaEdate}|"></label>
-	</div>
+	  </div>
       <div class="row mb-1">
       	<div class="row justify-content-start text-center">
                 <table class="table table-sm table-bordered table-hover">
diff --git a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html
index 4eaeea42..1f55902c 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanList.html
@@ -41,8 +41,8 @@
                 <div class="col-8">
                   <div class="row">
                     <div class="col-11">
-                      <div class="row justify-content-end pb-1" th:if="${accessAuth eq 'ACC003'}">
-                        <!-- <div class="col-2">
+                      <div class="row justify-content-end pb-1">
+                        <!-- <div class="col-2" th:if="${accessAuth eq 'ACC003'}">
                           <select class="form-select form-select-sm" name="wrtOrgan">
                             <option value="">관서 선택</option>
                             <th:block th:each="commonCode:${session.commonCode.get('OG')}">