From f44f83b6396408fddfe1f8cb853998f188321317 Mon Sep 17 00:00:00 2001
From: jity7777 <jity7777  @example.com>
Date: Thu, 4 Apr 2024 01:26:49 +0000
Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?=
 =?UTF-8?q?MS=20NO=20:=204579=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=EB=82=B4=EC=9A=A9=20(1)=20=EA=B4=80=EB=A6=AC=EC=9E=90?=
 =?UTF-8?q?=20=EC=88=98=EB=A3=8C=EA=B4=80=EB=A6=AC=20=EC=A1=B0=EA=B1=B4=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EA=B8=B0=ED=83=80=20=EA=B1=B4?=
 =?UTF-8?q?=20=EC=BB=A4=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/Controllers/croomController.cs | 10 ++++++++--
 BO/Views/croom/completions.cshtml |  2 +-
 BO/Views/croom/gradeall.cshtml    |  3 +++
 Dao/MyBatis/Maps/CRoom.xml        |  2 ++
 Dao/MyBatis/Maps/Grade.xml        | 16 ++++++++--------
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index 19d1043..56608ee 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -1410,8 +1410,14 @@ namespace NP.BO.Controllers
             ht.Add("typeman", vm.stringval5);
             ht.Add("studyplace", vm.stringval6);
             ht.Add("typejob", vm.stringval7);
-            ht.Add("scompletetime", vm.stringval8);
-            ht.Add("ecompletetime", vm.stringval9);
+            // 교육기간
+            //ht.Add("scompletetime", vm.stringval8);
+            //ht.Add("ecompletetime", vm.stringval9);
+
+            // 교육종료일
+            ht.Add("edate1", vm.stringval8);
+            ht.Add("edate2", vm.stringval9);
+
             ht.Add("typegrade", vm.stringval10);
             ht.Add("typeedu", vm.stringval11);   
            
diff --git a/BO/Views/croom/completions.cshtml b/BO/Views/croom/completions.cshtml
index c981308..2a1f054 100644
--- a/BO/Views/croom/completions.cshtml
+++ b/BO/Views/croom/completions.cshtml
@@ -63,7 +63,7 @@
                         </td>
                     </tr>
                     <tr>
-                        <th>학습기간</th>
+                        <th>교육종료일</th>
                         <td>
                             <div class="col-md-12">
                                 @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval8) ? (DateTime?)null : Convert.ToDateTime(Model.stringval8), new ViewDataDictionary { { "name", "stringval8" } }) ~
diff --git a/BO/Views/croom/gradeall.cshtml b/BO/Views/croom/gradeall.cshtml
index 025f477..359f26d 100644
--- a/BO/Views/croom/gradeall.cshtml
+++ b/BO/Views/croom/gradeall.cshtml
@@ -142,6 +142,9 @@
     }
     @Html.Partial(callpage, Model)
 
