상시신청 기능 작업중

BO/Controllers/HomeController.cs

@@ -22,7 +22,7 @@ namespace NP.BO.Controllers
                 return RedirectToAction(nameof(userController.users), "user");
             }
             vm.Data = Dao.Get<Data>("common.home", SUserInfo.UserNo).First();
-            vm.CMs = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "ismaster", 0 },{ "isuse", 1 },{"cname",vm.stringval },{ "iscurrent",1 },{ "orderby", "t.tyear desc,t.tseq desc,a.cname,a.classno"} });
+            vm.CMs = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "ismaster", 0 },{ "isuse", 1 },{"cname",vm.stringval },{ "iscurrent",1 },{ "orderby", "a.setime desc,t.tyear desc,t.tseq desc,a.cname,a.classno" } });
             return View(vm);
         }
     }

BO/Views/Home/Index.cshtml

@@ -76,7 +76,7 @@
     <script>
         $("#stringval").on('keydown', function(e) {
             if (e.keyCode == 13) {
-                capp("/acommon/cmget", {ismaster:0, cname: val("stringval"), iscurrent:1,orderby : "t.tyear desc,t.tseq desc,a.cname,a.classno"}, "cbget");
+                capp("/acommon/cmget", {ismaster:0, cname: val("stringval"), iscurrent:1,orderby : "a.setime desc, t.tyear desc,t.tseq desc,a.cname,a.classno"}, "cbget");
             }
         });
         function cbget() {

BO/Views/cm/cmreg.cshtml

@@ -49,15 +49,35 @@
             </div>*@
                     <div class="line line-dashed line-lg pull-in"></div><div class="form-group">
                         <label class="col-sm-4 col-md-2 control-label @(Model.CM.ismaster == 0 ? "req" : "")">신청기간</label>
-                        <div class="col-sm-8 col-md-10">@Html.Partial("./Partial/Date", Model.CM.rstime == null ? (DateTime?)null : Convert.ToDateTime(Model.CM.rstime), new ViewDataDictionary { { "name", "CM.rstime" } }) ~ @Html.Partial("./Partial/Date", Model.CM.retime == null ? (DateTime?)null : Convert.ToDateTime(Model.CM.retime), new ViewDataDictionary { { "name", "CM.retime" } })</div>
+                        @{
+                            var isAllDays = (Model.CM.retime == null ? String.Empty : Convert.ToDateTime(Model.CM.retime).ToString("yyyy-MM-dd")) == "2099-12-31";
+                        }
+                        <div class="col-sm-8 col-md-10">
+                            <span id="rtime" style="@(isAllDays ? "display:none;" : string.Empty)">@Html.Partial("./Partial/Date", Model.CM.rstime == null ? (DateTime?)null : Convert.ToDateTime(Model.CM.rstime), new ViewDataDictionary { { "name", "CM.rstime" } }) ~ @Html.Partial("./Partial/Date", Model.CM.retime == null ? (DateTime?)null : Convert.ToDateTime(Model.CM.retime), new ViewDataDictionary { { "name", "CM.retime" } })</span>
+                            @if (Model.CM.lectcnt <= 0)
+                            {
+                                <input type="checkbox" id="alldays" @(isAllDays ? "checked" : string.Empty) /><span>상시</span>
+                            }
+                            else
+                            {
+                                <input type="checkbox" id="alldays" @(isAllDays ? "checked" : string.Empty) disabled/><span>상시</span>
+                            }
+                        </div>
                     </div>
                     <div class="line line-dashed line-lg pull-in"></div><div class="form-group">
                         <label class="col-sm-4 col-md-2 control-label @(Model.CM.ismaster == 0 ? "req" : "")">학습기간</label>
-                        <div class="col-sm-8 col-md-10">@Html.Partial("./Partial/Date", Model.CM.sstime == null ? (DateTime?)null : Convert.ToDateTime(Model.CM.sstime), new ViewDataDictionary { { "name", "CM.sstime" } }) ~ @Html.Partial("./Partial/Date", Model.CM.setime == null ? (DateTime?)null : Convert.ToDateTime(Model.CM.setime), new ViewDataDictionary { { "name", "CM.setime" } })</div>
+                        <div class="col-sm-8 col-md-10">
+                            <span id="stime" style="@(isAllDays ? "display:none;" : string.Empty)">@Html.Partial("./Partial/Date", Model.CM.sstime == null ? (DateTime?)null : Convert.ToDateTime(Model.CM.sstime), new ViewDataDictionary { { "name", "CM.sstime" } }) ~ @Html.Partial("./Partial/Date", Model.CM.setime == null ? (DateTime?)null : Convert.ToDateTime(Model.CM.setime), new ViewDataDictionary { { "name", "CM.setime" } })</span>
+                            <div id="stime2" style="@(isAllDays ? string.Empty :"display:none;" )">학습일로부터 @Html.TextBoxFor(m => m.CM.studydays, new { @class = "form-control int disp-init", @style = "width: 60px;", @maxlength = "4" }) 일</div>
                         </div>
+                    </div>
+                    <div style="@(isAllDays ? "display:none;" : string.Empty)" id="gtime">
                         <div class="line line-dashed line-lg pull-in"></div><div class="form-group">
                             <label class="col-sm-4 col-md-2 control-label @(Model.CM.ismaster == 0 ? "req" : "")">성적처리기간</label>
-                        <div class="col-sm-8 col-md-10">@Html.Partial("./Partial/Date", Model.CM.gstime == null ? (DateTime?)null : Convert.ToDateTime(Model.CM.gstime), new ViewDataDictionary { { "name", "CM.gstime" } }) ~ @Html.Partial("./Partial/Date", Model.CM.getime == null ? (DateTime?)null : Convert.ToDateTime(Model.CM.getime), new ViewDataDictionary { { "name", "CM.getime" } })</div>
+                            <div class="col-sm-8 col-md-10">
+                                @Html.Partial("./Partial/Date", Model.CM.gstime == null ? (DateTime?)null : Convert.ToDateTime(Model.CM.gstime), new ViewDataDictionary { { "name", "CM.gstime" } }) ~ @Html.Partial("./Partial/Date", Model.CM.getime == null ? (DateTime?)null : Convert.ToDateTime(Model.CM.getime), new ViewDataDictionary { { "name", "CM.getime" } })
+                            </div>
+                        </div>
                     </div>
                 }
                 else
