diff --git a/Base/Controller/FOCommon.cs b/Base/Controller/FOCommon.cs index bd4704e..9efc879 100644 --- a/Base/Controller/FOCommon.cs +++ b/Base/Controller/FOCommon.cs @@ -353,10 +353,10 @@ namespace NP.Base.Controllers { return JsonBack(new JsonRtn() { code = 1000, obj = -2 }); } - else if (cmi.isrebate == 1) + else { var intval = Dao.Get("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", lectno }, { "isfinishtoday", 1 } }).Count(); - if (intval > 5 && cmi.istatus < 2) + if (intval > 7 && cmi.istatus < 2) { return JsonBack(new JsonRtn() { code = 1000, obj = -3 }); } diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index f22fa8c..8318b83 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -251,9 +251,8 @@ and p.pseq=#pseq# and p.cpno=#cpno# and p.pseq=li.pseq - inner join lect b on b.lectno=#lectno# and b.userno=#userno# and b.cmno=a.cmno and b.status=1 and b.ischanged=0 and b.sdate < now() - - where a.cmino=#cmino# + inner join lect b on b.lectno=#lectno# and b.userno=#userno# and b.cmno=a.cmno and b.status=1 and b.ischanged=0 + where a.cmino=#cmino# and b.sdate < now() and b.edate > now() SELECT last_insert_id()