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

추가개발2

This commit is contained in:
김한진 2025-12-27 09:51:13 +09:00
parent fe9f3252b0
commit 06251c9a4a
7 changed files with 75 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BO/BO.csproj
View File

@ -713,9 +713,13 @@
<Content Include="Views\user\LeaveHistory.cshtml" /> <Content Include="Views\user\LeaveHistory.cshtml" />
<Content Include="Views\Shared\Partial\UserBoxSelect.cshtml" /> <Content Include="Views\Shared\Partial\UserBoxSelect.cshtml" />
<Content Include="Views\cm\cmregexset.cshtml" /> <Content Include="Views\cm\cmregexset.cshtml" />
<<<<<<< HEAD
<None Include="Web.Staging.config"> <None Include="Web.Staging.config">
<DependentUpon>Web.config</DependentUpon> <DependentUpon>Web.config</DependentUpon>
</None> </None>
=======
<Content Include="Web.Staging.config" />
>>>>>>> 8c571ed (추가개발2)
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="App_Data\" /> <Folder Include="App_Data\" />

2
BO/Views/cm/ctr.cshtml
View File

@ -18,8 +18,8 @@
<li class="active"><a href="#" data-toggle="tab">학습콘텐츠</a></li> <li class="active"><a href="#" data-toggle="tab">학습콘텐츠</a></li>
@if (!ViewBag.IsSubAdmin96) @if (!ViewBag.IsSubAdmin96)
{ {
<li class=""><a href="#" onclick="gotab(0);" data-toggle="tab">그룹코드관리</a></li>
<li class=""><a href="#" onclick="gotab(2);" data-toggle="tab">문제</a></li> <li class=""><a href="#" onclick="gotab(2);" data-toggle="tab">문제</a></li>
<li class=""><a href="#" onclick="gotab(0);" data-toggle="tab">그룹코드관리</a></li>
<li class=""><a href="#" onclick="gotab(3);" data-toggle="tab">설문지</a></li> <li class=""><a href="#" onclick="gotab(3);" data-toggle="tab">설문지</a></li>
} }
</ul> </ul>

118
BO/bin/MyBatis/Maps/CRoom.xml
View File