@@ -257,7 +277,7 @@
     @Html.Partial("./Partial/FileScript")
 }
 @section scripts{
-    <script>
+<script>
         var cmboxtmno = 0;
         var cmpre = 0;
         var cmboxnotcmno = @Model.CM.cmno;
@@ -353,6 +373,27 @@
                 }
             });
             loadlegal($("#pcgno").val());
+
+            $("#alldays").on("click", function () {
+                if ($(this).is(":checked")) {
+                    var date = new Date();
+                    $("#rtime").hide();
+                    $("#stime").hide();
+                    $("#stime2").show();
+                    $("#gtime").hide();
+                    setv("CM_retime", "2099-12-31");
+                    setv("CM_getime", "2099-12-31");
+                    setv("CM_sstime", date.getFullYear() + "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + ("0" + date.getDate()).slice(-2));
+                } else {
+                    var date = new Date();
+                    setv("CM_retime", date.getFullYear() + "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + ("0" + date.getDate()).slice(-2));
+                    setv("CM_getime", date.getFullYear() + "-" + ("0" + (date.getMonth() + 1)).slice(-2) + "-" + ("0" + date.getDate()).slice(-2));
+                    $("#rtime").show();
+                    $("#stime").show();
+                    $("#stime2").hide();
+                    $("#gtime").show();
+                }
+            });
         });
         function loadlegal(cgno) {
             capp("/acommon/cgget", { cgno: cgno }, "renderlegal");
@@ -379,6 +420,8 @@
         }
         var viewidxname = '@(Model.viewidxname)';
         function save() {
+            var isallday = $("#alldays").is(":checked");
+
             if ($("input[name='CM.cshape']:checked").val() == '0') {
                 $("#CM_accommofee").val("0");
             }
@@ -391,10 +434,10 @@
             else if (check("CM_cname", null, viewidxname + "명을 입력해주세요.")) { }
             else if (@Model.CM.ismaster == 0 && check("CM_rstime", null, "신청기간을 입력해주세요.")) { }
             else if (@Model.CM.ismaster == 0 && check("CM_retime", null, "신청기간을 입력해주세요.")) { }
-            else if (@Model.CM.ismaster == 0 && check("CM_sstime", null, "학습기간을 입력해주세요.")) { }
+            else if (isallday != true && @Model.CM.ismaster == 0 && check("CM_sstime", null, "학습기간을 입력해주세요.")) { }
-            else if (@Model.CM.ismaster == 0 && check("CM_setime", null, "학습기간을 입력해주세요.")) { }
+            else if (isallday != true && @Model.CM.ismaster == 0 && check("CM_setime", null, "학습기간을 입력해주세요.")) { }
-            else if (@Model.CM.ismaster == 0 && check("CM_gstime", null, "성적처리기간을 입력해주세요.")) { }
+            else if (isallday != true && @Model.CM.ismaster == 0 && check("CM_gstime", null, "성적처리기간을 입력해주세요.")) { }
-            else if (@Model.CM.ismaster == 0 && check("CM_getime", null, "성적처리기간을 입력해주세요.")) { }
+            else if (isallday != true && @Model.CM.ismaster == 0 && check("CM_getime", null, "성적처리기간을 입력해주세요.")) { }
             else if (@Model.CM.ismaster == 0 && getDouble($("#CM_studytime").val()) < 1) { $("#CM_studytime").focus();  msg("학습시간은 1 ~ 999 사이의 값을 입력해주세요."); }
             else if ($("#cmprdatabox li").length < 1) { $("#cmprdatabox").parent().find("a.data-find").focus(); msg("담당자를 선택해주세요."); }
             //else if ('@Model.CM.pcgcode' == '@ViewBag.TestCode' && '@(Model.CM.cgcode)' != '@ViewBag.TestCode3' && val("CM_certcc") == "") { focus("CM_certcc"); msg("자격증을 선택해주세요.");}
@@ -442,5 +485,5 @@
                 }
             }, t);
         }
