Dao/MyBatis/Maps/Lect.xml

@@ -1124,6 +1124,7 @@
                 ,e.isgroup,e.payno
                 ,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email,ua.asname
                 ,1 rno
+                ,scd.estart,scd.eend
             from lect a
             inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include>
             <!--inner join cm pc on pc.cmno=case when a.ispc=1 then a.pcno else a.cmno end and pc.sstime &lt; <include refid="sql.now"></include>-->
@@ -1132,7 +1133,9 @@
             inner join pay e on e.payno=a.payno and e.isgroup=0
             inner join users u on u.userno=a.userno
             left outer join assign ua on ua.asno=u.asno
+            left outer join cminningscd scd on scd.cmisno = a.cmisno
             where a.userno=#userno# and a.status=1 and a.ischanged=0
+            <isNotNull property="cshape">and b.cshape=#cshape#</isNotNull>
             union all
             select a.lectno,a.cmno,a.userno,a.isrebate,a.iscomplete
                 ,b.cmno,b.cname,b.cshape,b.sstime,b.setime,b.classno,b.isrefund
@@ -1140,6 +1143,7 @@
                 ,e.isgroup,e.payno
                 ,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email,ua.asname
                 ,row_number() over(partition by e.payno) rno
+                ,null estart, null eend
             from pay e
             inner join lect a on a.payno=e.payno and a.status=1 and a.ischanged=0
             inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include>
@@ -1148,6 +1152,7 @@
             inner join users u on u.userno=a.userno
             left outer join assign ua on ua.asno=u.asno
             where e.isgroup=1 and e.userno=#userno# and e.pstatus=1
+            <isNotNull property="cshape">and b.cshape=#cshape#</isNotNull>
             union all
             select a.lectno,a.cmno,a.userno,a.isrebate,a.iscomplete
                 ,b.cmno,b.cname,b.cshape,b.sstime,b.setime,b.classno,b.isrefund
@@ -1155,6 +1160,7 @@
                 ,e.isgroup,e.payno
                 ,u.username,null ccpositionname,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) email,ua.asname
                 ,row_number() over(partition by e.payno) rno
+                ,null estart, null eend
             from lect a0
             inner join pay e on e.payno=a0.payno and e.isgroup=1 and e.userno&lt;&gt;#userno# and e.pstatus=1
             inner join lect a on a.payno=e.payno and a.status=1 and a.ischanged=0
@@ -1164,6 +1170,7 @@
             inner join users u on u.userno=a.userno
             left outer join assign ua on ua.asno=u.asno
             where a0.userno=#userno# and a0.status=1 and a0.ischanged=0
+            <isNotNull property="cshape">and b.cshape=#cshape#</isNotNull>
             order by case when setime &lt; now() then 0 else 1 end desc,setime desc,payno
         </select>
         <select id="lect.myexams" parameterClass="hashtable" resultClass="examuser">

FO/Controllers/MyController.cs

@@ -154,7 +154,7 @@ namespace NP.FO.Controllers
         }
         public ActionResult Lecture(VMMy vm)
         {
-            vm.Lects = Dao.Get<Lect>("lect.mylectures", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, {"cgcode", vm.intval > 0 ? TestCode3 : null } });
+            vm.Lects = Dao.Get<Lect>("lect.mylectures", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "cgcode", vm.intval > 0 ? TestCode3 : null }, { "cshape", vm.stringval } }); 
             return View(vm);
         }
         public ActionResult CertPrint(VMMy vm)

FO/Views/My/Index.cshtml

@@ -60,7 +60,7 @@
                             <dl>
                                 <dt class="mpglSta3">@(d.time2 > DateTime.Now ? "진행중" : "종료")</dt>
                                 <dd>교육기간 : @d.time.ToString("yy/MM/dd") ~ @d.time2.ToString("yy/MM/dd")</dd>
