From 07cc4ca43d2c7b0b5e6bb4bc6395dbc6296a96a5 Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Thu, 20 May 2021 04:43:32 +0000
Subject: [PATCH] =?UTF-8?q?=20-=20=EC=82=AC=EC=9A=A9=EC=9E=90=EA=B0=80=20?=
 =?UTF-8?q?=ED=98=BC=ED=95=A9=EA=B0=95=EC=A2=8C=20=EC=8B=A0=EC=B2=AD=20?=
 =?UTF-8?q?=EC=8B=9C=20=EC=84=A0=ED=83=9D=ED=95=9C=20=EA=B5=90=EC=9C=A1?=
 =?UTF-8?q?=EC=9D=BC=EC=A0=95=EC=9D=98=20'=EA=B5=90=EC=9C=A1=EC=9E=A5?=
 =?UTF-8?q?=EC=86=8C'=20=EA=B2=80=EC=83=89=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20=20-=20=EA=B0=95=EC=A2=8C=EB=B3=84=20?=
 =?UTF-8?q?=EA=B5=90=EC=9C=A1=EA=B8=B0=EA=B0=84=20=EA=B2=80=EC=83=89=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20(=EA=B8=B0=EA=B0=84?=
 =?UTF-8?q?=EB=B3=84=EC=A1=B0=ED=9A=8C=20=EC=95=84=EB=9E=98=EC=97=90=20?=
 =?UTF-8?q?=EB=8F=99=EC=9D=BC=20ui=20=EC=B6=94=EA=B0=80.=20label=20:=20?=
 =?UTF-8?q?=EA=B5=90=EC=9C=A1=EA=B8=B0=EA=B0=84=EC=A1=B0=ED=9A=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/Controllers/croomController.cs |  9 +++++---
 BO/Views/croom/pay.cshtml         | 37 +++++++++++++++++++++++++++++--
 Dao/MyBatis/Maps/CRoom.xml        | 10 +++++++--
 3 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index 0d77afc..b3143a8 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -628,7 +628,6 @@ namespace NP.BO.Controllers
             }
             ht.Add("cdts", vm.stringval);
             ht.Add("cdte", string.IsNullOrEmpty(vm.stringval2) ? null : (vm.stringval2 + " 23:59:59"));
-
             //ht.Add("pstatusin", vm.stringval3);
             //ht.Add("isrefundcall", string.IsNullOrEmpty(vm.stringval4) ? null : "1");
             //ht.Add("rstatusin", vm.stringval5);
@@ -666,11 +665,15 @@ namespace NP.BO.Controllers
             {
                 ht.Add(vm.stringval15 ?? "usernameiditemname", vm.stringval16);
             }
-            ht.Add("isgroup", vm.stringval17);
+            ht.Add("isgroup", vm.stringval17); 
+            ht.Add("estart", vm.stringval20);
+            ht.Add("eend", string.IsNullOrEmpty(vm.stringval21) ? null : (vm.stringval21 + " 23:59:59"));
+            ht.Add("studyplace", vm.stringval22);
             vm.PayItems = Dao.Get<PayItem>("cr.payitems", ht);
             vm.pagetotalcount = GetCount(vm.PayItems.FirstOrDefault());
             vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "istop", 1 }, { "isdel", 0 }, { "isuse", 1 } });
-            vm.stringval20 = DateTime.Now.AddDays(-6).ToString("yyyy-MM-dd") + ";" +
+            vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace");
+            vm.stringval19 = DateTime.Now.AddDays(-6).ToString("yyyy-MM-dd") + ";" +
                 DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd") + ";" +
                 DateTime.Now.AddMonths(-1).ToString("yyyy-MM-dd") + ";" +
                 DateTime.Now.AddMonths(-2).ToString("yyyy-MM-dd");
diff --git a/BO/Views/croom/pay.cshtml b/BO/Views/croom/pay.cshtml
index 8d088b4..668c2e3 100644
--- a/BO/Views/croom/pay.cshtml
+++ b/BO/Views/croom/pay.cshtml
@@ -16,7 +16,7 @@
                             <col />
                         </colgroup>
                         <tr>
-                            <th>기간별조회</th>
+                            <th>결제일조회</th>
                             <td class="text-left">
                                 <a href="#" style="padding: 6px 12px;" onclick="setdate(1)" class="btn btn-select btn-xxs">오늘</a>
                                 <a href="#" style="padding: 6px 12px;" onclick="setdate(7)" class="btn btn-select btn-xxs">7일</a>
@@ -26,6 +26,17 @@
                                 <a href="#" style="padding: 6px 12px;" onclick="setdate(0)" class="btn btn-select btn-xxs">전체</a>
                                 @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">
