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

This commit is contained in:
hyunho 2020-11-10 08:29:53 +00:00
parent c73ad70a10
commit fc371278f3
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Base/Controller/FOCommon.cs
View File

@ -387,7 +387,6 @@ namespace NP.Base.Controllers
foreach (var item in result) foreach (var item in result)
{ {
item.scdInfoSummary = string.Format("[{0}] {1}", item.studyplacename, item.estart.ToString("yyyy년 MM월 dd일 ddd요일 HH:mm")); item.scdInfoSummary = string.Format("[{0}] {1}", item.studyplacename, item.estart.ToString("yyyy년 MM월 dd일 ddd요일 HH:mm"));
item.remainPeople = Convert.ToInt32(item.quota) - Convert.ToInt32(item.regmem);
} }
return JsonBack(result); return JsonBack(result);

12
Dao/MyBatis/Maps/CM.xml
View File

@ -516,10 +516,10 @@
select a.* select a.*
from ( from (
select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt
,(select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status =1 and z.ischanged=0) regmem
,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">a.estart</isNull>) scdseq ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">a.estart</isNull>) scdseq
,count(b.cmisno) over() regmem ,count(a.cmisno) over() totalnum
from cminningscd a from cminningscd a
left outer join lect b on b.cmisno=a.cmisno and b.status=1 and b.ischanged=0
<dynamic prepend="where"> <dynamic prepend="where">
<isNotNull property="cmino" prepend="and">a.cmino=#cmino#</isNotNull> <isNotNull property="cmino" prepend="and">a.cmino=#cmino#</isNotNull>
<isNotNull property="cmisno" prepend="and">a.cmisno=#cmisno#</isNotNull> <isNotNull property="cmisno" prepend="and">a.cmisno=#cmisno#</isNotNull>
@ -1788,16 +1788,16 @@
<isNotNull property="studyplace">and a.studyplace=#studyplace#</isNotNull> <isNotNull property="studyplace">and a.studyplace=#studyplace#</isNotNull>
</select> </select>
<select id="cm.cminningscds.applyedu" parameterClass="hashtable" resultClass="cminningscd"> <select id="cm.cminningscds.applyedu" parameterClass="hashtable" resultClass="cminningscd">
select * select *
from( from(
select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth select a.cmisno,a.cmino,a.estart,a.eend,a.quota,a.cdt,a.udt,month(a.estart) startmonth
,count(b.cmisno) over() regmem ,(a.quota - (select count(z.lectno) cnt from lect z where a.cmisno = z.cmisno and z.status =1 and z.ischanged=0)) remainPeople
,e.ccode, e.cname studyplacename ,e.ccode, e.cname studyplacename
from cminningscd a from cminningscd a
left outer join lect b on b.cmisno=a.cmisno and b.status=1 and b.ischanged=0 left outer join cminning c on c.cmino = a.cmino
inner join cminning c on c.cmino = a.cmino
left outer join cm d on d.cmno = c.cmno left outer join cm d on d.cmno = c.cmno
left outer join comcode e on e.ccode = d.studyplace left outer join comcode e on e.ccode = d.studyplace
<dynamic prepend="where"> <dynamic prepend="where">
<isNotNull property="cmno" prepend="and">c.cmno=#cmno#</isNotNull> <isNotNull property="cmno" prepend="and">c.cmno=#cmno#</isNotNull>
</dynamic> </dynamic>

1
FO/Controllers/CourseController.cs
View File

@ -779,7 +779,6 @@ namespace NP.FO.Controllers
foreach (var item in vm.CMInningscds) foreach (var item in vm.CMInningscds)
{ {
item.scdInfoSummary = string.Format("[{0}] {1}",item.studyplacename, item.estart.ToString("yyyy년 MM월 dd일 ddd요일 HH:mm")); item.scdInfoSummary = string.Format("[{0}] {1}",item.studyplacename, item.estart.ToString("yyyy년 MM월 dd일 ddd요일 HH:mm"));
item.remainPeople = Convert.ToInt32(item.quota) - Convert.ToInt32(item.regmem);
} }
vm.Assign = Dao.Get<Assign>("cm.assign.applyedu", new Hashtable() { { "userno", SUserInfo.UserNo } }).FirstOrDefault(); vm.Assign = Dao.Get<Assign>("cm.assign.applyedu", new Hashtable() { { "userno", SUserInfo.UserNo } }).FirstOrDefault();
if (!string.IsNullOrEmpty(vm.Assign.MphoneFormat) && vm.Assign.MphoneFormat.IndexOf("-") >= 0) if (!string.IsNullOrEmpty(vm.Assign.MphoneFormat) && vm.Assign.MphoneFormat.IndexOf("-") >= 0)