-    </script>
+</script>
 }

BO/Views/croom/cmlects.cshtml

@@ -10,7 +10,11 @@
             <div class="line line-dashed line-lg pull-in"></div><div class="form-group">
                 <label class="col-sm-4 col-md-2 control-label">신청기간(교육기간)</label>
                 <div class="col-sm-8 col-md-10">
-                    @(Model.CM.rsrename) (@(Model.CM.sssename)) (@(Model.CM.ssseterm)일)
+                    @(Model.CM.rsrename) (@(Model.CM.sssename))
+                    @if (Model.CM.retimeymd != "2099-12-31")
+                    {
+                        <span>(@(Model.CM.ssseterm)일)</span>
+                    }
                 </div>
             </div>
             <div class="line line-dashed line-lg pull-in"></div><div class="form-group">
@@ -74,7 +78,7 @@
                             <td>@d.rnorvt</td>
                             <td>@d.asname</td>
                             <td>@(d.cnoname)(@d.cnoid)</td>
-                        <td class="link text-center"><a href="#" onclick="viewlect(this, @d.ustatus, @d.lectno, @d.fileno, '@d.fileurl', '@d.orgname', @d.status, @d.pstatus,'@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}:{7}:{8}:{9}:{10}",d.asname??"",d.username, d.userid??"", d.uduty??"", d.depart??"", d.email, d.telno, d.mobile,d.ckfcfyear,d.assignuser,d.edus)')">@d.username</a>@Html.Raw(string.IsNullOrEmpty(d.fileurl) ? "" : ("<a href=\"/aCommon/DownFile?fno=" + d.fileno + "&loginfo=\"> <i class=\"fa fa-paperclip\"></i></a>"))</td>
+                            <td class="link text-center"><a href="#" onclick="viewlect(this, @d.ustatus, @d.lectno, @d.fileno, '@d.fileurl', '@d.orgname', @d.status, @d.pstatus,@d.rstatus,'@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}:{7}:{8}:{9}:{10}:{11}:{12}",d.asname??"",d.username, d.userid??"", d.uduty??"", d.depart??"", d.email, d.telno, d.mobile,d.ckfcfyear,d.assignuser,d.edus,d.sdate==null?"":d.sdate.Value.ToString("yyyy-MM-dd"),d.edate==null?"":d.edate.Value.ToString("yyyy-MM-dd"))')">@d.username</a>@Html.Raw(string.IsNullOrEmpty(d.fileurl) ? "" : ("<a href=\"/aCommon/DownFile?fno=" + d.fileno + "&loginfo=\"> <i class=\"fa fa-paperclip\"></i></a>"))</td>
                             <td>@d.cdtymd</td>
                             <td>@d.statusname</td>
                             <td class="link text-center"><a href="#" onclick="viewrefund(@d.payno, @d.pstatus, @d.payuserno)">@d.pstatusname</a></td>
