diff --git a/Base/bin/Debug/MyBatis/Maps/CM.xml b/Base/bin/Debug/MyBatis/Maps/CM.xml index 70c5796..d2d04ca 100644 --- a/Base/bin/Debug/MyBatis/Maps/CM.xml +++ b/Base/bin/Debug/MyBatis/Maps/CM.xml @@ -2053,28 +2053,28 @@ +<<<<<<< HEAD +======= +>>>>>>> ca8967d (추가개발1) \ No newline at end of file diff --git a/Base/bin/Debug/MyBatis/Maps/CRoom.xml b/Base/bin/Debug/MyBatis/Maps/CRoom.xml index 8423f62..eb80027 100644 --- a/Base/bin/Debug/MyBatis/Maps/CRoom.xml +++ b/Base/bin/Debug/MyBatis/Maps/CRoom.xml @@ -581,16 +581,16 @@ select case when a.etime = 0 then 99999999 else TIMESTAMPDIFF(MINUTE, now(), date_add(ifnull(b.estart, now()), interval a.etime MINUTE)) end etime - ,a.qcount,a.evtype,a.israndqi,a.tpoint,a.isblur,a.isusebackup,a.isseq - ,b.cblock - ,c.atext,c.qseq - ,d.eqno,d.rpoint - ,e.atype,e.qtext,e.qno,e.rightcount,e.ispassspace,e.isignorecase + ,a.qcount,a.evtype,a.israndqi,a.tpoint,a.isblur,a.isusebackup,a.isseq + ,b.cblock + ,c.atext,c.qseq + ,d.eqno,d.rpoint + ,e.atype,e.qtext,e.qno,e.rightcount,e.ispassspace,e.isignorecase from cmex a inner join cm a3 on a3.cmno=a.cmno inner join lect a2 on a2.lectno=#lectno# and a2.userno=#userno# inner join lectex b on b.lectno=a2.lectno and b.exno=a.exno and b.eend is null and (a.etime = 0 or date_add(ifnull(b.estart, now()), interval a.etime MINUTE) > now()) - and ifnull(b.entercount,0) <= ifnull(a.relaylimit, 999) + and ifnull(b.entercount,0) <= ifnull(a.relaylimit, 999) inner join lectexq c on c.lectno=b.lectno and c.exno=b.exno inner join cmexq d on d.eqno=c.eqno inner join question e on e.qno=d.qno @@ -601,11 +601,11 @@ inner join lect a2 on a2.lectno=a.lectno and a2.userno=#userno# inner join cmex b on b.exno=a.exno set - a.estart=case when a.estart is null then now() else a.estart end - ,a.entercount=ifnull(a.entercount,0)+1 - ,a.uno=#uno# - ,a.uip=#uip# - ,a.eip=#uip# + a.estart=case when a.estart is null then now() else a.estart end + ,a.entercount=ifnull(a.entercount,0)+1 + ,a.uno=#uno# + ,a.uip=#uip# + ,a.eip=#uip# where a.lectno=#lectno# and a.exno=#exno# and a.eend is null and ifnull(a.entercount,0) <= ifnull(b.relaylimit, 999) select - a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth,a.comment - ,a.studyplace, a.studyplacename,a.remainPeople - ,a.isselected, a.cmno,a.pcmno,a.cgcode - - ,case when a.estart < date_add(date_format(now() ,'%Y-%m-%d 00:00:00'),interval -1 second) - - then 0 else 1 end isend + a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,a.studyplace,a.studyplacename,a.startmonth,a.comment + ,a.studyplace, a.studyplacename,a.remainPeople + ,a.isselected, a.cmno,a.pcmno,a.cgcode + + ,case when a.estart < date_add(date_format(now() ,'%Y-%m-%d 00:00:00'),interval -1 second) + + then 0 else 1 end isend from ( - select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth - ,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status in (1,2) and z.ischanged=0)) remainPeople - ,a.studyplace, e.cname studyplacename - ,case when f.cmisno = a.cmisno then 1 else 0 end isselected, d.cmno,d.pcmno,cg.cgcode - ,a.comment - from cminningscd a - left outer join cminning c on c.cmino = a.cmino - left outer join cm d on d.cmno = c.cmno - left outer join cg cg on d.cgno = cg.cgno - left outer join comcode e on e.ccode = a.studyplace - left outer join lect f on f.lectno = #lectno# - where DATE_ADD(f.sdate, INTERVAL 1 YEAR) > a.estart + select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth + ,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status in (1,2) and z.ischanged=0)) remainPeople + ,a.studyplace, e.cname studyplacename + ,case when f.cmisno = a.cmisno then 1 else 0 end isselected, d.cmno,d.pcmno,cg.cgcode + ,a.comment + from cminningscd a + left outer join cminning c on c.cmino = a.cmino + left outer join cm d on d.cmno = c.cmno + left outer join cg cg on d.cgno = cg.cgno + left outer join comcode e on e.ccode = a.studyplace + left outer join lect f on f.lectno = #lectno# + where DATE_ADD(f.sdate, INTERVAL 1 YEAR) > a.estart c.cmno=#cmno# )a @@ -2250,6 +2250,8 @@ and year(a.sstime)=#year# order by a.sstime,a.setime +<<<<<<< HEAD +======= +>>>>>>> ca8967d (추가개발1) \ No newline at end of file diff --git a/Dao/bin/Debug/MyBatis/Maps/CRoom.xml b/Dao/bin/Debug/MyBatis/Maps/CRoom.xml index 8423f62..eb80027 100644 --- a/Dao/bin/Debug/MyBatis/Maps/CRoom.xml +++ b/Dao/bin/Debug/MyBatis/Maps/CRoom.xml @@ -581,16 +581,16 @@ select case when a.etime = 0 then 99999999 else TIMESTAMPDIFF(MINUTE, now(), date_add(ifnull(b.estart, now()), interval a.etime MINUTE)) end etime - ,a.qcount,a.evtype,a.israndqi,a.tpoint,a.isblur,a.isusebackup,a.isseq - ,b.cblock - ,c.atext,c.qseq - ,d.eqno,d.rpoint - ,e.atype,e.qtext,e.qno,e.rightcount,e.ispassspace,e.isignorecase + ,a.qcount,a.evtype,a.israndqi,a.tpoint,a.isblur,a.isusebackup,a.isseq + ,b.cblock + ,c.atext,c.qseq + ,d.eqno,d.rpoint + ,e.atype,e.qtext,e.qno,e.rightcount,e.ispassspace,e.isignorecase from cmex a inner join cm a3 on a3.cmno=a.cmno inner join lect a2 on a2.lectno=#lectno# and a2.userno=#userno# inner join lectex b on b.lectno=a2.lectno and b.exno=a.exno and b.eend is null and (a.etime = 0 or date_add(ifnull(b.estart, now()), interval a.etime MINUTE) > now()) - and ifnull(b.entercount,0) <= ifnull(a.relaylimit, 999) + and ifnull(b.entercount,0) <= ifnull(a.relaylimit, 999) inner join lectexq c on c.lectno=b.lectno and c.exno=b.exno inner join cmexq d on d.eqno=c.eqno inner join question e on e.qno=d.qno @@ -601,11 +601,11 @@ inner join lect a2 on a2.lectno=a.lectno and a2.userno=#userno# inner join cmex b on b.exno=a.exno set - a.estart=case when a.estart is null then now() else a.estart end - ,a.entercount=ifnull(a.entercount,0)+1 - ,a.uno=#uno# - ,a.uip=#uip# - ,a.eip=#uip# + a.estart=case when a.estart is null then now() else a.estart end + ,a.entercount=ifnull(a.entercount,0)+1 + ,a.uno=#uno# + ,a.uip=#uip# + ,a.eip=#uip# where a.lectno=#lectno# and a.exno=#exno# and a.eend is null and ifnull(a.entercount,0) <= ifnull(b.relaylimit, 999)