<신규개발>

(주요)작업내용 : 성적업로드 일괄업로드 수정

BO/Controllers/croomController.cs

@@ -859,6 +859,7 @@ namespace NP.BO.Controllers
                         {
                             ht.Add("extype", vm.tabidx == 2 ? 0 : 1);
                             ht.Add("estate", vm.addstringval2);
+                            ht.Add("isbyadmin", vm.addstringval3);
                             vm.LectEXes = Dao.Get<LectEX>("lect.lectexes.all", ht);
                             if (vm.isexceldown == 1)
                             {

BO/Views/Shared/Partial/PageRow.cshtml

@@ -4,8 +4,9 @@
     var searchmethod = (ViewData["searchmethod"] ?? "").ToString();
     var pageSize = (int)(ViewData["pagesize"] ?? 0);
     var isright = (int)(ViewData["right"] ?? 0);
+    var style = (ViewData["style"] ?? "vertical-align: middle;").ToString();
 }
-<select onchange="javascript:rcchange(this)" class="form-control dev @(isright>0?"f-r":"")" data-tbodyid="@tbodyid" data-scmethod="@searchmethod" name="pagerowcount" style="vertical-align: middle;">
+<select onchange="javascript:rcchange(this)" class="form-control dev @(isright>0?"f-r":"")" data-tbodyid="@tbodyid" data-scmethod="@searchmethod" name="pagerowcount" style="@style">
 @*    <option value="10" @(pageSize == 10 ? "selected" : "")>10개 출력</option>
     <option value="20" @(pageSize == 20 ? "selected" : "")>20개 출력</option>
     <option value="50" @(pageSize == 50 ? "selected" : "")>50개 출력</option>*@

BO/Views/croom/gradeall2.cshtml

@@ -7,7 +7,8 @@
     <section class="panel panel-default">
         <div style="padding: 10px 10px">
             @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-응시상태;2:응시완료;1:응시중;0:미응시" }, { "name", "addstringval2" }, { "selected", Model.addstringval2 }, { "onchange", "submit()" } })
-            @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
+            @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-점수종류;0:수강생응시;1:관리자등록;-1:미응시" }, { "name", "addstringval3" }, { "selected", Model.addstringval3 }, { "onchange", "submit()" } })
+            @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount }, { "style", ""} })
             @*<a href="#" onclick="javascript:exceldown('mform', '/croom/gradeall', 'tbody1', '성적처리평가');" class="btn btn-s-xs btn-success" style="margin-left: 5px; float:right;">엑셀다운로드</a>*@
             <a href="#" onclick="javascript:callComment('mform', '/croom/gradeall', 'tbody1', '성적처리평가');" class="btn btn-s-xs btn-success" style="margin-left: 5px; float:right;">엑셀다운로드</a>
             @Html.Partial("./Partial/sembtns", "#tbody1;" + (Model.IsAdmin ? "1;1;1" : "0;0;0") + ";1;right;평가안내")

Base/Controller/ACommon.cs

@@ -1935,12 +1935,6 @@ namespace NP.Base.Controllers
                                             if (lectexs.Count == 1)
                                             {                                                 
                                                 var lectex = lectexs.First();
-                                                if (lectex.tpoint < lect.tpoint)
-                                                {
-                                                    lect.value += ",평가점수오입력(초과)";
-                                                }
-                                                else
-                                                {   
                                                 lect.cmno = lectex.cmno;
                                                 lect.cname = lectex.cname;
                                                 lect.lectno = lectex.lectno;
@@ -1948,6 +1942,10 @@ namespace NP.Base.Controllers
                                                 lect.iscomplete = lectex.iscomplete;
                                                 lect.exno = lectex.exno;
                                                 lect.exname = lectex.exname;
+
+                                                if (lectex.tpoint < lect.tpoint)
+                                                {
+                                                    lect.value += ",평가점수오입력(초과)";
                                                 }
                                             }
                                             else

Dao/MyBatis/Maps/Lect.xml

@@ -1134,6 +1134,11 @@
           <isEqual property="attendance" compareValue="4" prepend="and">ifnull(ce.isoffabs,0) = 1 and ifnull(li.istatus,-1) = 2</isEqual>
           <!--결석-->
           <isEqual property="attendance" compareValue="5" prepend="and">ifnull(ce.isoffabs,0) = 1 and ifnull(li.istatus,-1) = 0</isEqual>
+        </isNotNull>
+		<isNotNull property="isbyadmin">
+			<isEqual property="isbyadmin" compareValue="-1" prepend="and">(c.isbyadmin = 0 or c.isbyadmin is null) and c.estart is null</isEqual>
+			<isEqual property="isbyadmin" compareValue="0" prepend="and">c.isbyadmin = 0 and c.estart is not null</isEqual>
+			<isEqual property="isbyadmin" compareValue="1" prepend="and">c.isbyadmin = 1</isEqual>
 		</isNotNull>
 			) a
 			<include refid="sql.pagedynamic"></include>

Model/CM.cs

@@ -3687,7 +3687,7 @@ namespace NP.Model
         {
             get
             {
-                return isbyadmin == 1 ? "관리자등록" : "수강생응시";
+                return isbyadmin == 1 ? "관리자등록" : estart == null ? "미응시" : "수강생응시";
             }
         }
     }