@@ -97,7 +101,7 @@
 <form id="dform" method="post" action="/croom/lectcms">
     @Html.Partial("./Partial/DForm", Model, new ViewDataDictionary { { "preform", 1 } })
 </form>
-<div id="thisbox" class="findbox draggable regbox" style="width: 500px; z-index: 1041; top: 60px; overflow: auto;">
+<div id="thisbox" class="findbox draggable regbox" style="width: 600px; z-index: 1041; top: 60px; overflow: auto;">
     <h4><i class="fa fa-bars"></i> <span id="pcap">교육생 정보</span><a href="#" class="btn btn-default btn-xs f-r closethisbox">닫기</a></h4>
     <table class="regtable">
         <colgroup><col style="width:150px;" /><col /></colgroup>
@@ -113,6 +117,7 @@
         @*<tr><th>회사전화번호</th><td id="telno"></td></tr>*@
         <tr><th>휴대전화번호</th><td id="mobile"></td></tr>
         @*<tr><th>연합회 교육이력</th><td id="edus"></td></tr>*@
+        <tr><th>교육기간</th><td>@Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "sdate" } }) ~ @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "edate" } })<a href="#" id="btnchange" class="btn btn-info" onclick="change();">저장</a></td></tr>
         <tr class="trhidebox" style="@(Model.CM.certcc == null ? "display: none;":"")"><th>경력증명서</th><td id="filelist"></td></tr>
         <tr class="trhidebox" style="@(Model.CM.certcc == null ? "display: none;":"")"><th>심사여부</th><td>@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "3:신청중;4:승인;5:미승인" }, { "checked", 3 }, { "name", "status" } })</td></tr>
     </table>
