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

This commit is contained in:
hodong13 2020-10-13 07:10:18 +00:00
parent 942137f7bb
commit c259042038
20 changed files with 172 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BO/Controllers/cmController.cs
View File

@ -128,7 +128,7 @@ namespace NP.BO.Controllers
vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "istop", 1 }, { "isdel", 0 }, { "isuse", 1 } });
}
vm.Assigns = Dao.Get<Assign>("users.assigns", new System.Collections.Hashtable() { { "status", 1 }, { "ismain", 1 } });
vm.ComCodes = GetComCodes("cert,certgrade,job");
vm.ComCodes = GetComCodes("cert,certgrade,job,studyplace");
vm.userauths = Dao.Get<NP.Model.UserAuth>("sys.menu.auths",new System.Collections.Hashtable() { {"isadminprof", 1 } });
return View("cmreg", vm);
}

2
BO/Controllers/dataController.cs
View File

@ -371,7 +371,7 @@ namespace NP.BO.Controllers
{
return ExportExcel(
new String[] { "순번", "상위분류","과정분류", "교육명", "교육일", "교육시간", "교육장명", "강사명", "회원가", "비회원가", "회원사", "비회원사", "회원", "비회원", "교육장사용료", "강사료", "교재인쇄비", "음료및다과", "소모품비", "식대", "기타", "인쇄부수", "전체인원", "담당" },
new String[] { "rno", "pcgname", "cgname", "cnameclassno", "sssename", "itime", "studyplace", "profnames", "infee", "outfee", "infeetotal", "outfeetotal", "incount", "outcount", "feeloc",
new String[] { "rno", "pcgname", "cgname", "cnameclassno", "sssename", "itime", "studyplacename", "profnames", "infee", "outfee", "infeetotal", "outfeetotal", "incount", "outcount", "feeloc",
"pfee", "feebkpr", "feebrt", "feemat", "feefoo", "feeetc", "prtcnt", "totcount", "managers" },
vm.CMCalcs,
vm.excelname);

2
BO/Views/Shared/Partial/Radio.cshtml
View File

@ -64,6 +64,6 @@ else
{
foreach (var item in Model)
{
<span style="@(isblock?"display: block":"")"><input type="radio" @(disabled) id="@(name.Replace(".", "_"))@item.Value" name="@name" value="@item.Value" @(item.Value == selected ? "checked" : "") @(readyonly ? "disabled" : "") onchange="javascript: radioed(this);" data-rname="@(changeid)" /><label style="vertical-align: sub;" for="@(name.Replace(".", "_"))@item.Value">&nbsp;@item.Text</label>&nbsp;</span>
<span style="@(isblock?"display: block":"")"><input type="radio" @(disabled) id="@(name.Replace(".", "_"))@item.value" name="@name" value="@item.value" @(item.value == selected ? "checked" : "") @(readyonly ? "disabled" : "") onchange="javascript: radioed(this);" data-rname="@(changeid)" /><label style="vertical-align: sub;" for="@(name.Replace(".", "_"))@item.value">&nbsp;@item.text</label>&nbsp;</span>
}
}

5
BO/Views/cm/cmreg.cshtml
View File

@ -128,8 +128,9 @@
<div class="line line-dashed line-lg pull-in"></div><div class="form-group">
<label class="col-sm-4 col-md-2 control-label">학습장소</label>
<div class="col-sm-8 col-md-10">
@Html.TextBoxFor(m => m.CM.studyplace, new { @class = "form-control disp-init", @style = "width: 300px;", @maxlength = "150", @placeholder = "" })
* 유형이 온라인일 경우 출력되지 않음
@*@Html.TextBoxFor(m => m.CM.studyplace, new { @class = "form-control disp-init", @style = "width: 300px;", @maxlength = "150", @placeholder = "" })*@
@Html.Partial("./Partial/Radio", Model.ComCodes.Where(w => w.cgroup == "studyplace"), new ViewDataDictionary() { { "checked", Model.CM.studyplace }, { "name", "CM.studyplace" } })
<span style="vertical-align: middle; margin-top: 3px; margin-left: 50px;">※ 유형이 온라인일 경우 출력되지 않음</span>
</div>
</div>
<div class="line line-dashed line-lg pull-in"></div><div class="form-group">

2
BO/Views/data/fees.cshtml
View File

@ -62,7 +62,7 @@
<td class="link"><a href="#" onclick="feep(@item.cmno)">@item.cnameclassno</a></td>
<td>@item.sssename</td>
<td>@item.itime</td>
<td>@item.studyplace</td>
<td>@item.studyplacename</td>
<td>@Html.Raw(item.profnames ?? "")</td>
<td class="text-right infee">@item.infee.ToString("#,0")</td>
<td class="text-right outfee">@item.outfee.ToString("#,0")</td>

6
Dao/DB/DB1.Scheme.txt
View File

@ -385,7 +385,7 @@ create table cm (
,targethtml text
,goalhtml text
,contenthtml mediumtext
,studyplace varchar (200)
,studyplace smallint null
,studytime smallint not null
,certcc smallint
,certgradecc smallint
@ -397,6 +397,10 @@ create table cm (
,isseq tinyint not null default 1
,fgnocm bigint null
,fgno bigint
,typeman varchar(100) null
,typeedu varchar(100) null
,typegrade varchar(100) null
,typejob varchar(100) null
,isdel tinyint not null
,cdt datetime not null,cno bigint not NULL,udt datetime not null,uno bigint not NULL,uip varchar(50) not NULL
,primary key(cmno));

1
Dao/DB/DB1.SchemeFK.txt
View File

@ -43,6 +43,7 @@ alter table cm add constraint foreign key fkcmcm(pcmno) references cm(cmno);
alter table cm add constraint foreign key fkcmterm (tmno) references term(tmno);
alter table cm add constraint foreign key fkcmcc(certcc) references comcode(ccode);
alter table cm add constraint foreign key fkcmcc2(certgradecc) references comcode(ccode);
alter table cm add constraint foreign key fkcmccsp(studyplace) references comcode(ccode);
alter table cmrelay add constraint foreign key fkcmrelaycm (cmno) references cm(cmno);
alter table cmrelay add constraint foreign key fkcmrelaycm2 (rcmno) references cm(cmno);
alter table cmncsd add constraint foreign key fkcmncsdcm(cmno) references cm(cmno);

5
Dao/DB/DB2.CommonData.txt
View File

@ -56,5 +56,8 @@ insert into comcode(cname, cgroup, cgroupname, isuse, corder,refcode,cdt,cno,udt
('법무','askey','회원주요사키워드',1,7,null,now(),1,now(),1,'127.0.0.1'),
('롯데','askey','회원주요사키워드',1,8,null,now(),1,now(),1,'127.0.0.1');
insert into comcode(cname, cgroup, cgroupname, isuse, corder,refcode,cdt,cno,udt,uno,uip) VALUES
('부산','studyplace','학습장소',1,1,null,now(),1,now(),1,'127.0.0.1'),
('영천','studyplace','학습장소',1,2,null,now(),1,now(),1,'127.0.0.1'),
('진주','studyplace','학습장소',1,3,null,now(),1,now(),1,'127.0.0.1');

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

@ -164,6 +164,7 @@
inner join cg a2 on a2.cgno=a.cgno
inner join cg a3 on a3.cgno=a2.pcgno
inner join term b on b.tmno=a.tmno
left outer join comcode cc on cc.ccode=a.studyplace
where a.cmno=#cmno#
</select>
<!--비공개인 강좌여도 수강생등록 가능-->
@ -1544,6 +1545,7 @@
,case when j.ctype &lt; 2 then concat(#contents#,'/', j.ccode, '/', k.srcp) else k.srcp end tasteurlpc
,case when j.ctype &lt; 2 then concat(#contents#,'/', j.ccode, '/', k.srcm) else k.srcm end tasterurlmobile
,m.cname certgradeccname
,cc.cname studyplacename
,max(case when e.lectno is null then 0 else 1 end) isrequested
,count(f.userno) countlect
from cm a
@ -1563,6 +1565,7 @@
left outer join fileinfo jf2 on jf2.fgno=j2.fgnothumb and jf2.isdel=0
left outer join ctpage k on k.ctno=j.ctno and k.pseq=1
left outer join comcode m on m.ccode=a.certgradecc
left outer join comcode cc on cc.ccode=a.studyplace
where a.ismaster=0 and a.isuse=1 and a.isdel=0
<isNotNull property="cmno">and a.cmno=#cmno#</isNotNull>
<isNotNull property="year">and year(a.sstime)=#year#</isNotNull>
@ -1575,6 +1578,7 @@
,h.isjoin
,i.cmino
,j.ccode,j.ctype,k.srcp,k.srcm,m.cname
,cc.cname
<isNotNull property="isrequestable">having count(d.lectno) &lt; a.quota or a.quota=0</isNotNull>
order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">a.sstime,a.setime</isNull>
</select>

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

@ -46,95 +46,99 @@
<select id="cr.main.boardalarm" parameterClass="hashtable" resultClass="data">
select a.*
from (
select a.*
from (
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3
,a.time,a.time2
,a.rno
from (
select 3 dtype
,2 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7
,a.lectno longval
,b.cname strval,b.studyplace strval2,concat(date_format(c.idate,'%m/%d'),' ',left(c.ist,2),':',right(c.ist,2),' ~ ',left(c.iet,2),':',right(c.iet,2)) strval3
,b.sstime time,b.setime time2
,row_number() over(partition by a.cmno order by c.iseq) rno2
,row_number() over(order by b.setime) rno
from lect a
inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include> and b.cshape=1
inner join cminning c on c.cmno=b.cmno and c.isonline=0
<!--left outer join lectinning d on d.lectno=a.lectno and d.cmino=c.cmino and d.istatus=2-->
where a.lectno=#lectno# and a.userno=#userno# and a.status=1 and a.ischanged=0
) a
where a.rno2=1
union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3
,a.time,a.time2
,a.rno
from (
select 3 dtype
,3 intval,0 intval2,b.classno intval3,c.extype intval4,0 intval5,0 intval6,a.cmno intval7
,a.lectno longval
,b.cname strval,b.studyplace strval2,null strval3
,b.sstime time,b.setime time2
,row_number() over(partition by a.cmno order by c.extype,c.cdt) rno2
,row_number() over(order by b.setime) rno
from lect a
inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>
inner join cmex c on c.cmno=b.cmno and c.isdel=0 and c.econdition &lt;= a.attrate
left outer join lectex d on d.lectno=a.lectno and d.exno=c.exno and d.eend is not null
where a.lectno=#lectno# and a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null
) a
where a.rno2=1
union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3
,a.time,a.time2
,a.rno
from (
select 3 dtype
,4 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7
,a.lectno longval
,b.cname strval,b.studyplace strval2,null strval3
,b.sstime time,b.setime time2
,row_number() over(partition by a.cmno order by c.cdt) rno2
,row_number() over(order by b.setime) rno
from lect a
inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>
inner join cmsd c on c.sdtype=0 and c.cmno=b.cmno and c.isdel=0 and c.sdcondition &lt;= a.attrate
left outer join lectsd d on d.lectno=a.lectno and d.sdno=c.sdno and d.submittime is not null
where a.lectno=#lectno# and a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null
) a
where a.rno2=1
union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3
,a.time,a.time2
,a.rno
from (
select 3 dtype
,5 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7
,a.lectno longval
,b.cname strval,b.studyplace strval2,null strval3
,b.sstime time,b.setime time2
,row_number() over(partition by a.cmno order by c.cdt) rno2
,row_number() over(order by b.setime) rno
from lect a
inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>
inner join cmsd c on c.sdtype=1 and c.cmno=b.cmno and c.isdel=0 and c.sdcondition &lt;= a.attrate
left outer join lectsdboard d on d.lectno=a.lectno and d.sdno=c.sdno and d.isdel=0
where a.lectno=#lectno# and a.userno=#userno# and a.status=1 and a.ischanged=0
group by b.classno,a.cmno,a.lectno,b.cname,b.studyplace,b.sstime,b.setime,c.cdt
having count(d.lectno) &lt; 1
) a
where a.rno2=1
) a
limit 3
select a.*
from (
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3,a.strval4
,a.time,a.time2
,a.rno
from (
select 3 dtype
,2 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7
,a.lectno longval
,b.cname strval,b.studyplace strval2,concat(date_format(c.idate,'%m/%d'),' ',left(c.ist,2),':',right(c.ist,2),' ~ ',left(c.iet,2),':',right(c.iet,2)) strval3,bc.cname strval4
,b.sstime time,b.setime time2
,row_number() over(partition by a.cmno order by c.iseq) rno2
,row_number() over(order by b.setime) rno
from lect a
inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include> and b.cshape=1
left outer join comcode bc on bc.ccode=b.studyplace
inner join cminning c on c.cmno=b.cmno and c.isonline=0
<!--left outer join lectinning d on d.lectno=a.lectno and d.cmino=c.cmino and d.istatus=2-->
where a.lectno=#lectno# and a.userno=#userno# and a.status=1 and a.ischanged=0
) a
where a.rno2=1
union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3,a.strval4
,a.time,a.time2
,a.rno
from (
select 3 dtype
,3 intval,0 intval2,b.classno intval3,c.extype intval4,0 intval5,0 intval6,a.cmno intval7
,a.lectno longval
,b.cname strval,b.studyplace strval2,null strval3,bc.cname strval4
,b.sstime time,b.setime time2
,row_number() over(partition by a.cmno order by c.extype,c.cdt) rno2
,row_number() over(order by b.setime) rno
from lect a
inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>
left outer join comcode bc on bc.ccode=b.studyplace
inner join cmex c on c.cmno=b.cmno and c.isdel=0 and c.econdition &lt;= a.attrate
left outer join lectex d on d.lectno=a.lectno and d.exno=c.exno and d.eend is not null
where a.lectno=#lectno# and a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null
) a
where a.rno2=1
union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3,a.strval4
,a.time,a.time2
,a.rno
from (
select 3 dtype
,4 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7
,a.lectno longval
,b.cname strval,b.studyplace strval2,null strval3,bc.cname strval4
,b.sstime time,b.setime time2
,row_number() over(partition by a.cmno order by c.cdt) rno2
,row_number() over(order by b.setime) rno
from lect a
inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>
left outer join comcode bc on bc.ccode=b.studyplace
inner join cmsd c on c.sdtype=0 and c.cmno=b.cmno and c.isdel=0 and c.sdcondition &lt;= a.attrate
left outer join lectsd d on d.lectno=a.lectno and d.sdno=c.sdno and d.submittime is not null
where a.lectno=#lectno# and a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null
) a
where a.rno2=1
union all
select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7
,a.longval,0 longval2
,a.strval,a.strval2,a.strval3,a.strval4
,a.time,a.time2
,a.rno
from (
select 3 dtype
,5 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7
,a.lectno longval
,b.cname strval,b.studyplace strval2,null strval3,bc.cname strval4
,b.sstime time,b.setime time2
,row_number() over(partition by a.cmno order by c.cdt) rno2
,row_number() over(order by b.setime) rno
from lect a
inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>
left outer join comcode bc on bc.ccode=b.studyplace
inner join cmsd c on c.sdtype=1 and c.cmno=b.cmno and c.isdel=0 and c.sdcondition &lt;= a.attrate
left outer join lectsdboard d on d.lectno=a.lectno and d.sdno=c.sdno and d.isdel=0
where a.lectno=#lectno# and a.userno=#userno# and a.status=1 and a.ischanged=0
group by b.classno,a.cmno,a.lectno,b.cname,b.studyplace,b.sstime,b.setime,c.cdt,bc.cname
having count(d.lectno) &lt; 1
) a
where a.rno2=1
) a
limit 3
) a
<isNotNull property="bmnos">
union all

67
Dao/MyBatis/Maps/Lect.xml
View File

@ -264,10 +264,10 @@
</update>
<sql id="sql.encourages" parameterClass="hashtable" resultClass="scdlect">
select a.scdno,a.dday,a.istalk,a.isemail
,d.userno,d.username
,b.cmno cmexno,b.cname,null stime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char) mobile
,null place
,d.userno,d.username
,b.cmno cmexno,b.cname,null stime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char) mobile
,null place
from scdlect a
inner join cm b on b.ismaster=0 and date_format(b.setime,'%Y%m%d')=date_format(date_add(now(), interval a.dday day), '%Y%m%d') and b.cshape in (0,2) and b.isuse=1 and b.isdel=0
inner join lect c on c.cmno=b.cmno and c.attrate &lt; 80 and c.status=1 and c.ischanged=0
@ -275,10 +275,10 @@
where a.scdno &lt; 3 and a.isuse=1 and a.dtime=#dtime#
union all
select a.scdno,a.dday,a.istalk,a.isemail
,d.userno,d.username
,b.cmno cmexno,b.cname,null stime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char) mobile
,null place
,d.userno,d.username
,b.cmno cmexno,b.cname,null stime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char) mobile
,null place
from scdlect a
inner join cm b on b.ismaster=0 and date_format(b.setime,'%Y%m%d')=date_format(date_add(now(), interval a.dday day), '%Y%m%d') and b.cshape in (0,2) and b.isuse=1 and b.isdel=0
inner join lect c on c.cmno=b.cmno and c.status=1 and c.ischanged=0
@ -288,10 +288,10 @@
where a.scdno &gt; 2 and a.scdno &lt; 5 and a.isuse=1 and a.dtime=#dtime# and f.lectno is null
union all
select a.scdno,a.dday,a.istalk,a.isemail
,d.userno,d.username
,b.cmno cmexno,b.cname,null stime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char) mobile
,null place
,d.userno,d.username
,b.cmno cmexno,b.cname,null stime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char) mobile
,null place
from scdlect a
inner join cm b on b.ismaster=0 and date_format(b.setime,'%Y%m%d')=date_format(date_add(now(), interval a.dday day), '%Y%m%d') and b.cshape in (0,2) and b.isuse=1 and b.isdel=0
inner join lect c on c.cmno=b.cmno and c.status=1 and c.ischanged=0
@ -302,9 +302,9 @@
union all
select a.scdno,a.dday,a.istalk,a.isemail
,d.userno,d.username
,b.cmno cmexno,b.cname,null stime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char) mobile
,null place
,b.cmno cmexno,b.cname,null stime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char) mobile
,null place
from scdlect a
inner join cm b on b.ismaster=0 and date_format(b.setime,'%Y%m%d')=date_format(date_add(now(), interval a.dday day), '%Y%m%d') and b.cshape in (0,2) and b.isuse=1 and b.isdel=0
inner join lect c on c.cmno=b.cmno and c.status=1 and c.ischanged=0
@ -314,10 +314,10 @@
where a.scdno=6 and a.isuse=1 and a.dtime=#dtime# and f.lectno is null
union all
select a.scdno,a.dday,a.istalk,a.isemail
,d.userno,d.username
,b.cmno cmexno,b.cname,null stime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char) mobile
,null place
,d.userno,d.username
,b.cmno cmexno,b.cname,null stime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char) mobile
,null place
from scdlect a
inner join cm b on b.ismaster=0 and date_format(b.setime,'%Y%m%d')=date_format(date_add(now(), interval a.dday day), '%Y%m%d') and b.cshape in (0,2) and b.isuse=1 and b.isdel=0
inner join lect c on c.cmno=b.cmno and c.status=1 and c.ischanged=0
@ -327,21 +327,22 @@
where a.scdno=7 and a.isuse=1 and a.dtime=#dtime# and f.lectno is null
union all
select a.scdno,a.dday,a.istalk,a.isemail
,d.userno,d.username
,b.cmno cmexno,b.cname,b.sstime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char),CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char)
,b.studyplace place
,d.userno,d.username
,b.cmno cmexno,b.cname,b.sstime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char),CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char)
,bc.cname place
from scdlect a
inner join cm b on b.ismaster=0 and date_format(b.sstime,'%Y%m%d')=date_format(date_add(now(), interval a.dday day), '%Y%m%d') and b.cshape =1 and b.isuse=1 and b.isdel=0
left outer join comcode bc on bc.ccode=b.studyplace
inner join lect c on c.cmno=b.cmno and c.status=1 and c.ischanged=0
inner join users d on d.userno=c.userno and d.status=1
where a.scdno=8 and a.isuse=1 and a.dtime=#dtime#
union all
select a.scdno,a.dday,a.istalk,a.isemail
,d.userno,d.username
,b.exno cmexno,b.exname cname,b.estime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char),CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char)
,b.elocation place
,d.userno,d.username
,b.exno cmexno,b.exname cname,b.estime
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char),CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char)
,b.elocation place
from scdlect a
inner join exam b on date_format(b.estime,'%Y%m%d')=date_format(date_add(now(), interval a.dday day), '%Y%m%d') and b.isopen=1
inner join examuser c on c.exno=b.exno and c.status=1 and c.pstatus=1
@ -998,12 +999,13 @@
select 3 dtype
,2 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
,a.lectno longval
,b.cname strval,b.studyplace strval2,concat(date_format(c.idate,'%m/%d'),' ',left(c.ist,2),':',right(c.ist,2),' ~ ',left(c.iet,2),':',right(c.iet,2)) strval3
,b.cname strval,bc.cname strval2,concat(date_format(c.idate,'%m/%d'),' ',left(c.ist,2),':',right(c.ist,2),' ~ ',left(c.iet,2),':',right(c.iet,2)) strval3
,b.sstime time,b.setime time2
,row_number() over(partition by a.cmno order by c.iseq) rno2
,row_number() over(order by b.setime) rno
from lect a
inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include> and b.cshape=1
left outer join comcode bc on bc.ccode=b.studyplace
inner join cminning c on c.cmno=b.cmno and c.isonline=0
<!--left outer join lectinning d on d.lectno=a.lectno and d.cmino=c.cmino and d.istatus=2-->
where a.userno=#userno# and a.status=1 and a.ischanged=0 <!--and d.lectno is null-->
@ -1019,12 +1021,13 @@
select 3 dtype
,3 intval,0 intval2,b.classno intval3,c.extype intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
,a.lectno longval
,b.cname strval,b.studyplace strval2,null strval3
,b.cname strval,bc.cname strval2,null strval3
,b.sstime time,b.setime time2
,row_number() over(partition by a.cmno order by c.extype,c.cdt) rno2
,row_number() over(order by b.setime) rno
from lect a
inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>
left outer join comcode bc on bc.ccode=b.studyplace
inner join cmex c on c.cmno=b.cmno and c.isdel=0 and c.econdition &lt;= a.attrate
left outer join lectex d on d.lectno=a.lectno and d.exno=c.exno and d.eend is not null
where a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null
@ -1040,12 +1043,13 @@
select 3 dtype
,4 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
,a.lectno longval
,b.cname strval,b.studyplace strval2,null strval3
,b.cname strval,bc.cname strval2,null strval3
,b.sstime time,b.setime time2
,row_number() over(partition by a.cmno order by c.cdt) rno2
,row_number() over(order by b.setime) rno
from lect a
inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>
left outer join comcode bc on bc.ccode=b.studyplace
inner join cmsd c on c.sdtype=0 and c.cmno=b.cmno and c.isdel=0 and c.sdcondition &lt;= a.attrate
left outer join lectsd d on d.lectno=a.lectno and d.sdno=c.sdno and d.submittime is not null
where a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null
@ -1061,12 +1065,13 @@
select 3 dtype
,5 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8
,a.lectno longval
,b.cname strval,b.studyplace strval2,null strval3
,b.cname strval,bc.cname strval2,null strval3
,b.sstime time,b.setime time2
,row_number() over(partition by a.cmno order by c.cdt) rno2
,row_number() over(order by b.setime) rno
from lect a
inner join cm b on b.cmno=a.cmno and b.sstime &lt; <include refid="sql.now"></include> and b.setime &gt; <include refid="sql.now"></include>
left outer join comcode bc on bc.ccode=b.studyplace
inner join cmsd c on c.sdtype=1 and c.cmno=b.cmno and c.isdel=0 and c.sdcondition &lt;= a.attrate
left outer join lectsdboard d on d.lectno=a.lectno and d.sdno=c.sdno and d.isdel=0
where a.userno=#userno# and a.status=1 and a.ischanged=0 and d.lectno is null

