From 4fa01c23b7c1beb3b6e5267496254290834b8f5b Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Mon, 12 Jul 2021 01:18:11 +0000
Subject: [PATCH] =?UTF-8?q?=EA=B3=84=EC=82=B0=EC=84=9C=EC=9A=94=EC=B2=AD:?=
 =?UTF-8?q?=20"=EA=B2=80=EC=83=89=20=EC=A1=B0=EA=B1=B4=20=EC=A4=91=20?=
 =?UTF-8?q?=EC=8B=A0=EC=B2=AD=EC=9D=BC=20=EC=95=84=EB=9E=98=EC=97=90=20?=
 =?UTF-8?q?=EB=B0=9C=ED=96=89=EC=9D=BC=20=EA=B2=80=EC=83=89=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20=EA=B8=B0=EB=B3=B8=EA=B0=92=20:=20null"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/Controllers/croomController.cs | 2 ++
 BO/Views/croom/tax.cshtml         | 6 ++++++
 Dao/MyBatis/Maps/CRoom.xml        | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index d2c8754..b793792 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -765,6 +765,8 @@ namespace NP.BO.Controllers
             ht.Add("etaxdatereq", string.IsNullOrEmpty(vm.stringval7) ? null : (vm.stringval7 + " 23:59:59"));
             ht.Add("cdts", vm.stringval);
             ht.Add("cdte", string.IsNullOrEmpty(vm.stringval2) ? null : (vm.stringval2 + " 23:59:59"));
+            ht.Add("staxdate", vm.stringval8);
+            ht.Add("etaxdate", string.IsNullOrEmpty(vm.stringval9) ? null : (vm.stringval9 + " 23:59:59"));
             if (!string.IsNullOrEmpty(vm.stringval3))
             {
                 if(vm.stringval3 == "2")
diff --git a/BO/Views/croom/tax.cshtml b/BO/Views/croom/tax.cshtml
index c71dd29..87c722a 100644
--- a/BO/Views/croom/tax.cshtml
+++ b/BO/Views/croom/tax.cshtml
@@ -31,6 +31,12 @@
                                 @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval) ? (DateTime?)null : Convert.ToDateTime(Model.stringval), new ViewDataDictionary { { "name", "stringval" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval2) ? (DateTime?)null : Convert.ToDateTime(Model.stringval2), new ViewDataDictionary { { "name", "stringval2" } })
                             </td>
                         </tr>
+                        <tr>
+                            <th>발행일</th>
+                            <td class="text-left">
+                                @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval8) ? (DateTime?)null : Convert.ToDateTime(Model.stringval8), new ViewDataDictionary { { "name", "stringval8" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval9) ? (DateTime?)null : Convert.ToDateTime(Model.stringval9), new ViewDataDictionary { { "name", "stringval9" } })
+                            </td>
+                        </tr>
                         <tr>
                             <th>검색어</th>
                             <td class="text-left">
diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 2d92f51..e5a3d50 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -1281,6 +1281,8 @@
                 </isNotNull>
                 <isNotNull property="staxdatereq" prepend="and">a.taxdatereq &gt;= #staxdatereq#</isNotNull>
                 <isNotNull property="etaxdatereq" prepend="and">a.taxdatereq &lt;= #etaxdatereq#</isNotNull>
+                <isNotNull property="staxdate" prepend="and">a.taxdate &gt;= #staxdate#</isNotNull>
+                <isNotNull property="etaxdate" prepend="and">a.taxdate &lt;= #etaxdate#</isNotNull>
             </dynamic>
             group by a.taxno
             ) a