KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit is contained in:
hyunho 2020-12-14 04:39:56 +00:00
parent 293b95a01e
commit f4be6ddb90
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dao/MyBatis/Maps/CRoom.xml
View File

@ -162,7 +162,7 @@
,a2.isseq,a2.sstime,a2.setime ,a2.isseq,a2.sstime,a2.setime
,b.cmino,b.iseq,b.isonline,b.ititle,b.sttime,b.idate,b.ist,b.iet,b.icontent ,b.cmino,b.iseq,b.isonline,b.ititle,b.sttime,b.idate,b.ist,b.iet,b.icontent
,cp.istatus preistatus ,cp.istatus preistatus
,c.totstudy,c.istatus,c.stime ,c.totstudy,c.istatus,c.stime, c.lectno existslectinning
,case when b.isonline=1 then d.tfurl else null end tfurl ,case when b.isonline=1 then d.tfurl else null end tfurl
,case when b.isonline=1 then df.fileurl else df3.fileurl end fileurl ,case when b.isonline=1 then df.fileurl else df3.fileurl end fileurl
,case when b.isonline=1 then df.fileno else df3.fileno end fileno ,case when b.isonline=1 then df.fileno else df3.fileno end fileno
@ -185,9 +185,11 @@
<isNotNull property="limit">limit $limit$</isNotNull> <isNotNull property="limit">limit $limit$</isNotNull>
</select> </select>
<select id="cr.lectinnings" parameterClass="hashtable" resultClass="lectinning"> <select id="cr.lectinnings" parameterClass="hashtable" resultClass="lectinning">
select a.lectno,a.cmino select a.lectno,a.cmino,a.finishtime,a.istatus
from lectinning a from lectinning a
where a.lectno=#lectno# <isNotNull property="isfinishtoday">a.istatus=2 and a.finishtime is not null and date_format(a.finishtime, '%y%m%d')=date_format(now(), '%y%m%d')</isNotNull> where a.lectno=#lectno#
<isNotNull property="isfinishtoday">
a.istatus=2 and a.finishtime is not null and date_format(a.finishtime, '%y%m%d')=date_format(now(), '%y%m%d')</isNotNull>
</select> </select>
<insert id="cr.lectinningpage.in" parameterClass="lectinningpage"> <insert id="cr.lectinningpage.in" parameterClass="lectinningpage">
update lectinning a update lectinning a

2
FO/Controllers/CRoomController.cs
View File

@ -36,7 +36,7 @@ namespace NP.FO.Controllers
} }
vm.Datas = Dao.Get<Data>("cr.main.boardalarm", new System.Collections.Hashtable() { { "bmnos", bmnos != null ? bmnos.Substring(1) : bmnos},{ "lect", vm.croomlectno },{ "cmno", vm.croomcmno }, { "lectno", vm.croomlectno }, { "userno", SUserInfo.UserNo } }); vm.Datas = Dao.Get<Data>("cr.main.boardalarm", new System.Collections.Hashtable() { { "bmnos", bmnos != null ? bmnos.Substring(1) : bmnos},{ "lect", vm.croomlectno },{ "cmno", vm.croomcmno }, { "lectno", vm.croomlectno }, { "userno", SUserInfo.UserNo } });
vm.LectInnings = Dao.Get<LectInning>("cr.cminnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno },{ "userno",SUserInfo.UserNo}, { "notstudy"+(Request.IsLocal?"x":""), 1 },{ "limit", 6} }); vm.LectInnings = Dao.Get<LectInning>("cr.cminnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno },{ "userno",SUserInfo.UserNo}, { "notstudy"+(Request.IsLocal?"x":""), 1 },{ "limit", 6} });
if (vm.LectInnings.Count() > 0 && vm.LectInnings.First().isrebate == 1) if (!string.IsNullOrEmpty(vm.LectInnings.FirstOrDefault().existslectinning) && vm.LectInnings.Count() > 0 && vm.LectInnings.First().isrebate == 1)
{ {
vm.intval = Dao.Get<LectInning>("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "isfinishtoday", 1 } }).Count(); vm.intval = Dao.Get<LectInning>("cr.lectinnings", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "isfinishtoday", 1 } }).Count();
} }

5
Model/CM.cs
View File

@ -2864,7 +2864,10 @@ namespace NP.Model
public int preistatus { get; set; } public int preistatus { get; set; }
public Int64 precmino { get; set; } public Int64 precmino { get; set; }
public String tfurl { get; set; } public String tfurl { get; set; }
/// <summary>
/// lect회차 존재여부
/// </summary>
public String existslectinning { get; set; }
} }
[Serializable] [Serializable]