7
Dao/MyBatis/Maps/System.xml
View File

@ -1026,6 +1026,7 @@
,a.infeetotal
,a.outfeetotal
,a.feeloc,a.feebkpr,a.feebrt,a.feemat,a.feefoo,a.feeetc,a.prtcnt
,a.studyplacename
,a.incount
,a.outcount
,a.totcount
@ -1040,6 +1041,7 @@
,a.infeetotal
,a.outfeetotal
,a.feeloc,a.feebkpr,a.feebrt,a.feemat,a.feefoo,a.feeetc,a.prtcnt
,a.studyplacename
,a.incount
,a.outcount
,a.totcount
@ -1053,6 +1055,7 @@
,b.infee*sum(case when e.isjoin=1 then 1 else 0 end) infeetotal
,b.outfee*sum(case when e.isjoin=1 then 0 else 1 end) outfeetotal
,cmc.feeloc,cmc.feebkpr,cmc.feebrt,cmc.feemat,cmc.feefoo,cmc.feeetc,cmc.prtcnt
,cc.cname studyplacename
,sum(case when e.isjoin=1 then 1 else 0 end) incount
,sum(case when e.isjoin=1 then 0 else 1 end) outcount
,count(c.lectno) totcount
@ -1065,12 +1068,14 @@
inner join cm f on f.cmno=b.pcmno
inner join cg b2 on b2.cgno=f.cgno
inner join cg b3 on b3.cgno=b2.pcgno
left outer join comcode cc on cc.ccode=b.studyplace
where a.tyear=#year#
group by b3.cgname,b3.cgno,b2.cgname,b2.cgno,f.cname,f.cmno,b.cname,b.cmno,b.classno
,b.sstime,b.setime
,b.studyplace
,cmc.infee, b.infee,cmc.outfee,b.outfee
,cmc.feeloc,cmc.feebkpr,cmc.feebrt,cmc.feemat,cmc.feefoo,cmc.feeetc,cmc.prtcnt
,cc.cname
) a
inner join cmprof b on b.cmno=a.cmno
inner join users b2 on b2.userno=b.userno
@ -1080,6 +1085,7 @@
,a.infeetotal
,a.outfeetotal
,a.feeloc,a.feebkpr,a.feebrt,a.feemat,a.feefoo,a.feeetc,a.prtcnt
,a.studyplacename
,a.incount
,a.outcount
,a.totcount
@ -1092,6 +1098,7 @@
,a.infeetotal
,a.outfeetotal
,a.feeloc,a.feebkpr,a.feebrt,a.feemat,a.feefoo,a.feeetc,a.prtcnt
,a.studyplacename
,a.incount
,a.outcount
,a.totcount

