From 303b9dbcff3e7136bf492d7c926873800de56c78 Mon Sep 17 00:00:00 2001 From: lch Date: Mon, 28 Jun 2021 08:16:10 +0000 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90>=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=EC=9A=B4=EC=98=81>=EC=84=B1=EC=A0=81=EC=B2=98=EB=A6=AC=20(?= =?UTF-8?q?=EC=88=98=EB=A3=8C=EC=B2=98=EB=A6=AC=20=EB=B2=84=ED=8A=BC?= =?UTF-8?q?=EB=AA=85=EC=B9=AD=EC=9D=84=20=E2=80=98=EC=88=98=EB=A3=8C?= =?UTF-8?q?=ED=99=95=EC=9D=B8=E2=80=99=20=EC=9C=BC=EB=A1=9C=20=EB=B0=94?= =?UTF-8?q?=EA=BE=B8=EA=B3=A0,=20=ED=81=B4=EB=A6=AD=EC=8B=9C=20=EC=88=98?= =?UTF-8?q?=EB=A3=8C=EC=A1=B0=EA=B1=B4=EC=9D=84=20=EA=B2=80=EC=82=AC?= =?UTF-8?q?=ED=95=98=EC=97=AC=20=EC=B6=A9=EC=A1=B1=EC=8B=9C=20=EC=88=98?= =?UTF-8?q?=EB=A3=8C=EC=B2=98=EB=A6=AC.=20=EB=AF=B8=EC=B6=A9=EC=A1=B1?= =?UTF-8?q?=EC=8B=9C=20=EB=AF=B8=EC=88=98=EB=A3=8C=EC=B2=98=EB=A6=AC.=20?= =?UTF-8?q?=EC=88=98=EB=A3=8C=EB=90=9C=20=EC=9D=B8=EC=9B=90=EB=8F=84=20?= =?UTF-8?q?=EA=B0=95=EC=A2=8C=EC=84=A4=EC=A0=95=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=EC=9D=84=20=EB=B0=94=EA=BE=B8=EB=A9=B4=20?= =?UTF-8?q?=EC=88=98=EB=A3=8C=20=E2=86=92=20=EB=AF=B8=EC=88=98=EB=A3=8C=20?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD)"=20=EC=88=98=EB=A3=8C=EC=B7=A8?= =?UTF-8?q?=EC=86=8C=20:=20lect=20->=20iscomplete=20=3D=200,=20completetim?= =?UTF-8?q?e=20=3D=20null=20,=20completeno=20=EB=B3=80=EA=B2=BD=EC=97=86?= =?UTF-8?q?=EC=9D=8C=20=EC=88=98=EB=A3=8C=EC=99=84=EB=A3=8C=20:=20lect=20-?= =?UTF-8?q?>=20iscomplete=20=3D=201,=20completetime=20=3D=20=EC=98=A8?= =?UTF-8?q?=EB=9D=BC=EC=9D=B8=20now=20/=20=EC=98=A4=ED=94=84=EB=9D=BC?= =?UTF-8?q?=EC=9D=B8=20cm.setime=20/=20=ED=98=BC=ED=95=A9=20cminningscd.ee?= =?UTF-8?q?nd,=20completeno=20null=20=EC=9D=BC=EB=95=8C=EB=A7=8C=20?= =?UTF-8?q?=EC=8B=A0=EA=B7=9C=20completeno=EB=A1=9C=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Views/croom/grade0.cshtml | 4 ++-- Base/Controller/ACommonCRoom.cs | 30 ++++++++++++++++++++---------- Dao/MyBatis/Maps/CRoom.xml | 6 +++--- Dao/MyBatis/Maps/Grade.xml | 13 ++++++++++--- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/BO/Views/croom/grade0.cshtml b/BO/Views/croom/grade0.cshtml index ae4f41c..caa959e 100644 --- a/BO/Views/croom/grade0.cshtml +++ b/BO/Views/croom/grade0.cshtml @@ -69,7 +69,7 @@     @if (Model.IsAdmin) { - 수료처리 + 수료확인 if (!ViewBag.IsSubAdmin96) { 강제수료처리 @@ -189,7 +189,7 @@ } function cbsave() { if (capResult.code == 1000) { - msgf(capResult.obj + "건을 수료 처리했습니다.", "submit('mform', 0, true)"); + msgf(capResult.obj.completecount + "건을 수료, " + capResult.obj.cancelcount + "건을 미수료 처리했습니다.", "submit('mform', 0, true)"); } else { msgdev(); } diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index 1df4f81..efb0874 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -392,18 +392,28 @@ namespace NP.Base.Controllers } lectnos = string.Join(",", Dao.Get("grade.nocompletelectcm", cmnos).Select(s => s.lectno)); } - var Lects2 = Dao.Get("grade.nocompletelect", lectnos).Where(w => w.iscomplete != 1 && lectnos.Contains(w.lectno.ToString())).ToList(); - if (Lects2.Count() > 0) + var lects = Dao.Get("grade.nocompletelect", lectnos).Where(w => lectnos.Contains(w.lectno.ToString())); + var completecount = 0; + var cancelcount = 0; + foreach (var lect in lects) { - lectnos = string.Join(",", Lects2.Select(s => s.lectno)); - var data2 = new Lect() { uno = SUserInfo.UserNo, uip = GetUserIP(), cmno = Convert.ToInt32(cmno), cmnos = cmnos, lectnos = lectnos }; - return JsonOK(Dao.Save("grade.lectcomplete2", new Hashtable() { { "cmno", cmno }, { "cmnos", cmnos }, { "lectnos", lectnos }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } })); + var ispass = Dao.Get("grade.ispass", new Hashtable() { { "lectno", lect.lectno } }).FirstOrDefault().ispass; + if (ispass == 1) + { + 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 - { - return JsonBack(new JsonRtn() { code = 1, msg = "이미 수료된 데이터는 다시 수료할 수 없습니다." }); - } - //return JsonOK(Dao.Save("grade.lectcomplete", new Hashtable() { { "cmno", cmno }, { "cmnos", cmnos }, { "lectnos", lectnos }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } })); + return JsonBack(new JsonRtn() { code = 1000, msg = "OK", obj = new { completecount , cancelcount } }); } [HttpPost] public JsonResult CMInningGetForOff(Int64 cmino) diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index 8b329dc..1819d38 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -1583,9 +1583,9 @@ ,birthday=HEX(AES_ENCRYPT(#birthday#, )) where userno=#userno#; - update lect - set - ,iscomplete=#iscomplete# + update lect + set + ,iscomplete=#iscomplete#,completetime=null ,sdate=#sdate# ,edate=#edate# where lectno=#lectno# and userno=#userno#; diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml index 15cb434..63afe33 100644 --- a/Dao/MyBatis/Maps/Grade.xml +++ b/Dao/MyBatis/Maps/Grade.xml @@ -351,7 +351,7 @@ ,l.uip= #uip# ,l.iscomplete=1 ,l.completetime=b.completetime - ,l.completeno = b.completeno + ,l.completeno = case when l.completeno is not null then l.completeno else b.completeno end where l.lectno = b.lectno @@ -405,8 +405,8 @@ ,a.spoint=b.spoint ,a.dpoint=b.dpoint ,a.tpoint=b.apoint+b.mpoint+b.fpoint+b.spoint+b.dpoint - ,a.completetime = case when b.ispass = 1 then else null end - ,a.completeno = case when b.ispass = 1 then c.completeno else null end + ,a.completetime = case when b.ispass = 1 then c.completetime else null end + ,a.completeno = case when a.completeno is not null then a.completeno else case when b.ispass = 1 then c.completeno else null end end where a.status=1 and a.ischanged=0 and a.lectno = c.lectno and a.cmno = #cmno# @@ -414,6 +414,13 @@ and a.cmno in ($cmnos$) and a.lectno in ($lectnos$) + + update lect + set + ,iscomplete=0 + ,completetime=null + where lectno=#lectno# +