From 244a110a02ed6da04327804fc4512992112ada9f Mon Sep 17 00:00:00 2001
From: jity7777 <jity7777  @example.com>
Date: Mon, 12 Jun 2023 06:09:20 +0000
Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?=
 =?UTF-8?q?MS=20NO=20:=208004=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=EB=82=B4=EC=9A=A9=20(1)BO/Controllers/croomController?=
 =?UTF-8?q?.cs=20=20-=20=EC=B1=84=EC=A0=90=EC=99=84=EB=A3=8C=20=ED=95=AD?=
 =?UTF-8?q?=EB=AA=A9=20=ED=8C=8C=EB=9D=BC=EB=A9=94=ED=84=B0=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20(2)=20BO/Views/croom/gradeall4.cshtml=20=20-=20?=
 =?UTF-8?q?=EC=B1=84=EC=A0=90=EC=99=84=EB=A3=8C=20=ED=95=AD=EB=AA=A9=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1=20(3)=20Dao/MyBatis/Maps/Lect.xml=20=20-=20?=
 =?UTF-8?q?=EC=B1=84=EC=A0=90=20=EC=99=84=EB=A3=8C=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=ED=95=AD=EB=AA=A9=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=BF=BC?=
 =?UTF-8?q?=EB=A6=AC=20=EA=B5=AC=EB=AC=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/Controllers/croomController.cs | 1 +
 BO/Views/croom/gradeall4.cshtml   | 7 +++++--
 Dao/MyBatis/Maps/Lect.xml         | 5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index 3ef4948..e2e2aee 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -876,6 +876,7 @@ namespace NP.BO.Controllers
                             ht.Add("sdtype", 0);
                             vm.LectSDs = new List<LectSD>() { };
                             ht.Add("sdstate", vm.addstringval2);
+                            ht.Add("cpointchk", vm.addstringval3);
                             ht.Add("isproduct" + (GetConfig("isstaging") == "1" ? "x" : ""), 1);
                             vm.LectSDs = Dao.Get<LectSD>("lect.lectsds.all", ht);
                             /*to-do*/
diff --git a/BO/Views/croom/gradeall4.cshtml b/BO/Views/croom/gradeall4.cshtml
index 98f3792..46fcf88 100644
--- a/BO/Views/croom/gradeall4.cshtml
+++ b/BO/Views/croom/gradeall4.cshtml
@@ -5,7 +5,8 @@
 <form id="mform" method="post">
     <section class="panel panel-default">
         <div style="padding: 10px 10px">
-            @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-응시상태;1:제출;0:미제출" }, { "name", "addstringval2" }, { "selected", Model.addstringval2 }, { "onchange", "findme()" } })
+            @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-응시상태;1:제출;0:미제출" }, { "name", "addstringval2" }, { "selected", Model.addstringval2 }, { "onchange", "findme()" }, { "style", "vertical-align: middle;" } })
+            @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-채점상태;1:채점완료;0:미채점" }, { "name", "addstringval3" }, { "selected", Model.addstringval3 }, { "onchange", "findme()" }, { "style", "vertical-align: middle;" } })
             @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
             @*<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>
@@ -209,6 +210,7 @@
 <script>
     var ischange = false;
     $(document).ready(function () {
+    /*    $("[name='pagerowcount']").css("vertical-align", "");*/
         $("body").on("click", "td.qi div.imgbox", function () {
             $(this).toggleClass("active");
         });
@@ -218,7 +220,8 @@
 
     });
     function findme() {
-        bglayer(); submit();
+        bglayer();
+        submit();
     }
     var _isprenext = false;
     function getsds(isprenext) {
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 739e417..78a6474 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1503,6 +1503,11 @@
       <isNotNull property="ustatus">
         <isNotEmpty property="ustatus">and d.status = #ustatus#</isNotEmpty>
       </isNotNull>
+        <isNotNull property="cpointchk">
+          <isEqual property="cpointchk" compareValue="0">and ifnull(c.cpoint,0) = 0</isEqual>
+          <isEqual property="cpointchk" compareValue="1">and ifnull(c.cpoint,0) > 0</isEqual>
+          <isNotEmpty property="ustatus">and d.status = #ustatus#</isNotEmpty>
+        </isNotNull>
         
         <isNotNull property="attendance" >
           <!--해당없음-->