+                                <a href="#" style="padding: 6px 12px;" onclick="setdate2(1)" class="btn btn-select btn-xxs">오늘</a>
+                                <a href="#" style="padding: 6px 12px;" onclick="setdate2(7)" class="btn btn-select btn-xxs">7일</a>
+                                <a href="#" style="padding: 6px 12px;" onclick="setdate2(15)" class="btn btn-select btn-xxs">15일</a>
+                                <a href="#" style="padding: 6px 12px;" onclick="setdate2(30)" class="btn btn-select btn-xxs">1개월</a>
+                                <a href="#" style="padding: 6px 12px;" onclick="setdate2(60)" class="btn btn-select btn-xxs">2개월</a>
+                                @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval20) ? (DateTime?)null : Convert.ToDateTime(Model.stringval20), new ViewDataDictionary { { "name", "stringval20" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval21) ? (DateTime?)null : Convert.ToDateTime(Model.stringval21), new ViewDataDictionary { { "name", "stringval21" } })
+                            </td>
                         </tr>
                         <tr>
                             <th>결제상태</th>
@@ -81,6 +92,12 @@
                                 @*<label><input type="checkbox" name="stringval17" value="1" @(Model.stringval17 != null ? "checked" : "") /> 단체결제</label>&nbsp;&nbsp;*@
                             </td>
                         </tr>
+                        <tr>
+                            <th>교육장소</th>
+                            <td class="text-left">                                 
+                                @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "studyplace"), new ViewDataDictionary { { "name", "stringval22" }, { "selected", Model.stringval22 }, { "style", "width: 100%" }, { "df", ":교육장소" } })
+                            </td>
+                        </tr>
                         <tr>
                             <th>검색어</th>
                             <td class="text-left">
@@ -220,7 +237,7 @@
 @section scripts{
     <script>
         var now = '@DateTime.Now.ToString("yyyy-MM-dd")';
-        var ds = '@(Model.stringval20)'.split(';');
+        var ds = '@(Model.stringval19)'.split(';');
         $(document).ready(function () {
             $("#stringval16").on("keydown", function (e) {
                 if (e.keyCode == 13) {
@@ -244,6 +261,22 @@
             }, 300);
             //submit();
         }
+        function setdate2(idx) {
+            switch (idx) {
+                case 1: setv("stringval20", now); setv("stringval21", now); break;
+                case 7: setv("stringval20", ds[0]); setv("stringval21", now); break;
+                case 15: setv("stringval20", ds[1]); setv("stringval21", now); break;
+                case 30: setv("stringval20", ds[2]); setv("stringval21", now); break;
+                case 60: setv("stringval20", ds[3]); setv("stringval21", now); break;
+                default:
+                    setv("stringval20", ""); setv("stringval21", ""); break;
+            }
+            $("#stringval20,#stringval21").css("background-color", "#25313e");
+            setTimeout(function () {
+                $("#stringval20,#stringval21").css("background-color", "#fafafa");
+            }, 300);
+            //submit();
+        }
         function searchthis() {
             setv("stringval3", getcheckv("pstatus"));
             setv("stringval4", $("#chkisrefundcall").prop("checked") ? "1" : "");
diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 28540b1..c62dd15 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -813,7 +813,7 @@
                 <isNotNull property="cname">and (cm2.cname like concat('%',#cname#,'%'))</isNotNull>
                 <isNotNull property="usernameiditemname">and (u.username=#usernameiditemname# or u.userid=#usernameiditemname# or cm.cname like concat('%',#usernameiditemname#,'%') or bk.bkname like concat('%',#usernameiditemname#,'%') or ex.exname like concat('%',#usernameiditemname#,'%') or cm2.cname like concat('%',#usernameiditemname#,'%'))</isNotNull>
                 <isNotNull property="isgroup">and p.isgroup=1</isNotNull>
-                <isNotNull property="isunpay">and p.isunpay=#isunpay#</isNotNull>
+                <isNotNull property="isunpay">and p.isunpay=#isunpay#</isNotNull>               
                 group by p.payno
                 union all
                 select 1 isexamready,a.exno payno,a.userno pi1,a.userno pi2,1 ccount
@@ -853,7 +853,13 @@
             left outer join book bk on a.isexamready=0 and pi.ptype=2 and bk.bkno=pi.itemno
             left outer join exam ex on a.isexamready=0 and ex.exno=pi.itemno
             left outer join examuser exu on exu.exno=ex.exno and exu.userno=p.userno
-            left outer join pplog ppl on ppl.pplno = p.pplno
+            left outer join pplog ppl on ppl.pplno = p.pplno           
+            left outer join cminningscd scd on scd.cmisno = le.cmisno    
+            <dynamic prepend="where">
+               <isNotNull property="estart" prepend="and">scd.estart &gt;= #estart#</isNotNull>
+               <isNotNull property="eend" prepend="and">scd.eend &lt;= #eend#</isNotNull>
+               <isNotNull property="studyplace" prepend="and">scd.studyplace=#studyplace#</isNotNull>
+            </dynamic>
             ) a
             <include refid="sql.pagedynamic"></include>
             order by a.rno