From b8d1758fc5345afd2b67c067d5cfe9fd5ae0168e Mon Sep 17 00:00:00 2001 From: jity7777 Date: Thu, 28 Mar 2024 23:58:00 +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:=204541=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)=20=ED=9A=8C=EC=9B=90=EC=83=81?= =?UTF-8?q?=ED=83=9C=20(9=EB=A1=9C=20=EB=B3=80=EA=B2=BD)=20=EB=90=9C?= =?UTF-8?q?=EA=B1=B4=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=EC=88=98?= =?UTF-8?q?=EB=A3=8C=ED=99=95=EC=9D=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Views/Shared/Partial/MobileChk.cshtml | 2 +- BO/Web.config | 4 ++-- Base/Controller/ACommonCRoom.cs | 25 +++++++++++++++--------- Dao/MyBatis/Maps/Grade.xml | 24 +++++++++++------------ 4 files changed, 31 insertions(+), 24 deletions(-) diff --git a/BO/Views/Shared/Partial/MobileChk.cshtml b/BO/Views/Shared/Partial/MobileChk.cshtml index dc682d0..b8b4678 100644 --- a/BO/Views/Shared/Partial/MobileChk.cshtml +++ b/BO/Views/Shared/Partial/MobileChk.cshtml @@ -119,6 +119,6 @@ focus("mobile_lakey"); return; } - capp("/aocommon/chklakey", { lakey: $("#mobile_lakey").val(), authno: authno }, "@( )"); + capp("/aocommon/chklakey", { lakey: $("#mobile_lakey").val(), authno: authno }, "@(_method)"); } \ No newline at end of file diff --git a/BO/Web.config b/BO/Web.config index c55e7fe..5c83003 100644 --- a/BO/Web.config +++ b/BO/Web.config @@ -56,9 +56,9 @@ - + - + diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index 336d1cb..446534c 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -513,20 +513,27 @@ namespace NP.Base.Controllers var cancelcount = 0; foreach (var lect in lects) { - var ispass = Dao.Get("grade.ispass", new Hashtable() { { "lectno", lect.lectno } }).FirstOrDefault().ispass; - if (ispass == 1) + try { - if (lect.iscomplete == 0) + var ispass = Dao.Get("grade.ispass", new Hashtable() { { "lectno", lect.lectno } }).FirstOrDefault().ispass; + if (ispass == 1) { - completecount += Dao.Save("grade.lectcomplete2", new Hashtable() { { "lectno", lect.lectno }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } }); + if (lect.iscomplete == 0) + { + completecount += Dao.Save("grade.lectcomplete2", new Hashtable() { { "lectno", lect.lectno }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } }); + } + } + else + { + if (lect.iscomplete == 1) + { + cancelcount += Dao.Save("grade.lectcomplete.cancel", new Hashtable() { { "lectno", lect.lectno }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } }); + } } } - else + catch { - if (lect.iscomplete == 1) - { - cancelcount += Dao.Save("grade.lectcomplete.cancel", new Hashtable() { { "lectno", lect.lectno }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } }); - } + } } return JsonBack(new JsonRtn() { code = 1000, msg = "OK", obj = new { completecount , cancelcount } }); diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml index 3a38cc1..b4991a9 100644 --- a/Dao/MyBatis/Maps/Grade.xml +++ b/Dao/MyBatis/Maps/Grade.xml @@ -66,8 +66,8 @@ and b.attrate <= #attrateunder# and b.isrebate=#isrebate# and b.lectno in ($lectnos$) - inner join users c on c.userno=b.userno and c.status=1 - and c.userid=#userid# + inner join users c on c.userno=b.userno and c.status < 99 + and c.userid=#userid# and c.username=#username# where a.ismaster=0 and a.cgno=#cgno# @@ -97,8 +97,8 @@ and b.attrate <= #attrateunder# and b.isrebate=#isrebate# and b.lectno in ($lectnos$) - inner join users c on c.userno=b.userno and c.status=1 - and c.userid=#userid# + inner join users c on c.userno=b.userno and c.status < 99 + and c.userid=#userid# and c.username=#username# where a.ismaster=0 and a.cgno=#cgno# @@ -128,8 +128,8 @@ and b.attrate <= #attrateunder# and b.isrebate=#isrebate# and b.lectno in ($lectnos$) - inner join users c on c.userno=b.userno and c.status=1 - and c.userid=#userid# + inner join users c on c.userno=b.userno and c.status < 99 + and c.userid=#userid# and c.username=#username# where a.ismaster=0 and a.cgno=#cgno# @@ -159,8 +159,8 @@ and b.attrate <= #attrateunder# and b.isrebate=#isrebate# and b.lectno in ($lectnos$) - inner join users c on c.userno=b.userno and c.status=1 - and c.userid=#userid# + inner join users c on c.userno=b.userno and c.status < 99 + and c.userid=#userid# and c.username=#username# where a.ismaster=0 and a.cgno=#cgno# @@ -190,8 +190,8 @@ and b.attrate <= #attrateunder# and b.isrebate=#isrebate# and b.lectno in ($lectnos$) - inner join users c on c.userno=b.userno and c.status=1 - and c.userid=#userid# + inner join users c on c.userno=b.userno and c.status < 99 + and c.userid=#userid# and c.username=#username# where a.ismaster=0 and a.cgno=#cgno# @@ -221,8 +221,8 @@ and b.attrate <= #attrateunder# and b.isrebate=#isrebate# and b.lectno in ($lectnos$) - inner join users c on c.userno=b.userno and c.status=1 - and c.userid=#userid# + inner join users c on c.userno=b.userno and c.status < 99 + and c.userid=#userid# and c.username=#username# where a.ismaster=0 and a.cgno=#cgno#