@@ -138,17 +143,32 @@
 </div>
 @section styles{
     <style type="text/css">
-        #changelist {border: 1px solid #ddd; padding: 15px 20px; max-height: 250px; overflow: auto;}
+        #changelist {
-        #changelist li {padding: 3px;}
+            border: 1px solid #ddd;
-        #changelist li:hover {background-color: #ddd;}
+            padding: 15px 20px;
-        #changelist li a{text-decoration: underline;}
+            max-height: 250px;
+            overflow: auto;
+        }
+
+            #changelist li {
+                padding: 3px;
+            }
+
+                #changelist li:hover {
+                    background-color: #ddd;
+                }
+
+                #changelist li a {
+                    text-decoration: underline;
+                }
     </style>
 }
 @section scriptsHeader{
     @Html.Partial("./Partial/semscript")
+    @Html.Partial("./Partial/ScriptDate")
 }
 @section scripts{
-<script>
+    <script>
     var selectedLectno;
     var selectedCmisno;
     $(document).ready(function () {
@@ -178,10 +198,12 @@
     }
     var _lectno;
     var _pstatus;
-    function viewlect(a, ustatus, lectno, fileno, fileurl, orgname, status,pstatus, datas) {
+    var _rstatus;
+    function viewlect(a, ustatus, lectno, fileno, fileurl, orgname, status,pstatus,rstatus, datas) {
         if (ustatus != 99) {
             _lectno = lectno;
             _pstatus = pstatus;
+            _rstatus = rstatus;
             var ds = datas.split(':');
             $("#asname").text(ds[0]);
             $("#assignuser").text(ds[8]);
@@ -191,6 +213,8 @@
             $("#email").text(ds[5]);
             $("#telno").text(ds[6]);
             $("#mobile").text(ds[7]);
+            $("#sdate").val(ds[11]);
+            $("#edate").val(ds[12]);
             $("#edus").text("");
             if (!isnulloremt(String(ds[10]))) {
                 if (String(ds[10]).substr(0, 1) != "0") { $("#edus").append("| 공정거래일반:" + String(ds[10]).substr(0, 1) + "회 | " + "<br/>") }
@@ -214,6 +238,22 @@
             }
         }
     }
+    function change() {
+        if (($("#sdate").val == null) || ($("#edate").val == null)) {
+            msg2("교육기간을 입력한 후 저장해주세요.");
+        } else if (confirm("교육기간을 수정하시겠습니까?")) {
+            capp("/acommon/lectsedatechange", { lectno: _lectno, sdate: $("#sdate").val(), edate: $("#edate").val(), pstatus: _pstatus, rstatus: _rstatus }, "cbsedatechange", null, null, null, true);
+        }
+    }
+    function cbsedatechange() {
+        if (capResult.code == 1000) {
+            msg2("상태를 변경했습니다.", null, null, null, true);
+            submit("mform", 500, true);
+        } else if (capResult.code == -1) {
+            msg("결제가 완료가 아닌 대상은 상태를 변경할 수 없습니다.");
+            $("#thisbox").slideUp('fast'); $('#bglayer').hide();
+        }
+    }
     function save() {
         if ($("#status3").prop("checked")) {
             msg2("승인 또는 미승인을 선택 후 저장해주세요.");
@@ -351,5 +391,5 @@
             return;
         }
     }
-</script>
+    </script>
 }

Base/Controller/ACommonCM.cs

@@ -115,6 +115,16 @@ namespace NP.Base.Controllers
                 vm.CM.retime = Convert.ToDateTime(vm.CM.retimeymd + " 23:59:59");
                 vm.CM.setime = Convert.ToDateTime(vm.CM.setimeymd + " 23:59:59");
                 vm.CM.getime = Convert.ToDateTime(vm.CM.getimeymd + " 23:59:59");
+                if (vm.CM.retimeymd == "2099-12-31")
+                {
+                    vm.CM.sstime = null;
+                    vm.CM.setime = null;
+                }
+                if (vm.CM.retime.Value.ToString("yyyyMMdd") == "20991231")
+                {
+                    vm.CM.rstime = Convert.ToDateTime(DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd 00:00:00"));
+                    vm.CM.gstime = Convert.ToDateTime(DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd 00:00:00"));
+                }
             }
             if (vm.CM.isrefund == 0)
             {

Base/Controller/ACommonCRoom.cs

@@ -23,6 +23,15 @@ namespace NP.Base.Controllers
             return JsonOK(1);
         }
         [HttpPost]
+        public JsonResult LectSEDateChange(Int64 lectno, string sdate, string edate, int pstatus, int rstatus)
+        {
+            if (pstatus != 1 || rstatus != 0)
+            {
+                return JsonBack(new JsonRtn() { code = -1 });
+            }
+            return JsonOK(Dao.Save("lect.sedate.change", new Hashtable() { { "lectno", lectno }, { "sdate", sdate }, { "edate", edate + " 23:59:59" }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } }));
+        }
+        [HttpPost]
         public JsonResult LectStatus(Int64 lectno, int status,int pstatus)
         {
             if(pstatus == 1)

Dao/MyBatis/Maps/CM.xml

@@ -122,7 +122,7 @@
                         ,a.tmno,a.classno,a.rstime,a.retime,a.sstime,a.setime,a.gstime,a.getime
                         ,a.cshape,a.infee,a.outfee,a.quota,a.accommofee
                         ,a.introhtml,a.targethtml,a.goalhtml,a.contenthtml
-                        ,a.studytime,a.studyplace,a.certcc,a.certgradecc,a.jobcc,a.jobpositiongrade,a.difficulty,a.isrefund,a.isuse,a.isseq,a.fgnocm
+                        ,a.studytime,a.studyplace,a.certcc,a.certgradecc,a.jobcc,a.jobpositiongrade,a.difficulty,a.isrefund,a.isuse,a.isseq,a.fgnocm,a.studydays
                         ,a.typeman,a.typeedu,a.typegrade,a.typejob,a.iscertificate
                         ,b.pcgno,b.cgcode cgcode
                         ,b.cgname,c.cgname pcgname
@@ -130,8 +130,9 @@
                         ,t.tyear,t.tseq
                         ,d.cname pcname
                         ,e.ccode,e.cname studyplacename
-                        ,f.cnt lectcnt
+                        ,(select count(l.lectno) cnt from lect l where l.cmno = a.cmno and l.status =1  and l.ischanged=0) lectcnt
                         ,a.ischkatt
+                        ,case when date_format(a.retime,'%Y%m%d') = '20991231' then 1 else 0 end isalldays
                     ,a.cdt,a.udt
                     ,a.cmno value,a.cname text
                     ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">a.udt desc</isNull>) rno
@@ -142,7 +143,6 @@
                 left outer join term t on t.tmno=a.tmno
                 left outer join cm d on a.ismaster=0 and d.cmno=a.pcmno
                 left outer join comcode e on a.studyplace = e.ccode
-                left outer join (select count(a.lectno) cnt from lect a where a.cmno=#cmno# and a.status =1  and a.ischanged=0) f on 1 = 1
                 where a.isdel=0
                     <isNotNull property="cmno">and a.cmno=#cmno#</isNotNull>
                     <isNotNull property="notcmno">and a.cmno &lt;&gt; #notcmno#</isNotNull>
@@ -159,7 +159,7 @@
                     <isNotEmpty property="cname">and a.cname like concat('%',#cname#,'%')</isNotEmpty>
                     <isNotNull property="ismaster">and a.ismaster=#ismaster#</isNotNull>
                     <isNotNull property="ismaster02">and a.ismaster in (0,2)</isNotNull>
-                    <isNotNull property="isuse" prepend="and">a.isuse=#isuse#</isNotNull>
+                    <isNotNull property="isuse">and a.isuse=#isuse#</isNotNull>
                     <isNotNull property="tyear" prepend="and">t.tyear=#tyear#</isNotNull>
                     <isNotNull property="tseq" prepend="and">t.tseq=#tseq#</isNotNull>
                     <isNotNull property="tmno" prepend="and">a.tmno=#tmno#</isNotNull>
@@ -167,12 +167,13 @@
                     <isNotNull property="sstime" prepend="and">a.sstime &gt;= #sstime#</isNotNull>
                     <isNotNull property="setime" prepend="and">a.setime &lt;= #setime#</isNotNull>
                     <isNotNull property="cgcode">and b.cgcode=#cgcode#</isNotNull>
+                    <isNotNull property="iscurrent">and (date_format(a.retime,'%Y%m%d') != '20991231' and a.rstime &lt; now() and a.getime &gt; now()) or  date_format(a.retime,'%Y%m%d') = '20991231' and a.isuse=#isuse#</isNotNull>
             ) a
             <include refid="sql.pagedynamic"></include>
-            order by a.rno
+            order by <isNotNull property="isindex">a.isalldays, </isNotNull>a.rno
         </select>
         <select id="cm.cm" parameterClass="hashtable" resultClass="cm">
-            select a.cmno,a.cshape,a.cname,a.classno,a.rstime,a.retime,a.sstime,a.setime,a.certcc,a.cgno,a.quota
+            select a.cmno,a.cshape,a.cname,a.classno,a.rstime,a.retime,a.sstime,a.setime,a.certcc,a.cgno,a.quota,a.studydays
                 ,b.tyear,b.tseq,a.isrefund
                 ,a3.cgcode pcgcode
                 ,e.countlect,e.countstandby
@@ -282,6 +283,7 @@
           ,typejob              =#typejob#
           ,iscertificate        =#iscertificate#
           ,ischkatt             =#ischkatt#
+          ,studydays            =#studydays#
           where cmno=#cmno#
         </update>
         <update id="cm.data.delete" parameterClass="hashtable">

Dao/MyBatis/Maps/Lect.xml

@@ -89,7 +89,8 @@
             order by b.username
         </select>
         <select id="lect.cms" parameterClass="hashtable" resultClass="cm">
-          select a.cmno,c.tyear,c.tseq,d.cgname,b.quota,b.cshape,b.cname,b.classno,b.rstime,b.retime,a.countlect,a.countstandby,a.rno,a.pagetotalcount,a.countnoresult,a.countfail,a.countcomplete,a.countsuccess,a.countstanbypay,a.countstanbydraw,a.countstanbyaccept
+          select 
+          a.cmno,c.tyear,c.tseq,d.cgname,b.quota,b.cshape,b.cname,b.classno,b.rstime,b.retime,a.countlect,a.countstandby,a.rno,a.pagetotalcount,a.countnoresult,a.countfail,a.countcomplete,a.countsuccess,a.countstanbypay,a.countstanbydraw,a.countstanbyaccept,b.studydays
           from (
             select a.cmno,a.countlect,a.countstandby,a.rno,a.pagetotalcount,a.countnoresult,a.countfail,a.countcomplete,a.countsuccess,a.countstanbypay,a.countstanbydraw,a.countstanbyaccept
             from (
@@ -153,7 +154,8 @@
             ,cc.cname ccpositionname
             ,c.pstatus,c.payno,c.userno payuserno
             ,b.rstatus
-            ,a2.rstime,a2.retime,a2.sstime,a2.setime,a2.cshape
+            ,a2.rstime,a2.retime,a2.sstime,a2.setime,a2.cshape,a2.studydays
+            ,a.sdate,a.edate
             ,scd.estart,scd.eend
             ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">a.payno,a.pino</isNull>) rno
             ,count(a.cdt) over() pagetotalcount
@@ -215,6 +217,9 @@
             and a.ischanged=0
             order by rno
         </select>
+      <update id="lect.sedate.change" parameterClass="hashtable">
+        update lect set <include refid="sql.up"></include>,sdate =#sdate#,edate=#edate# where lectno=#lectno# and status = 1
+      </update>
         <update id="lect.status" parameterClass="hashtable">
             update lect set <include refid="sql.up"></include>,status=#status#,oktime=case when oktime is null and #status# = 4 and status&lt;&gt;4 then now() else oktime end where lectno=#lectno# and status in (3,4,5);
             <isGreaterThan property="status" compareValue="3">

Model/CM.cs

@@ -156,7 +156,7 @@ namespace NP.Model
         {
             get
             {
-                return rstime == null && retime == null ? "" : string.Format("{0} ~ {1}", rstime == null ? "" : rstime.Value.ToString("yyyy-MM-dd"), retime == null ? "" : retime.Value.ToString("yyyy-MM-dd"));
+                return retimeymd == "2099-12-31" ? string.Format("신청일로부터 {0} 일", Convert.ToInt32(studydays)) : rstime == null && retime == null ? "" : string.Format("{0} ~ {1}", rstime == null ? "" : rstime.Value.ToString("yyyy-MM-dd"), retime == null ? "" : retime.Value.ToString("yyyy-MM-dd"));
             }
         }
 
@@ -227,21 +227,28 @@ namespace NP.Model
         {
             get
             {
-                return sstime == null || setime == null ? 0 : (Convert.ToInt32((setime.Value - sstime.Value).TotalDays) + 1);
+                return retimeymd == "2099-12-31" ? Convert.ToInt32(studydays) : sstime == null || setime == null ? 0 : (Convert.ToInt32((setime.Value - sstime.Value).TotalDays) + 1);
+            }
+        }
+        public String sssetermname
+        {
+            get
+            {
+                return retimeymd == "2099-12-31" ? Convert.ToInt32(studydays) + " 일" : sstime == null && setime == null ? "" : string.Format("{0}~{1}", sstime == null ? "" : sstime.Value.ToString("yyyy-MM-dd"), setime == null ? "" : setime.Value.ToString("yyyy-MM-dd"));
             }
         }
         public String sssename
         {
             get
             {
-                return sstime == null && setime == null ? "" : string.Format("{0}~{1}", sstime == null ? "" : sstime.Value.ToString("yy.MM.dd"), setime == null ? "" : setime.Value.ToString("yy.MM.dd"));
+                return retimeymd == "2099-12-31" ? "상시" : sstime == null && setime == null ? "" : string.Format("{0}~{1}", sstime == null ? "" : sstime.Value.ToString("yy.MM.dd"), setime == null ? "" : setime.Value.ToString("yy.MM.dd"));
             }
         }
         public String sssename2
         {
             get
             {
-                return sstime == null && setime == null ? "" : string.Format("{0}~{1}", sstime == null ? "" : sstime.Value.ToString("yyyy-MM-dd"), setime == null ? "" : setime.Value.ToString("yyyy-MM-dd"));
+                return retimeymd == "2099-12-31" ? "" : sstime == null && setime == null ? "" : string.Format("{0}~{1}", sstime == null ? "" : sstime.Value.ToString("yyyy-MM-dd"), setime == null ? "" : setime.Value.ToString("yyyy-MM-dd"));
             }
         }
         public String sssename3
@@ -251,6 +258,7 @@ namespace NP.Model
                 return sstime == null && setime == null ? "" : string.Format("{0}~{1}", sstime == null ? "" : sstime.Value.ToString("yyyy.MM.dd"), setime == null ? "" : setime.Value.ToString("yyyy.MM.dd"));
             }
         }
+        public Double? studydays { get; set; }
         /// <summary>
         /// 성적처리시작
         /// </summary>
@@ -1014,6 +1022,8 @@ namespace NP.Model
         public DateTime payoktime { get; set; }
         public DateTime? stime { get; set; }
         public DateTime? etime { get; set; }
+        public DateTime? sdate { get; set; }
+        public DateTime? edate { get; set; }
         public String sip { get; set; }
         public String eip { get; set; }
         public int ispaied { get; set; }