diff --git a/Base/Controller/FOCommon.cs b/Base/Controller/FOCommon.cs index d05ad2d..01e238f 100644 --- a/Base/Controller/FOCommon.cs +++ b/Base/Controller/FOCommon.cs @@ -533,7 +533,7 @@ namespace NP.Base.Controllers isok = 1 }); SaveTalk(us, "alarm"); - //Dao.Insert("common.atalk.send", new Hashtable() { { "senderkey", GetConfig("mastersms").Split(';')[0] },{"method","alarm" }, { "DEST_PHONE", mobile.Replace(" ", "").Replace("-", "") }, { "SEND_PHONE", GetConfig("mastersms").Split(';')[1] },{"title","인증번호" }, { "MSG_BODY", msg },{"replace_type","S" } }); + //Dao.Insert("common.atalk.send", new Hashtable() { { "senderkey", GetConfig("mastersms").Split(';')[0] }, { "method", "alarm" }, { "DEST_PHONE", mobile.Replace(" ", "").Replace("-", "") }, { "SEND_PHONE", GetConfig("mtssendnum").Split(';')[0] }, { "title", "인증번호" }, { "MSG_BODY", msg }, { "replace_type", "S" } }); return JsonOK(sa.authno); } [HttpPost] diff --git a/Dao/DB/DB1.Scheme.txt b/Dao/DB/DB1.Scheme.txt index d344cf1..2ec0968 100644 --- a/Dao/DB/DB1.Scheme.txt +++ b/Dao/DB/DB1.Scheme.txt @@ -1030,6 +1030,9 @@ create table lect ( ,cmisno bigint null ,completetime datetime ,completeno varchar(50) + ,isattcheck tinyint(4) + ,lakey varchar(6) + ,lakey varchar(6) ,sdate datetime ,edate datetime ,cdt datetime not null,cno bigint not NULL,udt datetime not null,uno bigint not NULL,uip varchar(50) not NULL @@ -1472,6 +1475,7 @@ create table kcblog ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; create table smsauth ( + authno bigint(20) auto_increment NOT NULL lectno bigint(20) NOT NULL, latime datetime NOT NULL DEFAULT current_timestamp(), lakey varchar(6) NOT NULL diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index d680693..1e828da 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1305,7 +1305,7 @@ ,cc.ccode studyplace ,cc.cname studyplacename from lect a - inner join cm b on b.cmno=a.cmno and b.sstime < + inner join cm b on b.cmno=a.cmno inner join term c on c.tmno=b.tmno inner join cg d on d.cgno=b.cgno and d.cgcode=#cgcode# @@ -1314,7 +1314,7 @@ left outer join assign ua on ua.asno=u.asno left outer join cminningscd scd on scd.cmisno = a.cmisno left outer join comcode cc on cc.ccode = b.studyplace - where a.userno=#userno# and a.status=1 and a.ischanged=0 + where a.userno=#userno# and a.status=1 and a.ischanged=0 and a.sdate < and b.cshape=#cshape# union all select a.lectno,a.cmno,a.userno,a.isrebate,a.iscomplete diff --git a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache index 2cbd845..ac7f71b 100644 Binary files a/Dao/obj/Debug/Dao.csprojAssemblyReference.cache and b/Dao/obj/Debug/Dao.csprojAssemblyReference.cache differ