From b1c8e7386eb4d8f6ab73a436f036299b317513f1 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:25:23 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=ED=86=B5=EA=B3=84=20?=
 =?UTF-8?q?=EB=B6=84=EC=95=BC=EB=B3=84,=20=ED=8F=89=EA=B0=80=EB=B3=84=20?=
 =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatisMapper/AffairStatisticsMapper.xml  | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml b/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml
index c717b7f9..1e8a4e01 100644
--- a/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml
+++ b/src/main/resources/mybatisMapper/AffairStatisticsMapper.xml
@@ -15,6 +15,9 @@
       <if test='endDate != null and endDate != ""'>
         and wrt_dt &lt;= #{endDate}::date+1
       </if>
+			<if test='reportOrgan != null and reportOrgan != ""'>
+				and doc_no like '%'||#{reportOrgan}||'%'
+			</if>
       <if test='rating != null and rating != "" or sangbo != null and sangbo != ""'>
         and ab.affair_key in (
           select affair_key
@@ -122,9 +125,9 @@
 		   count(*) as cnt
 		from affair_board ab,
 	     	 affair_rating ar
-	    where ab.affair_key = ar.affair_key
-		and (ar.organ_up != 'T' or ar.organ_up is null)
-		  <if test='userNm != null and userNm != ""'>
+		where ab.affair_key = ar.affair_key
+			and (ar.organ_up != 'T' or ar.organ_up is null)
+		  	<if test='userNm != null and userNm != ""'>
 	        and wrt_user_nm like '%'||#{userNm}||'%'
 	      </if>
 	  	  <if test='startDate != null and startDate != ""'>
@@ -133,12 +136,15 @@
 	      <if test='endDate != null and endDate != ""'>
 	        and wrt_dt &lt;= #{endDate}::date+1
 	      </if>
+				<if test='reportOrgan != null and reportOrgan != ""'>
+					and doc_no like '%'||#{reportOrgan}||'%'
+				</if>
 	      <if test='rating != null and rating != "" or sangbo != null and sangbo != ""'>
-			and ab.affair_key in (
-				select affair_key
-				from affair_rating ar2
-					inner join organ_config oc2
-						on ar2.rating_organ = oc2.organ_cd
+					and ab.affair_key in (
+						select affair_key
+						from affair_rating ar2
+							inner join organ_config oc2
+								on ar2.rating_organ = oc2.organ_cd
 					<where>
 					<if test='rating != null and rating != ""'>
 					and ar2.affair_rate in
@@ -347,6 +353,9 @@
 	    <if test='endDate != null and endDate != ""'>
 	      and wrt_dt &lt;= #{endDate}::date+1
 	    </if>
+			<if test='reportOrgan != null and reportOrgan != ""'>
+				and doc_no like '%'||#{reportOrgan}||'%'
+			</if>
 	    <if test='rating != null and rating != "" or sangbo != null and sangbo != ""'>
 		and ab.affair_key in (
 			select affair_key
@@ -424,8 +433,8 @@
 	from affair_board ab,
 	     affair_rating ar
 	where ab.affair_key = ar.affair_key
-	and (ar.organ_up != 'T' or ar.organ_up is null)
-	<include refid="raitingSearch"></include>
+		and (ar.organ_up != 'T' or ar.organ_up is null)
+		<include refid="raitingSearch"></include>
 	group by ab.wrt_organ) c
 	on a.item_cd = c.wrt_organ
 	order by item_cd asc