2
FO/Controllers/CRoomController.cs
View File

@ -43,7 +43,7 @@ namespace NP.FO.Controllers
}
public ActionResult Plan()
{
vm.CM = Dao.Get<CM>("cm.cm", new System.Collections.Hashtable() { { "cmno", vm.croomcmno },{ "htmlcolumns", ",a.introhtml,a.targethtml,a.goalhtml,a.contenthtml,a.studyplace" } }).First();
vm.CM = Dao.Get<CM>("cm.cm", new System.Collections.Hashtable() { { "cmno", vm.croomcmno },{ "htmlcolumns", ",a.introhtml,a.targethtml,a.goalhtml,a.contenthtml,a.studyplace,cc.cname studyplacename" } }).First();
vm.CMPRs = Dao.Get<CMPR>("cm.cmprs", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "usertype", 11 } });
vm.CMEV = Dao.Get<CMEV>("cm.cmev", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno } }).First();
vm.intval = Dao.Get<Lect>("lect.lects.my", new System.Collections.Hashtable() { { "lecnto", vm.croomlectno } }).First().isrebate;

4
FO/Views/CRoom/Plan.cshtml
View File

@ -51,13 +51,13 @@
<dd>@Html.Raw(Model.CM.contenthtml ?? "")</dd>
</dl>
}
@if (!string.IsNullOrEmpty(Model.CM.studyplace))
@if (!string.IsNullOrEmpty(Model.CM.studyplacename))
{
<dl class="lctSecCont">
<dt>교육장소</dt>
<dd>
<ul>
<li>@Model.CM.studyplace</li>
<li>@Model.CM.studyplacename</li>
</ul>
</dd>
</dl>

4
FO/Views/Course/CertDetail.cshtml
View File

@ -139,13 +139,13 @@
<dd>@Html.Raw(Model.CM.contenthtml ?? "")</dd>
</dl>
}
@if (!string.IsNullOrEmpty(Model.CM.studyplace))
@if (!string.IsNullOrEmpty(Model.CM.studyplacename))
{
<dl class="fairIntro" id="fairLoc">
<dt>교육장소</dt>
<dd>
<ul>
<li>@Model.CM.studyplace</li>
<li>@Model.CM.studyplacename</li>
</ul>
</dd>
</dl>

4
FO/Views/Course/CoverDetail.cshtml
View File

@ -139,13 +139,13 @@
<dd>@Html.Raw(Model.CM.contenthtml ?? "")</dd>
</dl>
}
@if (!string.IsNullOrEmpty(Model.CM.studyplace))
@if (!string.IsNullOrEmpty(Model.CM.studyplacename))
{
<dl class="fairIntro" id="fairLoc">
<dt>교육장소</dt>
<dd>
<ul>
<li>@Model.CM.studyplace</li>
<li>@Model.CM.studyplacename</li>
</ul>
</dd>
</dl>

4
FO/Views/Course/OffDetail.cshtml
View File

@ -138,13 +138,13 @@
<dd>@Html.Raw(Model.CM.contenthtml ?? "")</dd>
</dl>
}
@if (!string.IsNullOrEmpty(Model.CM.studyplace))
@if (!string.IsNullOrEmpty(Model.CM.studyplacename))
{
<dl class="fairIntro" id="fairLoc">
<dt>교육장소</dt>
<dd>
<ul>
<li>@Model.CM.studyplace</li>
<li>@Model.CM.studyplacename</li>
</ul>
</dd>
</dl>

2
FO/Views/Course/OffList.cshtml
View File

@ -45,7 +45,7 @@
<th style="@((DateTime.Now >= d.rstime.Value && DateTime.Now < d.retime.Value) ? "style=font-weight:600; color:#00b1ed;" : "")">@string.Format("{0}({1})", d.sstime.Value.Day, d.sstime.Value.ToString("ddd", System.Globalization.CultureInfo.CreateSpecificCulture("ko-KR")))</th>
<td>
<a href="#" onclick="godetail(@(!(DateTime.Now >= d.rstime.Value && DateTime.Now < d.retime.Value) ? 0 : d.cmno))" style="@(!(DateTime.Now >= d.rstime.Value && DateTime.Now < d.retime.Value) ? "cursor: default" : "")">
<p><span class="grn" style="@(d.isrefund==0 ? "display:none;":"")">환급</span><span>[@d.cgname]</span> @(d.cname)(@(d.studyplace)) (@(d.studytime)시간)</p>
<p><span class="grn" style="@(d.isrefund==0 ? "display:none;":"")">환급</span><span>[@d.cgname]</span> @(d.cname)(@(d.studyplacename)) (@(d.studytime)시간)</p>
<p>회원 : @d.infee.ToString("#,0")원 비회원 : @d.outfee.ToString("#,0")원</p>
</a>
</td>

4
FO/Views/Course/OnDetail.cshtml
View File

@ -143,13 +143,13 @@
<dd>@Html.Raw(Model.CM.contenthtml ?? "")</dd>
</dl>
}
@if (!string.IsNullOrEmpty(Model.CM.studyplace))
@if (!string.IsNullOrEmpty(Model.CM.studyplacename))
{
<dl class="fairIntro" id="fairLoc">
<dt>교육장소</dt>
<dd>
<ul>
<li>@Model.CM.studyplace</li>
<li>@Model.CM.studyplacename</li>
</ul>
</dd>
</dl>

5
Model/CM.cs
View File

@ -290,9 +290,10 @@ namespace NP.Model
/// </summary>
public String contenthtml {get;set;}
/// <summary>
/// 200 학습장소 오프라인강좌전용
/// 200 학습장소 오프라인강좌전용 comcode.cgroup=studyplace
/// </summary>
public String studyplace { get; set; }
public int? studyplace { get; set; }
public String studyplacename { get; set; }
/// <summary>
/// 학습시간 단위: Hour
/// </summary>