From 06251c9a4a8c1d0335539b85dc36c5d4ae070209 Mon Sep 17 00:00:00 2001
From: KimHanJin <grips76@kakao.com>
Date: Sat, 27 Dec 2025 09:51:13 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EA=B0=80=EA=B0=9C=EB=B0=9C2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/BO.csproj                                  |   4 +
 BO/Views/cm/ctr.cshtml                        |   2 +-
 BO/bin/MyBatis/Maps/CRoom.xml                 | 118 ++++++++++--------
 BO/obj/Debug/NP.BO.dll                        | Bin 173568 -> 173568 bytes
 BO/obj/Debug/NP.BO.pdb                        | Bin 212480 -> 212480 bytes
 .../Debug/Dao.csproj.AssemblyReference.cache  | Bin 11 -> 4610 bytes
 FO/FO.csproj                                  |   4 +
 7 files changed, 75 insertions(+), 53 deletions(-)

diff --git a/BO/BO.csproj b/BO/BO.csproj
index 0e52674..808886f 100644
--- a/BO/BO.csproj
+++ b/BO/BO.csproj
@@ -713,9 +713,13 @@
     <Content Include="Views\user\LeaveHistory.cshtml" />
     <Content Include="Views\Shared\Partial\UserBoxSelect.cshtml" />
     <Content Include="Views\cm\cmregexset.cshtml" />
+<<<<<<< HEAD
     <None Include="Web.Staging.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
+=======
+    <Content Include="Web.Staging.config" />
+>>>>>>> 8c571ed (추가개발2)
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
diff --git a/BO/Views/cm/ctr.cshtml b/BO/Views/cm/ctr.cshtml
index f8ecb64..4d5dbda 100644
--- a/BO/Views/cm/ctr.cshtml
+++ b/BO/Views/cm/ctr.cshtml
@@ -18,8 +18,8 @@
         <li class="active"><a href="#" data-toggle="tab">학습콘텐츠</a></li>
         @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(0);" data-toggle="tab">그룹코드관리</a></li>
             <li class=""><a href="#" onclick="gotab(3);" data-toggle="tab">설문지</a></li>
         }
     </ul>
