diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index 6b344b6..a8e0f13 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -718,8 +718,11 @@ namespace NP.BO.Controllers
             int pcnt = vm.pagerowcount == 0 ? 100 : vm.pagerowcount;
 
             var ht = SetHash(vm);
-            ht.Add("edate", vm.stringval);
-            ht.Add("edate2", vm.stringval12);
+            ht.Add("edate1", vm.stringval);
+            if(!string.IsNullOrWhiteSpace(vm.stringval12))
+            {
+                ht.Add("edate2", vm.stringval12 + " 23:59:59");
+            }
             ht.Add("cshape", vm.stringval2);
             ht.Add("cname", vm.stringval3);
             ht.Add("cnamestr", vm.stringval3);
diff --git a/BO/Views/Shared/Partial/ScdScript.cshtml b/BO/Views/Shared/Partial/ScdScript.cshtml
index daa95f3..753d176 100644
--- a/BO/Views/Shared/Partial/ScdScript.cshtml
+++ b/BO/Views/Shared/Partial/ScdScript.cshtml
@@ -53,7 +53,7 @@
                 //else {
                     if (d.quota != 0) {
                         if (d.remainPeople <= 0) {
-                            //li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled<span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label></label>");
+                            li.append("<label style='cursor: pointer'><input type='radio' name='rdoScds' value='" + d.cmisno + "' disabled<span style='color:gray'>" + d.scdInfoSummary + "</span><label style='color: red'> (마감)</label></label>");
                         }
                         else {
                             if (seq == 0) {
diff --git a/BO/Views/croom/attscds.cshtml b/BO/Views/croom/attscds.cshtml
index ccb83c5..daf4da5 100644
--- a/BO/Views/croom/attscds.cshtml
+++ b/BO/Views/croom/attscds.cshtml
@@ -107,7 +107,7 @@
                                 <td>@d.edate.Value.ToShortDateString()</td>
                             }
                             <td>@(string.IsNullOrWhiteSpace(d.zstring3) ? "-" : d.zstring3)</td>
-                            <td>@d.istatusname</td>@d.stimestr
+                            <td>@d.istatusname</td>
                             @if (!ViewBag.IsSubAdmin96)
                             {
                                 <td class="@(d.iscomplete == 1 ? "link text-center" : "")">@Html.Raw(d.iscomplete == 1 ? string.Format("<a href=\"#\" onclick=\"viewcert({0})\">{1}</a>", d.lectno, "수료") : d.iscompletename)</td>
diff --git a/BO/Views/croom/grade0.cshtml b/BO/Views/croom/grade0.cshtml
index 8d67786..5a83690 100644
--- a/BO/Views/croom/grade0.cshtml
+++ b/BO/Views/croom/grade0.cshtml
@@ -1,5 +1,5 @@
-@model NP.Model.VMLect
-@{
+@model NP.Model.VMLect   
+@{ 
     var ev = Model.Lects.FirstOrDefault() ?? new NP.Model.Lect() { };
 }
 <form id="mform" method="post">
@@ -103,7 +103,7 @@
                     <tr>
                         <th><input type="checkbox" onclick="javascript: checkall('excel1', this);" /></th>
                         <th width="20">No</th>
-                        @if (Model.CMEV.cshape == 2)
+                        @if(Model.CMEV.cshape == 2)
                         {
                             <th width="30">운영기수</th>
                         }
@@ -118,7 +118,7 @@
                         <th>과제(@ev.sd0cnt)</th>
                         <th style="display:none;">토론(@ev.sd1cnt)</th>
                         <th>환산점수</th>
-                        @if (Model.CMEV.isoffabs == 1)
+                        @if(Model.CMEV.isoffabs == 1)
                         {
                             <th>집합교육출석여부</th>
                         }
@@ -130,64 +130,67 @@
                 <tbody class="data" id="tbody1">
                     @foreach (var d in Model.Lects)
                     {
-                        <tr>
-                            <td><input type="checkbox" class="autocheck" value="@d.lectno" data-userno="@d.userno" /></td>
-                            <td>@d.rnorvt</td>
-                            @if (Model.CMEV.cshape == 2)
+                    <tr>
+                        <td><input type="checkbox" class="autocheck" value="@d.lectno" data-userno="@d.userno" /></td>
+                        <td>@d.rnorvt</td>
+                        @if(Model.CMEV.cshape == 2)
+                        {
+                            <td>@d.sseq</td>
+                        }
+                        <td>@d.isrebatename</td>
+                        <td>@d.asname</td>
+                        <td>@d.usernameid</td>
+                        <td>@((Model.CM.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString())</td>
+                        @if(Model.CMEV.cshape == 2)
+                        {
+                            if(d.iscomplete != 1)
                             {
-                                <td>@d.sseq</td>
-                            }
-                            <td>@d.isrebatename</td>
-                            <td>@d.asname</td>
-                            <td>@d.usernameid</td>
-                            <td>@((Model.CM.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString())</td>
-                            @if (Model.CMEV.cshape == 2)
-                            {
-                                if (d.iscomplete != 1)
-                                {
-                                    <td class="link text-center"><a href="#" onclick="javascript: openScd(@Model.CM.cmno,@d.lectno,@d.cmisno);">@d.eend.ToShortDateString()</a></td>
-                                }
-                                else
-                                {
-                                    <td>@d.eend.ToShortDateString()</td>
-                                }
+                                <td class="link text-center">[1] <a href="#" onclick="javascript: openScd(@Model.CM.cmno,@d.lectno,@d.cmisno);">@d.eend.ToShortDateString()</a></td>
                             }
                             else
                             {
-                                <td>@d.edate.Value.ToShortDateString()</td>
+                                <td>[2] @d.eend.ToShortDateString()</td>
                             }
-                            @if (!ViewBag.IsSubAdmin96)
-                            {
-                                <td class="link text-center"><a onclick="viewatt(@d.lectno)" href="#">@d.attrate %</a></td>
-                            }
-                            else
-                            {
-                                <td class="link text-center">@d.attrate %</td>
-                            }
-                            @*<td>@( d.ex0cnt < 1 ? "-" : d.ex0lectcnt < 1 && d.ex0cnt > 0 ? "미제출" : d.ex0lectpoint.ToString())</td>*@
-                            <td>@(d.ex1cnt < 1 ? "-" :d.ex1lectcnt < 1 && d.ex1cnt > 0 ? "미제출" : d.ex1lectpoint.ToString())</td>
-                            <td>@(d.sd0cnt < 1 ? "-" :d.sd0lectcnt < 1 && d.sd0cnt > 0 ? "미제출" : d.sd0lectpoint.ToString())</td>
-                            <td style="display:none;">@( d.sd1cnt < 1 ? "-" :d.sd1lectcnt < 1 && d.sd1cnt > 0 ? "미제출" : d.sd1lectpoint.ToString())</td>
-                            <td>@(((d.apoint + d.mpoint + d.fpoint + d.spoint + d.dpoint)).ToString())</td>
-                            @*<td>@((d.isrebate == 1 && Model.CMEV.midrfd < 1) || (d.isrebate == 0 && Model.CMEV.mid < 1) ? "-" : d.ex0cnt < 1 ? "-" : d.ex0lectcnt < 1 && d.ex0cnt > 0 ? "미제출" : d.ex0lectpoint.ToString())</td>
-                                <td>@((d.isrebate == 1 && Model.CMEV.finalrfd < 1) || (d.isrebate == 0 && Model.CMEV.final < 1) ? "-" : d.ex1cnt < 1 ? "-" : d.ex1lectcnt < 1 && d.ex1cnt > 0 ? "미제출" : d.ex1lectpoint.ToString())</td>
-                                <td>@((d.isrebate == 1 && Model.CMEV.subjectrfd < 1) || (d.isrebate == 0 && Model.CMEV.subject < 1) ? "-" : d.sd0cnt < 1 ? "-" : d.sd0lectcnt < 1 && d.sd0cnt > 0 ? "미제출" : d.sd0lectpoint.ToString())</td>
-                                <td>@((d.isrebate == 1 && Model.CMEV.discussrfd < 1) || (d.isrebate == 0 && Model.CMEV.discuss < 1) ? "-" : d.sd1cnt < 1 ? "-" : d.sd1lectcnt < 1 && d.sd1cnt > 0 ? "미제출" : d.sd1lectpoint.ToString())</td>*@
-                            @if (Model.CMEV.isoffabs == 1)
-                            {
-                                <td class="link text-center"><a href="#" onclick="save4();">@d.istatusname</a></td>
-                            }
-                            <td>@(d.rs0lectcnt) / @(d.rs0cnt)</td>
-                            @if (!ViewBag.IsSubAdmin96)
-                            {
-                                <td class="@(d.iscomplete == 1 ? "link text-center" : "")">@Html.Raw(d.iscomplete == 1 ? string.Format("<a href=\"#\" onclick=\"viewcert({0})\">{1}</a>", d.lectno, "수료") : d.iscompletename)</td>
-                            }
-                            else
-                            {
-                                <td class="@(d.iscomplete == 1 ? "link text-center" : "")">@Html.Raw(d.iscomplete == 1 ? string.Format("{1}", d.lectno, "수료") : d.iscompletename)</td>
-                            }
-                            @*<td><a style="@(d.iscomplete == 1 ? "":"display:none;")" href="#" class="btn btn-select btn-xxs" onclick="changecompt('@(d.completetime != null ? d.completetime.Value.ToString("yyyy-MM-dd") : "0001-01-01")','@d.username','@d.userid',@d.lectno,'@d.cshape')">변경</a></td>*@
-                        </tr>
+                        }
+                        else
+                        {
+                            <td>[3] @d.edate.Value.ToShortDateString()</td>
+                        }
+                        @if (!ViewBag.IsSubAdmin96)
+                        {
+                            <td class="link text-center">[4] <a onclick="viewatt(@d.lectno)" href="#">@d.attrate %</a></td>
+                        }
+                        else
+                        {
+                            <td class="link text-center">[5] @d.attrate %</td>
+                        }
+                        @*<td>@( d.ex0cnt < 1 ? "-" : d.ex0lectcnt < 1 && d.ex0cnt > 0 ? "미제출" : d.ex0lectpoint.ToString())</td>*@
+                        <td>[6] @(d.ex1cnt < 1 ? "-" :d.ex1lectcnt < 1 && d.ex1cnt > 0 ? "미제출" : d.ex1lectpoint.ToString())</td>
+                        <td>[7] @(d.sd0cnt < 1 ? "-" :d.sd0lectcnt < 1 && d.sd0cnt > 0 ? "미제출" : d.sd0lectpoint.ToString())</td>
+                        <td style="display:none;">[8] @( d.sd1cnt < 1 ? "-" :d.sd1lectcnt < 1 && d.sd1cnt > 0 ? "미제출" : d.sd1lectpoint.ToString())</td>
+                        <td>
+                            [9] @(((d.apoint + d.mpoint + d.fpoint + d.spoint + d.dpoint)).ToString())
+                            // @(d.apoint) @(d.mpoint) @(d.fpoint) @(d.spoint) @(d.dpoint)
+                        </td>
+                        @*<td>@((d.isrebate == 1 && Model.CMEV.midrfd < 1) || (d.isrebate == 0 && Model.CMEV.mid < 1) ? "-" : d.ex0cnt < 1 ? "-" : d.ex0lectcnt < 1 && d.ex0cnt > 0 ? "미제출" : d.ex0lectpoint.ToString())</td>
+                            <td>@((d.isrebate == 1 && Model.CMEV.finalrfd < 1) || (d.isrebate == 0 && Model.CMEV.final < 1) ? "-" : d.ex1cnt < 1 ? "-" : d.ex1lectcnt < 1 && d.ex1cnt > 0 ? "미제출" : d.ex1lectpoint.ToString())</td>
+                            <td>@((d.isrebate == 1 && Model.CMEV.subjectrfd < 1) || (d.isrebate == 0 && Model.CMEV.subject < 1) ? "-" : d.sd0cnt < 1 ? "-" : d.sd0lectcnt < 1 && d.sd0cnt > 0 ? "미제출" : d.sd0lectpoint.ToString())</td>
+                            <td>@((d.isrebate == 1 && Model.CMEV.discussrfd < 1) || (d.isrebate == 0 && Model.CMEV.discuss < 1) ? "-" : d.sd1cnt < 1 ? "-" : d.sd1lectcnt < 1 && d.sd1cnt > 0 ? "미제출" : d.sd1lectpoint.ToString())</td>*@
+                        @if (Model.CMEV.isoffabs == 1)
+                        {
+                    <td class="link text-center">[10] <a href="#" onclick="save4();">@d.istatusname</a></td>
+                        }
+                    <td>[11] @(d.rs0lectcnt) / @(d.rs0cnt)</td>
+                        @if (!ViewBag.IsSubAdmin96)
+                        {
+                    <td class="@(d.iscomplete == 1 ? "link text-center" : "")">[12] @Html.Raw(d.iscomplete == 1 ? string.Format("<a href=\"#\" onclick=\"viewcert({0})\">{1}</a>", d.lectno, "수료") : d.iscompletename)</td>
+                        }
+                        else
+                        {
+                    <td class="@(d.iscomplete == 1 ? "link text-center" : "")">[13] @Html.Raw(d.iscomplete == 1 ? string.Format("{1}", d.lectno, "수료") : d.iscompletename)</td>
+                        }
+                        @*<td><a style="@(d.iscomplete == 1 ? "":"display:none;")" href="#" class="btn btn-select btn-xxs" onclick="changecompt('@(d.completetime != null ? d.completetime.Value.ToString("yyyy-MM-dd") : "0001-01-01")','@d.username','@d.userid',@d.lectno,'@d.cshape')">변경</a></td>*@
+                    </tr>
                     }
                 </tbody>
             </table>
@@ -219,7 +222,7 @@
     <h4><i class="fa fa-bars"></i> <span id="pcap">OFF출결관리</span><a href="#" class="btn btn-default btn-xs f-r closethisbox">닫기</a></h4>
     <br />
     <table class="regtable">
-        <colgroup><col width="100" /><col /></colgroup>
+        <colgroup><col  width="100"/><col/></colgroup>
         <tr style="display:none;">
             <th>회차선택</th>
             <td>
@@ -247,7 +250,7 @@
             <td colspan="2">
                 <select id="cmisno" class="form-control" onchange="getoff()">
                     <option value="">신청교육일</option>
-                    @foreach (var d in Model.CMinningscds)
+                    @foreach(var d in Model.CMinningscds)
                     {
                         <option value="@d.cmisno">@d.estart.ToString("yyyy-MM-dd")</option>
                     }
@@ -389,7 +392,7 @@
             msg2("수료일자를 변경했습니다.", null, null, null, true);
             submit("mform", 500, true);
         } else { msgadmin2(); }
-    }
+    } 
     function save4() {
         bglayer(); $("#thisbox2").slideDown("fast", function () { $("#thisbox2").scrollTop(0); });
         if ($("#cmino option").length > 1) {
diff --git a/BO/Web.config b/BO/Web.config
index 4eec37f..9b979cd 100644
--- a/BO/Web.config
+++ b/BO/Web.config
@@ -55,8 +55,8 @@
 		<!--<add key="talk" value="https://alimtalk-api.bizmsg.kr/v2/sender/send,?,?,?,?,?,023103312" />-->
 
 		<!--<add key="configpath" value="Product" />-->
-		<!--<add key="configpath" value="ProductDev" />-->
-		<add key="configpath" value="staging" />
+		<add key="configpath" value="ProductDev" />
+		<!--<add key="configpath" value="staging" />-->
 
 
 		<add key="lgdacomConfigPath" value="D:\3rdparti\lgdacomyicte" />
diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs
index a0bc78a..10ae51e 100644
--- a/Base/Controller/ACommonCRoom.cs
+++ b/Base/Controller/ACommonCRoom.cs
@@ -1780,6 +1780,7 @@ namespace NP.Base.Controllers
         public JsonResult GetScdForMixEdu(int cmno, int iscmlects = 0, int scdallCheck = 0)
         {
             var result = Dao.Get<CMinningscd>("cm.cminningscds.applyedu.admin" + (scdallCheck > 0 ? "2" : ""), new System.Collections.Hashtable() { { "cmno", cmno } });
+            //var result = Dao.Get<CMinningscd>("cm.cminningscds.applyedu.admin", new System.Collections.Hashtable() { { "cmno", cmno } });
             foreach (var item in result)
             {
                 item.scdInfoSummary = string.Format("[{0}] {1}", item.studyplacename, item.estart.ToString("yyyy년 MM월 dd일 ddd요일 HH:mm"));
diff --git a/Dao/MyBatis/Maps/Attend.xml b/Dao/MyBatis/Maps/Attend.xml
index 6e7f173..a5a7056 100644
--- a/Dao/MyBatis/Maps/Attend.xml
+++ b/Dao/MyBatis/Maps/Attend.xml
@@ -133,7 +133,7 @@
         from lect a
         inner join cminning b on b.cmno=a.cmno
         left outer join lectinning c on c.lectno=a.lectno and c.cmino=b.cmino
-        where a.lectno in ($lectnos$) and a.status=1 and a.ischanged=0 and c.lectno is null;
+        where a.lectno in ($lectnos$) and a.status=1 and b.isonline = 0 and b.isscd = 1 and a.ischanged=0 and c.lectno is null;
 
         update lectinning lni
         inner join lect l on lni.lectno = l.lectno
@@ -150,7 +150,7 @@
         from lect a
         inner join cminning b on b.cmno=a.cmno
         left outer join lectinning c on c.lectno=a.lectno and c.cmino=b.cmino
-        where a.lectno in ($lectnos$) and a.status=1 and a.ischanged=0 and c.lectno is null;
+        where a.lectno in ($lectnos$) and a.status=1  and b.isonline = 0 and b.isscd = 1 and a.ischanged=0 and c.lectno is null;
 
         update lectinning lni
         inner join lect l on lni.lectno = l.lectno
diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml
index 90d5e26..d9d3a4d 100644
--- a/Dao/MyBatis/Maps/CM.xml
+++ b/Dao/MyBatis/Maps/CM.xml
@@ -1893,18 +1893,19 @@
             a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth
             ,a.remainPeople
             ,a.isselected
-            ,case when a.remainPeople &lt;= 0 then 0 else 1 end isend
-          from
-          (
-            select  a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth
-              ,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status in (1,2)  and z.ischanged=0)) remainPeople
-              ,a.studyplace,case when c.scdtype =1 then '온라인' else e.cname end studyplacename
-              ,case when date_format(d.setime,'%Y%m%d') = date_format(a.estart,'%Y%m%d') then 1 else 0 end isselected
-            from cminningscd a
-            left outer join cminning c on c.cmino = a.cmino
-            left outer join cm d on d.cmno = c.cmno
-            left outer join comcode e on e.ccode = a.studyplace
-            <dynamic prepend="where">
+            <!--,case when a.remainPeople &lt;= 0 then 0 else 1 end isend-->
+        , 1 isend
+        from
+        (
+        select  a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth
+        ,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status in (1,2)  and z.ischanged=0)) remainPeople
+        ,a.studyplace,case when c.scdtype =1 then '온라인' else e.cname end studyplacename
+        ,case when date_format(d.setime,'%Y%m%d') = date_format(a.estart,'%Y%m%d') then 1 else 0 end isselected
+        from cminningscd a
+        left outer join cminning c on c.cmino = a.cmino
+        left outer join cm d on d.cmno = c.cmno
+        left outer join comcode e on e.ccode = a.studyplace
+        <dynamic prepend="where">
               <isNotNull property="cmno" prepend="and">c.cmno=#cmno#</isNotNull>
             </dynamic>
           )a
@@ -1912,7 +1913,7 @@
             <isNotNull property="month" prepend="and">a.startmonth=#month#</isNotNull>
           </dynamic>
         ) a
-        where a.isend = 1
+        <!--where a.isend = 1-->
 		<!--20220803
 		and a.remainPeople &gt; 0-->
         order by a.estart
@@ -1925,7 +1926,8 @@
         a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth
         ,a.remainPeople
         ,a.isselected
-        ,case when a.remainPeople &lt;= 0 then 0 else 1 end isend
+        <!--,case when a.remainPeople &lt;= 0 then 0 else 1 end isend-->
+        , 1 isend
         from
         (
         select  a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth
diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml
index 869c1e3..32876c7 100644
--- a/Dao/MyBatis/Maps/Grade.xml
+++ b/Dao/MyBatis/Maps/Grade.xml
@@ -1062,8 +1062,9 @@
         <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>
-        <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="edate2" 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') &lt;= #edate2#</isNotNull>
+        <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>
 
         <isNotNull property="studyplace" prepend="and">e.studyplace = #studyplace#</isNotNull>
 
@@ -1102,6 +1103,8 @@
         <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>
         <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>
 
         <isNotNull property="studyplace" prepend="and">e.studyplace = #studyplace#</isNotNull>
 
@@ -1140,6 +1143,8 @@
         <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>
         <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>
 
         <isNotNull property="studyplace" prepend="and">e.studyplace = #studyplace#</isNotNull>
 
@@ -1178,6 +1183,8 @@
         <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>
         <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>
 
         <isNotNull property="studyplace" prepend="and">e.studyplace = #studyplace#</isNotNull>
 
@@ -1216,6 +1223,8 @@
         <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>
         <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>
 
         <isNotNull property="studyplace" prepend="and">e.studyplace = #studyplace#</isNotNull>
 
@@ -1254,6 +1263,8 @@
         <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>
         <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>
 
         <isNotNull property="studyplace" prepend="and">e.studyplace = #studyplace#</isNotNull>
 
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 5bec403..7fec7d3 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1089,8 +1089,9 @@
 			<isNotNull property="extype">and b.extype = #extype#</isNotNull>
 			<isNotNull property="cmno">and a.cmno = #cmno#</isNotNull>
 			<isNotNull property="isrebate">and a.isrebate=#isrebate#</isNotNull>
-			<isNotNull property="edate">and (date_format((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end),'%Y-%m-%d') >= #edate#)</isNotNull>
-      <isNotNull property="edate2">and (date_format((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end),'%Y-%m-%d') &lt;= #edate2#)</isNotNull>
+			<isNotNull property="edate">and (date_format((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end),'%Y-%m-%d') = #edate#)</isNotNull>
+      <isNotNull property="edate1">and ((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end) >= #edate1#)</isNotNull>
+      <isNotNull property="edate2">and ((case when b2.cshape = 2 and f.eend is not null then f.eend else a.edate end) &lt;= #edate2#)</isNotNull>
 			<isNotNull property="cshape">and b2.cshape = #cshape#</isNotNull>
 			<isNotEmpty property="cname">and b2.cname like concat('%',#cname#,'%')</isNotEmpty>
 			<isNotEmpty property="cnamestr">and b2.cname like concat('%',#cname#,'%')</isNotEmpty>
@@ -1438,10 +1439,13 @@
 			left outer join comcode i on i.ccode = h.studyplace and i.isuse=1
 			where a.status=1 and a.ischanged=0
 			<isNotNull property="edate">
-        <isNotEmpty property="edate">and date_format((case when g.cshape = 2 and h.eend is not null then h.eend else a.edate end),'%Y-%m-%d') >= #edate#</isNotEmpty>
+        <isNotEmpty property="edate">and date_format((case when g.cshape = 2 and h.eend is not null then h.eend else a.edate end),'%Y-%m-%d') = #edate#</isNotEmpty>
+      </isNotNull>
+      <isNotNull property="edate1">
+        <isNotEmpty property="edate1">and (case when g.cshape = 2 and h.eend is not null then h.eend else a.edate end) >= #edate1#</isNotEmpty>
       </isNotNull>
       <isNotNull property="edate2">
-        <isNotEmpty property="edate">and date_format((case when g.cshape = 2 and h.eend is not null then h.eend else a.edate end),'%Y-%m-%d') &lt;= #edate2#</isNotEmpty>
+        <isNotEmpty property="edate2">and (case when g.cshape = 2 and h.eend is not null then h.eend else a.edate end) &lt;= #edate2#</isNotEmpty>
       </isNotNull>
       <isNotNull property="cshape">
         <isNotEmpty property="cshape">and g.cshape = #cshape#</isNotEmpty>