+    <script>
+        let tabpage = "@callpage"
+    </script>
 </form>
 @section styles{
     <style type="text/css">
diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 9825020..d4bddf0 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -1733,6 +1733,8 @@
           <isNotNull property="lectno" prepend="and">l.lectno = #lectno#</isNotNull>
             <isNotNull property="scompletetime" prepend="and">l.completetime &gt;= #scompletetime#</isNotNull>
             <isNotNull property="ecompletetime" prepend="and">l.completetime &lt;= #ecompletetime#</isNotNull>
+          <isNotNull property="edate1" prepend="and">l.edate &gt;= date_format(#edate1#,'%Y-%m-%d 00:00:00')</isNotNull>
+          <isNotNull property="edate2" prepend="and">l.edate &lt;= date_format(#edate2#,'%Y-%m-%d 23:59:59')</isNotNull>
             <isNotNull property="tyear" prepend="and">t.tyear=#tyear#</isNotNull>
             <isNotNull property="cgno" prepend="and">cg.cgno=#cgno#</isNotNull>
             <isNotNull property="pcgno" prepend="and">cg.pcgno=#pcgno#</isNotNull>
diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml
index b4991a9..35187e6 100644
--- a/Dao/MyBatis/Maps/Grade.xml
+++ b/Dao/MyBatis/Maps/Grade.xml
@@ -1062,7 +1062,7 @@
 
         <isNotNull property="iscomplete" prepend="and">ifnull(b.iscomplete,0)=#iscomplete#</isNotNull>
         <isNotNull property="cmisno" prepend="and">b.cmisno = #cmisno#</isNotNull>          <isNotEmpty property="sdateall" prepend="and">(case when a.cshape = 0 and b.isrebate = 0 then p.payoktime else b.sdate end) &gt;= date_format(#sdateall#,'%Y-%m-%d 00:00:00')</isNotEmpty>
-        <isNotEmpty property="edateall" prepend="and">(case when a.cshape = 2 then e.eend else b.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>
+        <!--<isNotEmpty property="edateall" prepend="and">(case when a.cshape = 2 then e.eend else b.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>-->
         <isNotNull property="edate" prepend="and">date_format((case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end),'%Y-%m-%d') = #edate#</isNotNull>
         <isNotNull property="edate1" prepend="and">(case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end) >= #edate1#</isNotNull>
         <isNotNull property="edate2" prepend="and">(case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end) &lt;= #edate2#</isNotNull>
@@ -1102,7 +1102,7 @@
 
         <isNotNull property="iscomplete" prepend="and">ifnull(b.iscomplete,0)=#iscomplete#</isNotNull>
         <isNotNull property="cmisno" prepend="and">b.cmisno = #cmisno#</isNotNull>          <isNotEmpty property="sdateall" prepend="and">(case when a.cshape = 0 and b.isrebate = 0 then p.payoktime else b.sdate end) &gt;= date_format(#sdateall#,'%Y-%m-%d 00:00:00')</isNotEmpty>
-        <isNotEmpty property="edateall" prepend="and">(case when a.cshape = 2 then e.eend else b.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>
+        <!--<isNotEmpty property="edateall" prepend="and">(case when a.cshape = 2 then e.eend else b.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>-->
         <isNotNull property="edate" prepend="and">date_format((case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end),'%Y-%m-%d') = #edate#</isNotNull>
         <isNotNull property="edate1" prepend="and">(case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end) >= #edate1#</isNotNull>
         <isNotNull property="edate2" prepend="and">(case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end) &lt;= #edate2#</isNotNull>
@@ -1143,7 +1143,7 @@
         <isNotNull property="iscomplete" prepend="and">ifnull(b.iscomplete,0)=#iscomplete#</isNotNull>
         <isNotNull property="cmisno" prepend="and">b.cmisno = #cmisno#</isNotNull>          
         <isNotEmpty property="sdateall" prepend="and">(case when a.cshape = 0 and b.isrebate = 0 then p.payoktime else b.sdate end) &gt;= date_format(#sdateall#,'%Y-%m-%d 00:00:00')</isNotEmpty>
-        <isNotEmpty property="edateall" prepend="and">(case when a.cshape = 2 then e.eend else b.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>
+        <!--<isNotEmpty property="edateall" prepend="and">(case when a.cshape = 2 then e.eend else b.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>-->
         <isNotNull property="edate" prepend="and">date_format((case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end),'%Y-%m-%d') = #edate#</isNotNull>
         <isNotNull property="edate1" prepend="and">(case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end) >= #edate1#</isNotNull>
         <isNotNull property="edate2" prepend="and">(case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end) &lt;= #edate2#</isNotNull>
@@ -1183,7 +1183,7 @@
 
         <isNotNull property="iscomplete" prepend="and">ifnull(b.iscomplete,0)=#iscomplete#</isNotNull>
         <isNotNull property="cmisno" prepend="and">b.cmisno = #cmisno#</isNotNull>          <isNotEmpty property="sdateall" prepend="and">(case when a.cshape = 0 and b.isrebate = 0 then p.payoktime else b.sdate end) &gt;= date_format(#sdateall#,'%Y-%m-%d 00:00:00')</isNotEmpty>
-        <isNotEmpty property="edateall" prepend="and">(case when a.cshape = 2 then e.eend else b.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>
+        <!--<isNotEmpty property="edateall" prepend="and">(case when a.cshape = 2 then e.eend else b.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>-->
         <isNotNull property="edate" prepend="and">date_format((case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end),'%Y-%m-%d') = #edate#</isNotNull>
         <isNotNull property="edate1" prepend="and">(case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end) >= #edate1#</isNotNull>
         <isNotNull property="edate2" prepend="and">(case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end) &lt;= #edate2#</isNotNull>
@@ -1223,7 +1223,7 @@
 
         <isNotNull property="iscomplete" prepend="and">ifnull(b.iscomplete,0)=#iscomplete#</isNotNull>
         <isNotNull property="cmisno" prepend="and">b.cmisno = #cmisno#</isNotNull>          <isNotEmpty property="sdateall" prepend="and">(case when a.cshape = 0 and b.isrebate = 0 then p.payoktime else b.sdate end) &gt;= date_format(#sdateall#,'%Y-%m-%d 00:00:00')</isNotEmpty>
-        <isNotEmpty property="edateall" prepend="and">(case when a.cshape = 2 then e.eend else b.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>
+        <!--<isNotEmpty property="edateall" prepend="and">(case when a.cshape = 2 then e.eend else b.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>-->
         <isNotNull property="edate" prepend="and">date_format((case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end),'%Y-%m-%d') = #edate#</isNotNull>
         <isNotNull property="edate1" prepend="and">(case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end) >= #edate1#</isNotNull>
         <isNotNull property="edate2" prepend="and">(case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end) &lt;= #edate2#</isNotNull>
@@ -1263,7 +1263,7 @@
 
         <isNotNull property="iscomplete" prepend="and">ifnull(b.iscomplete,0)=#iscomplete#</isNotNull>
         <isNotNull property="cmisno" prepend="and">b.cmisno = #cmisno#</isNotNull>          <isNotEmpty property="sdateall" prepend="and">(case when a.cshape = 0 and b.isrebate = 0 then p.payoktime else b.sdate end) &gt;= date_format(#sdateall#,'%Y-%m-%d 00:00:00')</isNotEmpty>
-        <isNotEmpty property="edateall" prepend="and">(case when a.cshape = 2 then e.eend else b.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>
+        <!--<isNotEmpty property="edateall" prepend="and">(case when a.cshape = 2 then e.eend else b.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>-->
         <isNotNull property="edate" prepend="and">date_format((case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end),'%Y-%m-%d') = #edate#</isNotNull>
         <isNotNull property="edate1" prepend="and">(case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end) >= #edate1#</isNotNull>
         <isNotNull property="edate2" prepend="and">(case when a.cshape = 2 and e.eend is not null then e.eend else b.edate end) &lt;= #edate2#</isNotNull>
@@ -1587,8 +1587,8 @@
         <isNotEmpty property="usernameid" prepend="and">(u.userid like concat('%',#usernameid#,'%') or u.username like concat('%',#usernameid#,'%') or u.usernameeng like concat('%',#usernameid#,'%')) </isNotEmpty>
         <isNotNull property="iscomplete" prepend="and">ifnull(l.iscomplete,0)=#iscomplete#</isNotNull>
         <isNotNull property="cmisno" prepend="and">l.cmisno = #cmisno#</isNotNull>
-        <isNotEmpty property="sdateall" prepend="and">(case when c.cshape = 0 and l.isrebate = 0 then p.payoktime else l.sdate end) &gt;= date_format(#sdateall#,'%Y-%m-%d 00:00:00')</isNotEmpty>
-        <isNotEmpty property="edateall" prepend="and">(case when c.cshape = 2 then cis.eend else l.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>
+        <!--<isNotEmpty property="sdateall" prepend="and">(case when c.cshape = 0 and l.isrebate = 0 then p.payoktime else l.sdate end) &gt;= date_format(#sdateall#,'%Y-%m-%d 00:00:00')</isNotEmpty>-->
+        <!--<isNotEmpty property="edateall" prepend="and">(case when c.cshape = 2 then cis.eend else l.edate end) &lt;= date_format(#edateall#,'%Y-%m-%d 23:59:59')</isNotEmpty>-->
         <isNotNull property="edate" prepend="and">date_format((case when c.cshape = 2 and cis.eend is not null then cis.eend else l.edate end),'%Y-%m-%d') = #edate#</isNotNull>
         <isNotNull property="edate1" prepend="and">(case when c.cshape = 2 and cis.eend is not null then cis.eend else l.edate end) >= #edate1#</isNotNull>
         <isNotNull property="edate2" prepend="and">(case when c.cshape = 2 and cis.eend is not null then cis.eend else l.edate end) &lt;= #edate2#</isNotNull>