-                                @if (d.intval3 == 2)
+                                @if (d.intval3 == 2 && d.time3> Convert.ToDateTime("1900-01-01") && d.time4 > Convert.ToDateTime("1900-01-01"))
                                 {
                                     <dt class="mpglSta3">&nbsp;&nbsp;&nbsp;</dt>
                                     <dd> 집체교육 :  @d.time3.ToString("yy/MM/dd") ~ @d.time4.ToString("yy/MM/dd")</dd>

FO/Views/My/Lecture.cshtml

@@ -2,17 +2,31 @@
 @{
 
 }
+<style>
+    .lctQr {
+    }
+        .lctQr > span {
+            color: black;
+            cursor: pointer;
+        }
+        .lctQr span.current {
+            color: blue;
+        }
+</style>
 <div class="mpgInfo">			
 	<ul>
 		<li>강좌명을 클릭하시면 강좌의 내용을 확인할 수 있는 강의실로 입장하실 수 있습니다.</li>
 		<li>수료증은 수료를 완료한 인원만 출력하실 수 있습니다. 출력이 안되실 경우 나의 상담을 이용하여 문의주시기 바랍니다.</li>
-		<li>단체수강신청을 한 강좌일 경우 인원을 클릭하시어, 수료대상별로 수료를 클릭하셔야 합니다.(모바일 기기에서는 지원되지 않습니다.)</li>
+        <li>·2020년 이전 과정은 수강과정에서 조회되지 않으며, ‘증빙서류출력’으로 이동하여 이용해주시기 바랍니다.</li>
 	</ul>
 </div>			
 <div class="lctQr">
-	<p><input type="checkbox" name="intval" @(Model.intval == 1 ? "checked":"") id="lctQrChk"/><label for="lctQrChk">보수교육만 조회</label></p>
+    @*<p><input type="checkbox" name="intval" @(Model.intval == 1 ? "checked":"") id="lctQrChk"/><label for="lctQrChk">보수교육만 조회</label></p>*@
+        <span class="@(string.IsNullOrEmpty(Model.stringval)? "current" : "" )" id="lblAll">전체</span>&nbsp;|&nbsp;
+        <span class="@(Model.stringval == "1"? "current" : "" )" id="lblOff">교육장교육</span>&nbsp;|&nbsp;
+        <span class="@(Model.stringval == "2"? "current" : "" )" id="lblMix">온라인(혼합)교육</span>&nbsp;|&nbsp;
+        <span class="@(Model.stringval == "0"? "current" : "" )" id="lblOn">온라인교육</span>
     <ul>
-		<li><a href="#" onclick="qr()">출석인증용 QR코드 조회</a></li>
         <li><a href="#" onclick="ps()">수료증 최적화 출력방법</a></li>
     </ul>
 </div>
@@ -34,14 +48,28 @@
                         <h5>
                             <em>@d.tyear-@(d.tseq)기</em>
                             <span class="nav">@d.cshapename</span>
-                            @Html.Raw(d.isrebate == 1 ? "<span class=\"grn\">환급</span>":"")
+                            @Html.Raw(d.isrebate == 1 ? "<span class=\"grn\">환급</span>" : "")
                             <b>@d.cname (@(d.classno))</b>
                         </h5>
                         <dl class="ltaDl">
                             <dt class="@(d.setime > DateTime.Now ? "ltaDlbk" : "ltaDlred")">@(d.setime > DateTime.Now ? "수강기간 학습중" : "종료")</dt>
                             <dd>교육기간 : @d.sstime.Value.ToString("yy/MM/dd") ~ @d.setime.Value.ToString("yy/MM/dd")</dd>
+                            @if (d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01"))
+                            {
+                                <dt class="ltaDlbk"></dt>
+                                <dd> 집체교육일 :  @d.estart.ToString("yy/MM/dd") ~ @d.eend.ToString("yy/MM/dd")</dd>
+                            }
                         </dl>
                     </a>
+                    @if (d.cshape == 2 && d.estart > Convert.ToDateTime("1900-01-01") && d.eend > Convert.ToDateTime("1900-01-01"))
+                    {
+                        <dl class="ltaDl" style="display:inline">
+                            <dd>
+                                &nbsp;&nbsp;&nbsp;
+                                <input type="button" value="집체교육변경" />
+                            </dd>
+                        </dl>
+                    }
                 </div>
 			</th>
             <td class="ltaBtn" data-th="강의실 : ">
@@ -115,7 +143,8 @@
         <div style="text-align: center; padding: 20px;">- 수강중인 강좌가 없습니다.</div>
 }
 <form id="mform" method="post" action="">
-    @Html.HiddenFor(m=>m.intval)
+@Html.HiddenFor(m => m.intval)
+@Html.HiddenFor(m => m.stringval)
 </form>
 <div class="mpgPop" style="display: none" id="pop1">
     <div>
@@ -142,6 +171,16 @@
 @section scripts{
     <script>
         $(document).ready(function () {
+            $(".lctQr > span").click(function () {
+                $(".lctQr > span").removeClass("current");
+                $(this).addClass("current");
+                var id = $(this).attr("id");
+                if (id == "lblAll") { $("#stringval").val(null) }
+                if (id == "lblOff") { $("#stringval").val("1") }
+                if (id == "lblMix") { $("#stringval").val("2") }
+                if (id == "lblOn") { $("#stringval").val("0") }
+                submit();
+            });
             $("#lctQrChk").on("change", function () {
                 setv("intval", 0);
                 if ($(this).prop("checked")) {

Model/CM.cs

@@ -1036,6 +1036,8 @@ namespace NP.Model
             }
         }
         public int isacceptemail { get; set; }
+        public DateTime estart { get; set; }
+        public DateTime eend { get; set; }
     }
     /// <summary>
     /// 자격검정시험