<기능개선>

1. PMS NO : 7342, 7338, 7337
2. (주요)작업내용 
(1) 일괄 적용

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("edate1", vm.stringval);
-            ht.Add("edate2", vm.stringval12);
+            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);

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) {

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>

BO/Views/croom/grade0.cshtml

@@ -145,46 +145,49 @@
                         {
                             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>
+                                <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.eend.ToShortDateString()</td>
+                                <td>[2] @d.eend.ToShortDateString()</td>
                             }
                         }
                         else
                         {
-                                <td>@d.edate.Value.ToShortDateString()</td>
+                            <td>[3] @d.edate.Value.ToShortDateString()</td>
                         }
                         @if (!ViewBag.IsSubAdmin96)
                         {
-                                <td class="link text-center"><a onclick="viewatt(@d.lectno)" href="#">@d.attrate %</a></td>
+                            <td class="link text-center">[4] <a onclick="viewatt(@d.lectno)" href="#">@d.attrate %</a></td>
                         }
                         else
                         {
-                                <td class="link text-center">@d.attrate %</td>
+                            <td class="link text-center">[5] @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>[6] @(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>[7] @(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 style="display:none;">[8] @( 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>
+                            [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"><a href="#" onclick="save4();">@d.istatusname</a></td>
+                    <td class="link text-center">[10] <a href="#" onclick="save4();">@d.istatusname</a></td>
                         }
-                            <td>@(d.rs0lectcnt) / @(d.rs0cnt)</td>
+                    <td>[11] @(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>
+                    <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" : "")">@Html.Raw(d.iscomplete == 1 ? string.Format("{1}", d.lectno, "수료") : d.iscompletename)</td>
+                    <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>

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="ProductDev" />
-		<add key="configpath" value="staging" />
+		<!--<add key="configpath" value="staging" />-->
 
 
 		<add key="lgdacomConfigPath" value="D:\3rdparti\lgdacomyicte" />

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"));

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

Dao/MyBatis/Maps/CM.xml

@@ -1893,7 +1893,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 <= 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
@@ -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

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="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="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>
 

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="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="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>