From 423c7ddc1fb897f930d4545576dc5b416974002c 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: Thu, 19 Oct 2023 15:07:10 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=ED=86=B5=EA=B3=84=20?=
 =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=8B=A4=EC=A0=81=20=EA=B2=B0=EC=A0=9C?=
 =?UTF-8?q?=EC=B2=98=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/fpiMgt/statistics/model/TypeStatistics.java   |  2 ++
 .../resources/mybatisMapper/AffairStatisticsMapper.xml |  3 +++
 .../fpiMgt/statistics/affairStatistics.html            | 10 +++++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/statistics/model/TypeStatistics.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/statistics/model/TypeStatistics.java
index c7f7cc4b..c1e71f0c 100644
--- a/src/main/java/com/dbnt/faisp/main/fpiMgt/statistics/model/TypeStatistics.java
+++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/statistics/model/TypeStatistics.java
@@ -26,6 +26,8 @@ public class TypeStatistics extends BaseModel {
   @Transient
   private String userNm;
   @Transient
+  private String reportOrgan;
+  @Transient
   private List<String> organList;
   @Transient
   private List<String> rating;
diff --git a/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml b/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml
index 23d31e06..c717b7f9 100644
--- a/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml
+++ b/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml
@@ -542,6 +542,9 @@
       <if test='endDate != null and endDate != ""'>
         and aa.wrt_dt &lt;= #{endDate}::date+1
       </if>
+			<if test='reportOrgan != null and reportOrgan != ""'>
+				and aa.doc_no like '%'||#{reportOrgan}||'%'
+			</if>
       <if test='rating != null'>
         and ab.affair_rate in
         <foreach collection="rating" item="item" index="index" separator="," open="(" close=")">
diff --git a/src/main/resources/templates/igActivities/fpiMgt/statistics/affairStatistics.html b/src/main/resources/templates/igActivities/fpiMgt/statistics/affairStatistics.html
index c61af8ec..774f664f 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/statistics/affairStatistics.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/statistics/affairStatistics.html
@@ -34,7 +34,15 @@
                     </div>
                   </div>
                   <div class="col-auto">
-                    <input type="text" class="form-control form-control-sm" name="userNm" placeholder="보고자명" autocomplete="off">
+                    <input type="text" class="form-control form-control-sm" name="userNm" placeholder="보고자명" autocomplete="off" th:value="${searchParams.userNm}">
+                  </div>
+                  <div class="col-auto">
+                    <select class="form-select form-select-sm" name="reportOrgan">
+                      <option value="">결제처</option>
+                      <th:block th:each="code:${session.commonCode.get('OG')}">
+                        <option th:value="${code.itemValue}" th:text="${code.itemValue}" th:selected="${code.itemValue eq searchParams.reportOrgan}"></option>
+                      </th:block>
+                    </select>
                   </div>
                   <div class="col-auto">
                     <label><input name="sangbo" type="checkbox" value="OGC003">경찰서상보</label>