diff --git a/BO/bin/MyBatis/Maps/CRoom.xml b/BO/bin/MyBatis/Maps/CRoom.xml
index eae7030..eb80027 100644
--- a/BO/bin/MyBatis/Maps/CRoom.xml
+++ b/BO/bin/MyBatis/Maps/CRoom.xml
@@ -451,40 +451,48 @@
         <select id="cr.myestimation" parameterClass="hashtable" resultClass="data">
 			select a.*
 			from (
-			select 0 dtype
-			,null strval,0 intval10
-			,0 intval,0 intval2,0 intval3,0 intval4,0 intval5
-			,0 intval6
-			,0 intval7
-			,0 rno
-			,null time
-			,null time2
-			from (select 1 col1) a
-			where a.col1=0
-			union all
-			select -1 dtype
-			,null strval,0 intval10
-			,0 intval,0 intval2,0 intval3,0 intval4,a.attrate intval5
-			,0 intval6
-			,a.iscomplete intval7
-			,0 rno
-			,null time
-			,null time2
-			from lect a
-			where a.lectno=#lectno# and a.userno=#userno#
+    			select 0 dtype
+			        ,null strval,0 intval10
+			        ,0 intval,0 intval2,0 intval3,0 intval4,0 intval5
+			        ,0 intval6
+			        ,0 intval7
+			        ,0 rno
+			        ,null time
+			        ,null time2
+			        ,null testsdate
+			        ,null testedate
+			    from (select 1 col1) a
+    			where a.col1=0
+	    
+		        union all
+
+                select -1 dtype
+        			,null strval,0 intval10
+        			,0 intval,0 intval2,0 intval3,0 intval4,a.attrate intval5
+			        ,0 intval6
+			        ,a.iscomplete intval7
+			        ,0 rno
+			        ,null time
+			        ,null time2
+			        ,null testsdate
+			        ,null testedate
+			    from lect a
+    			where a.lectno=#lectno# and a.userno=#userno#
 			<isNotNull property="exam">
                 union all
                 select b.extype dtype
-                ,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 c.eend is null then 0 else 1 end intval3
-				,a.attrate intval5
-				,null intval4
-				,a2.studytime intval6
-				,a.iscomplete intval7
-				,row_number() over (partition by b.extype order by b.extype, b.cdt) rno
-				,a.edate time
-				,a.sdate time2
+                    ,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 c.eend is null then 0 else 1 end intval3
+				    ,a.attrate intval5
+				    ,null intval4
+				    ,a2.studytime intval6
+				    ,a.iscomplete intval7
+				    ,row_number() over (partition by b.extype order by b.extype, b.cdt) rno
+				    ,a.edate time
+				    ,a.sdate time2
+				    ,b.testsdate
+				    ,b.testedate
 				from lect a
 				inner join cm a2 on a2.cmno=a.cmno
 				inner join cmex b on b.cmno=a.cmno and b.isdel=0
@@ -494,16 +502,18 @@
             <isNotNull property="subject">
                 union all
                 select 2 dtype
-                ,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 c.submittime is null then 0 else 1 end intval3
-				,case when c.checktime is null then 0 else 1 end intval4
-				,a.attrate intval5
-				,a2.studytime intval6
-				,a.iscomplete intval7
-				,row_number() over (order by b.cdt) rno
-				,a.edate time
-				,a.sdate time2
+                    ,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 c.submittime is null then 0 else 1 end intval3
+				    ,case when c.checktime is null then 0 else 1 end intval4
+				    ,a.attrate intval5
+				    ,a2.studytime intval6
+				    ,a.iscomplete intval7
+				    ,row_number() over (order by b.cdt) rno
+				    ,a.edate time
+				    ,a.sdate time2
+				    ,null testsdate
+				    ,null testedate
 				from lect a
 				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
@@ -523,6 +533,8 @@
                     ,row_number() over (order by b.cdt) rno
                     ,a.edate time
 					,a.sdate time2
+					,null testsdate
+			        ,null testedate
                 from lect a
                 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
@@ -545,6 +557,8 @@
               ,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
             	then 1 else 0 end ispass
+			  ,c.testsdate
+			  ,c.testedate
             from lect a
             inner join cm b on b.cmno=a.cmno
             inner join cmex c on c.exno=#exno#
@@ -567,16 +581,16 @@
             <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
-            ,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) &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 cmexq d on d.eqno=c.eqno
             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 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) &lt;= ifnull(b.relaylimit, 999)
         </select>
         <select id="cr.userexamquestionitem.get" parameterClass="hashtable" resultClass="questionitem">
diff --git a/BO/obj/Debug/NP.BO.dll b/BO/obj/Debug/NP.BO.dll
index 24664411e1b9425295db4d39de27f93ad566f038..c752d62ee604d4d0b9ad8c082b662c92ca851618 100644
GIT binary patch
delta 96
zcmZoT!_{zxYeEOJt+sz-cWXD})^4VwwE`twp3k<P+2gjMWOG<=|B}bs6Y7{g$mswT
yWikK(6A;TVGB9N9W@5;g%ft{A>=OLh+V=Br{dEqTCsjIz@}zriubIo#!T|s@>?8~T

delta 96
zcmZoT!_{zxYeEO}BUiu1?$&O`t=&vVYXxpt?3lYHUBjdM+r-jVpI_^?C)6>0kkbJw
y%47fnCLoq!WMIhH&BTx~mx&=L*d=)DjRm!S)m2U%nGfUQZ+JUyubIo#!T|t!LM4;{

diff --git a/BO/obj/Debug/NP.BO.pdb b/BO/obj/Debug/NP.BO.pdb
index c4900dd9bb136f1f85bc22a7dd4d20c33fb348d4..82c5710cac705774ed0bcdce6b54564eef9bd662 100644
GIT binary patch
delta 10611
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