@ -451,40 +451,48 @@
<select id="cr.myestimation" parameterClass="hashtable" resultClass="data"> <select id="cr.myestimation" parameterClass="hashtable" resultClass="data">
select a.* select a.*
from ( from (
select 0 dtype select 0 dtype
,null strval,0 intval10 ,null strval,0 intval10
,0 intval,0 intval2,0 intval3,0 intval4,0 intval5 ,0 intval,0 intval2,0 intval3,0 intval4,0 intval5
,0 intval6 ,0 intval6
,0 intval7 ,0 intval7
,0 rno ,0 rno
,null time ,null time
,null time2 ,null time2
from (select 1 col1) a ,null testsdate
where a.col1=0 ,null testedate
union all from (select 1 col1) a
select -1 dtype where a.col1=0
,null strval,0 intval10
,0 intval,0 intval2,0 intval3,0 intval4,a.attrate intval5 union all
,0 intval6
,a.iscomplete intval7 select -1 dtype
,0 rno ,null strval,0 intval10
,null time ,0 intval,0 intval2,0 intval3,0 intval4,a.attrate intval5
,null time2 ,0 intval6
from lect a ,a.iscomplete intval7
where a.lectno=#lectno# and a.userno=#userno# ,0 rno
,null time
,null time2
,null testsdate
,null testedate
from lect a
where a.lectno=#lectno# and a.userno=#userno#
<isNotNull property="exam"> <isNotNull property="exam">
union all union all
select b.extype dtype select b.extype dtype
,b.exname strval,b.exno intval10 ,b.exname strval,b.exno intval10
,case when a.sdate &lt; now() and a.edate &gt; now() then a.attrate else -1 end intval,b.econdition intval2 ,case when a.sdate &lt; now() and a.edate &gt; now() then a.attrate else -1 end intval,b.econdition intval2
,case when c.eend is null then 0 else 1 end intval3 ,case when c.eend is null then 0 else 1 end intval3
,a.attrate intval5 ,a.attrate intval5
,null intval4 ,null intval4
,a2.studytime intval6 ,a2.studytime intval6
,a.iscomplete intval7 ,a.iscomplete intval7
,row_number() over (partition by b.extype order by b.extype, b.cdt) rno ,row_number() over (partition by b.extype order by b.extype, b.cdt) rno
,a.edate time ,a.edate time
,a.sdate time2 ,a.sdate time2
,b.testsdate
,b.testedate
from lect a from lect a
inner join cm a2 on a2.cmno=a.cmno inner join cm a2 on a2.cmno=a.cmno
inner join cmex b on b.cmno=a.cmno and b.isdel=0 inner join cmex b on b.cmno=a.cmno and b.isdel=0
@ -494,16 +502,18 @@
<isNotNull property="subject"> <isNotNull property="subject">
union all union all
select 2 dtype select 2 dtype
,b.sdname strval,b.sdno intval10 ,b.sdname strval,b.sdno intval10
,case when a.sdate &lt; now() and a.edate &gt; now() then a.attrate else -1 end intval,b.sdcondition intval2 ,case when a.sdate &lt; now() and a.edate &gt; now() then a.attrate else -1 end intval,b.sdcondition intval2
,case when c.submittime is null then 0 else 1 end intval3 ,case when c.submittime is null then 0 else 1 end intval3
,case when c.checktime is null then 0 else 1 end intval4 ,case when c.checktime is null then 0 else 1 end intval4
,a.attrate intval5 ,a.attrate intval5
,a2.studytime intval6 ,a2.studytime intval6
,a.iscomplete intval7 ,a.iscomplete intval7
,row_number() over (order by b.cdt) rno ,row_number() over (order by b.cdt) rno
,a.edate time ,a.edate time
,a.sdate time2 ,a.sdate time2
,null testsdate
,null testedate
from lect a from lect a
inner join cm a2 on a2.cmno=a.cmno inner join cm a2 on a2.cmno=a.cmno
inner join cmsd b on b.cmno=a.cmno and b.sdtype=0 and b.isdel=0 inner join cmsd b on b.cmno=a.cmno and b.sdtype=0 and b.isdel=0
@ -523,6 +533,8 @@
,row_number() over (order by b.cdt) rno ,row_number() over (order by b.cdt) rno
,a.edate time ,a.edate time
,a.sdate time2 ,a.sdate time2
,null testsdate
,null testedate
from lect a from lect a
inner join cm a2 on a2.cmno=a.cmno inner join cm a2 on a2.cmno=a.cmno
inner join cmsd b on b.cmno=a.cmno and b.sdtype=1 and b.isdel=0 inner join cmsd b on b.cmno=a.cmno and b.sdtype=1 and b.isdel=0
@ -545,6 +557,8 @@
,case when ,case when
case when case when a.isrebate = 1 then f.midcutrfd else f.midcut end &lt;= ifnull(e.ex0lectpoint,0) then 1 else 0 end = 1 and case when case when a.isrebate = 1 then f.finalcutrfd else f.finalcut end &lt;= ifnull(e.ex1lectpoint,0) then 1 else 0 end = 1 case when case when a.isrebate = 1 then f.midcutrfd else f.midcut end &lt;= ifnull(e.ex0lectpoint,0) then 1 else 0 end = 1 and case when case when a.isrebate = 1 then f.finalcutrfd else f.finalcut end &lt;= ifnull(e.ex1lectpoint,0) then 1 else 0 end = 1
then 1 else 0 end ispass then 1 else 0 end ispass
,c.testsdate
,c.testedate
from lect a from lect a
inner join cm b on b.cmno=a.cmno inner join cm b on b.cmno=a.cmno
inner join cmex c on c.exno=#exno# inner join cmex c on c.exno=#exno#
@ -567,16 +581,16 @@
<include refid="lectexcreate"></include> <include refid="lectexcreate"></include>
select case when a.etime = 0 then 99999999 else TIMESTAMPDIFF(MINUTE, now(), date_add(ifnull(b.estart, now()), interval a.etime MINUTE)) end etime 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 ,a.qcount,a.evtype,a.israndqi,a.tpoint,a.isblur,a.isusebackup,a.isseq
,b.cblock ,b.cblock
,c.atext,c.qseq ,c.atext,c.qseq
,d.eqno,d.rpoint ,d.eqno,d.rpoint
,e.atype,e.qtext,e.qno,e.rightcount,e.ispassspace,e.isignorecase ,e.atype,e.qtext,e.qno,e.rightcount,e.ispassspace,e.isignorecase
from cmex a from cmex a
inner join cm a3 on a3.cmno=a.cmno inner join cm a3 on a3.cmno=a.cmno
inner join lect a2 on a2.lectno=#lectno# and a2.userno=#userno# 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) &gt; now()) 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) &gt; now())
and ifnull(b.entercount,0) &lt;= ifnull(a.relaylimit, 999) and ifnull(b.entercount,0) &lt;= ifnull(a.relaylimit, 999)
inner join lectexq c on c.lectno=b.lectno and c.exno=b.exno 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 cmexq d on d.eqno=c.eqno
inner join question e on e.qno=d.qno inner join question e on e.qno=d.qno
@ -587,11 +601,11 @@
inner join lect a2 on a2.lectno=a.lectno and a2.userno=#userno# inner join lect a2 on a2.lectno=a.lectno and a2.userno=#userno#
inner join cmex b on b.exno=a.exno inner join cmex b on b.exno=a.exno
set set
a.estart=case when a.estart is null then now() else a.estart end a.estart=case when a.estart is null then now() else a.estart end
,a.entercount=ifnull(a.entercount,0)+1 ,a.entercount=ifnull(a.entercount,0)+1
,a.uno=#uno# ,a.uno=#uno#
,a.uip=#uip# ,a.uip=#uip#
,a.eip=#uip# ,a.eip=#uip#
where a.lectno=#lectno# and a.exno=#exno# and a.eend is null and ifnull(a.entercount,0) &lt;= ifnull(b.relaylimit, 999) where a.lectno=#lectno# and a.exno=#exno# and a.eend is null and ifnull(a.entercount,0) &lt;= ifnull(b.relaylimit, 999)
</select> </select>
<select id="cr.userexamquestionitem.get" parameterClass="hashtable" resultClass="questionitem"> <select id="cr.userexamquestionitem.get" parameterClass="hashtable" resultClass="questionitem">

BIN
BO/obj/Debug/NP.BO.dll
View File

Binary file not shown.

BIN
BO/obj/Debug/NP.BO.pdb
View File

Binary file not shown.

BIN
Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
View File

Binary file not shown.

4
FO/FO.csproj
View File

@ -762,9 +762,13 @@
<None Include="Web.Develop.config"> <None Include="Web.Develop.config">
<DependentUpon>Web.config</DependentUpon> <DependentUpon>Web.config</DependentUpon>
</None> </None>
<<<<<<< HEAD
<None Include="Web.Staging.config"> <None Include="Web.Staging.config">
<DependentUpon>Web.config</DependentUpon> <DependentUpon>Web.config</DependentUpon>
</None> </None>
=======
<None Include="Web.Staging.config" />
>>>>>>> 8c571ed (추가개발2)
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Base\Base.csproj"> <ProjectReference Include="..\Base\Base.csproj">