delta 10162
zcmaKy4R96J701tg5Ayg(CGsgGNI;<U0YMF91OmP&M$AJjAeE1V@DXgGQgtc?B)CWr
z(b5r!`iQlKW~SCkV&j0O7TSSyI#Z`mXhEB)ShWTRhbXkR7?ApU?(W@vyLaFHFEecJ
z{_g*O?z#8u-CfA$tGS!6=C*X}b=^Pjn7v96(d+H|HqGAn=xy6qeYm8$Jy~|3pjYSE
zo}bl?Xixm$j1arZCe$TLo=lX8)<j9<ulMvyr&&aO*LGN~1=}JYR~1z>whbeCR$jG_
zrta=ff+`xnRY-KLx*({jd+NrH$lU9LeM(0Y-6O}sM^yIN*AW>K;qzfWPYL$z6DP{?
z^>tK4GS+~xL`T#G+b8d=<1>!Wn$NKDMBgy@%q${`#T+BsXS4EoG3-+@mFQo-nCeG+
zJX1@F(vgf$>&3H?l3c5zQC@n`?a2wdKguNJ^@ti6Y3yOX-p}o<v8~K%Jg1=Nxg4S)
zuFleg5zh2x7iw%Gvl|TTKENJj_M{;ROZ4=OMhlqF>~=%IB|x{H8OKydFnf#Hp3Gq8
zdy^!mdr)t#16QXFCc*4<9~TBq`{xtA+AYIcyFQQfjmV<Sy%Z|8#R;O}y`0Xnpj??8
zKy3xzO}-*YEoHs*sSW!qxtnOE66-#{XST}6QYV#9XV|B19#JDFClB3cR5h=TO4=^|
z#23zZD*3G4M2FWAeWbF{efDnB#?zvFj)i?%ETS$onYz!*TZt}m{kmgK6?Qq}Ddn>^
zo(=UxlT;b#KCiw&bc!p%^Vz9<nz|xwJpZYOF0(J6ckp?N(@*{_3+KQEqH?uH-r^~C
zneYBHK9>4G`CJYAym^J^Br08rbe|Dl5l!>^eDjJko(K4>jc1k+-u|Kc9AY*=Rl8)V
zBg*GY*yntAv(F;lWp~*lb;g>y@yo~%UMKgEA-?23gVlu`+B(V4`p3*{JYeO_RvSE9
zEQZZ$0`-7Zy#;;EAY2XDI>5FvyGs?OjOXPqvp?QP(3^&U+wufGr>a&TX#OBU3)D*M
z?E8ZSEi$m<`NE=)3;|mT1Wi@TuA818D!k{S&h}p~sM6pW8z$)Oz+lwAAmf}FF6bxq
zkMHi+Q?@pY5VXl_UE)@>UNkxE@<>7BJvMrjpy~BTn;lle&*14EYvk5#siURBfgR%n
zy`GvgFXA*Cig<y&zApt@2e@_8V|5e!J$G`eJ>&YFVnJVcU8^SwT9Jv-Hp#C%!L4__
zuCJ5`s`9dmP3BefST(mE$=IBlBItw%8+l=V=n2P97u1#+&V@2TH+isdhM;8`pU3YI
zRP4cncM2-^T37B8w9$*PwnES;uQf9n$ZG#AK~H5|C(agBlxZ&KcQ1QhExD2pa%-+C
z`5vk;<Vmul^SGzFrn5f-_AWDiPqGhPH}GDM4JRGWVR*nNOl=p@C6RPGbxuU*S`EpS
z3xxOBzlIu;sw)q+A^8Baf$D<JwlGuAW763Uz@GPeT3Wy+AbbO`BYsoO^BusfPGEWo
zFj{DynSsnqGgBC3R$#j0z%;>ZkYOqA3z`NzmjU+Og<P&C(=9-_1F+|rnLL|yo%=A5
z#n!4rm91n)0s9kRZv*x|Gb{T#70>#Fq5Im}hl*!q?uvM_%g6F4?wjs-GPX$2DAieK
z<HBr>-Bqy39ENT{UAQzX^mI=!+hPb9TO1rrsxT)yM2OVXoM`@JxfwZ!{AmhzbzlCk
zwKu8^D+{vJGc0G9{b84#+|x}$ci9_cskGygAB*POn`S27SKPDAY4Ufkf1L5;t(Afj
ziuKjz-eSg|o%RuA>2x!*V#WFeJk#k9q|gNWRhd~iGxyz1H?0P`-OO(B4W@NskLU<t
z#gn_2@QbGc1GVga0oY-{{=&>%S>3bUud}p(p90~3{6bCFv)UXmkC`b!YZMTU1Hv+(
zn+bGPL7jgujwfq?a6?cS*Z?*I-E%<qVzp(Sn%98v*C60=pgXPWGJA16`3VqS)P<^G
z<u2BJsd?>lnVHspI5W#srDK3_8VEQ8=oW@`PX02Br9ikgEVT2Nx>}&y1$29Cotl6B
z9&HA~gCO8rKzA~mPR5s6oCU(pY(k|I%gk%vgPCdVhbo<&zn=X_Ae;;WCV*~!cAaHs
zU&+vYDbNRVe|Dj*TLX0KfbKC*$NB34w*%obo-nLy0J?o9o!tLl0m9czLe?Dux;CIY
z=F?ev_NRdGJ)cn5bpYLGW}TJ%FA%29!eq{JbIs&2Gi_{x0y=*FtDV#?sNq032CxZ$
zl>j!)0&oUkNx<d;woqeg|8q8>r5g0l%(nsi9$;$$t6k3jFl1V%Iv{)+uw8)d2{Dzw
z+=BOppp(C3F9FsJ*g?P!N#@SKemk`R;ah;61nh5Fm>pkc_>U}5=5Ifo0P6(obHJ`R
z%*kKRUaT<RzdZo!1K7Z<jN{7;hh~Ki8wuE0z-|U?vdd)tdiDtyW?^>%HXE?{24>0Z
zD-BSx6@aY<>|wyxXP6br-parb+XmQ=0DIQRc>n*g5yq2^fc+A%7QkBlO#lA-ogeb_
z%Ue($aw+}**fGFP0cQOjzz+dC2iOI`E(KZe`|p227|6a`jd@S#4Om~m2G?-?n;t-g
zK=^gQiU6CWGiU#E*0)rL&eGd!e>-3mfXxAH0W;(GUo{Zk57-*O9tkrie_7od!_cez
zEr2}**iOJwHdFJjZ^1tW!k+`y1lWOWOvabl|0Ww$>?mM=1ndN0?<i*HuV?=r5Ox4|
z9<YCBXU_NE<?PU&8Cq$+MPq<n1K0qMasGPt1s)8u8vu&~c9V(8{r?sdWOgfH<$&D{
z*u6d$`u<z&gZj)Y2W%B!51E;jTxW*K#{hc*upNNa2blK#_d);$AHP2X>}9}y1=t&7
z0sO7TQm2PSNAm-#-FN*ua(=H(Zk2-nybsvNfPKo${ZE9T=lbMTX8mOVJ_bi=eX_N-
SFuFZv{7t;pf-%vK0sjYP$hnUI

diff --git a/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache b/Dao/obj/Debug/Dao.csproj.AssemblyReference.cache
index f5e894aea93a73e58fa9d4feab241bc197ee1a40..9dd79ad38427098614b493caa2853446a36b7e2a 100644
GIT binary patch
literal 4610
zcmeZu3JP{+WMpSxU|=+Nv5E;O%FjwoE{RFc1mpNfKTqcn*O;KxwA7;1yyVp480Y-l
z-26N}pZxUn%)E5Hl$;z!Mxbt0sf0rX7WX(985#Ldm4Kz0fJ$Hhq#Oho>wyGI1CRlv
z8ST?Db5gDJ_4Qq>^r5cM2f6};p{~$JxI!P*3a~2{08L>~ftWZ2$YcZA3FHR_I~p>u
zfNWu8_~<*mWEIbOj^fbFOOi_^O8z+cE;o<!41Bn6iet{Ds!MI69#I@3QKxQhQ+aS*
zzGAvU;Ok|jkC@;8+^#OLbzAq!g7tUKzA^iH=EypOPt!C-jqP{sn!$KWHJ`cZ5#t8c
z?Yos$nC^=_vvTsIdnb1sI_GY&Z8}GZ!QzsF3mr4tH>~ep&By_C(|V4k*)1Q8`WORI
zeW9ZemReMtnV)BCsAr^Spl6_?;9QzhQd*R1o0nQzQk0mZqYzM<l#`k4omv@^pPia#
zo0w)`VPRyMWMPtKU~FWO3N)R8kr_lVGIHb=C+8RCWF~<l03`E-2Sg$OI08UiNQ{6T
zx4kMROw!~*CtMh45?gR(aY<?}#pZB9%+ZU;g`^pf9pt$Q>^jaeLtrQwn;V!iFj^9o
zc0HXEOEQc7QcLupArDKv$=l$mR{&iR*xPJC8)0b}oLqr?)b#5}Qu;-=gy<A}xFpMP
zffMufvmY}grkw2d(m65X^VvY&bGirjN{UVYQ@QMgOWXFJEE`4VlqcWcC+l0hF*85%
z(&iARIH@g)F424cZ*t`<IHR|FqK)^oo6p;Ff*QA4Uv@8HPTl*|&(=k1R_EfSoH+$E
zcDqM!t2CP((>d=2qn49}Y2xv?%O*ujkDmi4lD8GI^AAruc8W0=-5<zl*bJ1438&%I
z6mtv16w9<^V@tDSv*bi@+=2@v<TMNme2^?MAT|vPJ0}*G<fQ7kROTh-W+nqmn2Jhp
z%z|Q*71=}}8=IjHwHF$CU4GvIDFx>jq>MqS<B&53rDkzMGnq?bNg^YqhDkyVbImJB
zEh;F=EKUthEh@_d)&nFNy}>@dUhpcH6>`{#K#g|J&r8cpFD(M*%=|nGO$D3JRR$_N
zO%2SA%o!MMNh}vYq2`-dP>@;#ui2()C&Fqr5kzuFC?v9ca3!;RKv*<H%ZPAnfkv%z
z0#u)()OD1mc*4a$D3O5xwn73{FoNa51S2C=GbBxlF=`e+u(krF@c?sEcxn=bg#sfZ
zeTo`mqKX>d%HYBrJy52G7ce3zNw5Nj3n9%2YI1M^F|2aJ-t4d@saQc6Pjq2&vv}`H
z`NC423Qb3~>0XWt+MLCj3ctl4_-%6~KDBp&{GR1e#~soy_Er7<=vG@5IOl;%w{YQf
zaSiD$cdxv;E)~K1k5lOW;Y@B>mE#YmM}L2Jlh13TpFn`z+waNyf2>jPpBghq^w4>~
z{i(?}jJWewTzqB0o@D6wWrx&buAGi+yNBQg$I*=X6P=kyd>Q=^K0p*9W_pIe0-u<+
zMzX1yg?U=Cg@vV=WwMD$3OI{`0vV+Y0d^L!0&F=RUwfHSbNFCYc~N3Hu&>2Pih0<o
zT$GZC6vME2QW)yEkfOxA;>2W7?OjZg3$Yn0gRN1Z=b2Yrk_hZ)lHz1+{)d$*p#BFb
zW?^$F_A-SOQ?a>F5bA&5#Jt4x)ZEm(5|SK>%}7|JJLearl4KaBuR)oDk*mxE)ax=Z
zHne19<kj<Y4RI?<%uOxNFUkfR4=S!eh5vsb0Cu^voWX+%=|D9KZonRXv4Td0g_$N|
zL_xu^xHvTz*sBGOE%;_87v&e{r<KIO&5S{@AqHr<Sqzqx2QN$+Hk>KmSaAv5E<kcB
a17k7m9D>q>g{4-)F3O;tixBCDpfdpX>I&2V

literal 11
QcmeZu3JP{+WMlvW01Ze1dH?_b

diff --git a/FO/FO.csproj b/FO/FO.csproj
index ad94b11..544e9f6 100644
--- a/FO/FO.csproj
+++ b/FO/FO.csproj
@@ -762,9 +762,13 @@
     <None Include="Web.Develop.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
+<<<<<<< HEAD
     <None Include="Web.Staging.config">
       <DependentUpon>Web.config</DependentUpon>
     </None>
+=======
+    <None Include="Web.Staging.config" />
+>>>>>>> 8c571ed (추가개발2)
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Base\Base.csproj">