From 4a1c5c0d6485543ab9bdbc5951d49e76efcb6f76 Mon Sep 17 00:00:00 2001
From: kdh0120 <kdh0120  @example.com>
Date: Mon, 17 May 2021 01:14:33 +0000
Subject: [PATCH] =?UTF-8?q?<=EC=8B=A0=EA=B7=9C=EA=B0=9C=EB=B0=9C>=201.=20P?=
 =?UTF-8?q?MS=20NO=20:=20NULL=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=EB=82=B4=EC=9A=A9=20(1)=20Base/Controller/FCommonCRoo?=
 =?UTF-8?q?m.cs=20=20=20=20=20BO/Views/cm/cmregex.cshtml=20=20=20=20=20Dao?=
 =?UTF-8?q?/DB/DB1.Scheme.txt=20=20=20=20=20Dao/MyBatis/Maps/CM.xml=20=20?=
 =?UTF-8?q?=20=20=20Dao/MyBatis/Maps/CRoom.xml=20=20=20=20=20FO/Views/CRoo?=
 =?UTF-8?q?m/EstimationExam.cshtml=20=20=20=20=20Model/CM.cs=20=20-=20=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=9E=AC=EC=9D=91=EC=8B=9C?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<기능개선>
1. PMS NO : NULL
2. (주요)작업내용
(1) FO/Controllers/AccountController.cs
 -  가상계좌 입금 로그 정리(테스트용으로 쓴부분)
---
 BO/Views/cm/cmregex.cshtml           |  4 ++++
 Base/Controller/FCommonCRoom.cs      |  5 +++++
 Dao/DB/DB1.Scheme.txt                |  1 +
 Dao/MyBatis/Maps/CM.xml              |  9 +++++----
 Dao/MyBatis/Maps/CRoom.xml           |  4 ++--
 FO/Controllers/AccountController.cs  |  5 -----
 FO/Views/CRoom/EstimationExam.cshtml | 19 +++++++++++++++++++
 Model/CM.cs                          |  2 ++
 8 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/BO/Views/cm/cmregex.cshtml b/BO/Views/cm/cmregex.cshtml
index e56ff80..3be7c1d 100644
--- a/BO/Views/cm/cmregex.cshtml
+++ b/BO/Views/cm/cmregex.cshtml
@@ -143,6 +143,10 @@
                     <label class="col-sm-4 col-md-2 control-label">이어보기설정</label>
                     <div class="col-sm-8 col-md-10" @Html.Partial("./Partial/Radio", ":무제한;1:1회;2:2회;0:미허용", new ViewDataDictionary { { "special", "stringlist" }, { "name", "CMEX.relaylimit" }, { "checked", Model.CMEX.relaylimit }, { "disabled", Model.examsavable } }) (시험응시화면이 닫혔을 경우, 제한시간 내 다시 응시할 수 있는 기준을 설정)</div>
                 </div>
+                <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.Partial("./Partial/Radio", "1:예;0:아니오", new ViewDataDictionary { { "special", "stringlist" }, { "name", "CMEX.isreexamable" }, { "checked", Model.CMEX.exno < 1 ? 1 : Model.CMEX.isreexamable } })</div>
+                </div>
                 <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.Partial("./Partial/Radio", "0:비공개;1:공개", new ViewDataDictionary { { "special", "stringlist" }, { "name", "CMEX.isresultopen" }, { "checked", Model.CMEX.isresultopen } })</div>
diff --git a/Base/Controller/FCommonCRoom.cs b/Base/Controller/FCommonCRoom.cs
index 6ec05de..a7d3a79 100644
--- a/Base/Controller/FCommonCRoom.cs
+++ b/Base/Controller/FCommonCRoom.cs
@@ -196,6 +196,11 @@ namespace NP.Base.Controllers
             }
         }
 
+        [HttpPost]
+        public JsonResult ReExamForUser(int exno, Int64 lectno)
+        {
+            return JsonOK(Dao.Save("lect.reexam", new System.Collections.Hashtable() { { "exno", exno }, { "lectno", lectno }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } }) > 1 ? 1 : 0);
+        }
 
     }
     
diff --git a/Dao/DB/DB1.Scheme.txt b/Dao/DB/DB1.Scheme.txt
index 0189947..f3d5908 100644
--- a/Dao/DB/DB1.Scheme.txt
+++ b/Dao/DB/DB1.Scheme.txt
@@ -532,6 +532,7 @@ create table cmex	(
 	,isusebackup	tinyint						not null
 	,isseq	tinyint						not null
 	,isresultopen tinyint not null default 0
+	,isreexamable tinyint not null default 0
 	,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(exno));
diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml
index 6304693..c19642b 100644
--- a/Dao/MyBatis/Maps/CM.xml
+++ b/Dao/MyBatis/Maps/CM.xml
@@ -704,7 +704,7 @@
         <select id="cm.cmexes" parameterClass="hashtable" resultClass="cmex">
             select a.*
             from (
-                select a.exno,a.cmno,a.extype,a.exname,a.edesc,a.etime,a.econdition,a.evtype,a.eqtype,a.israndq,a.israndqi,a.qcount,a.isblur,a.tpoint,a.relaylimit,a.isusebackup,a.isseq,a.isresultopen,a.cdt,a.udt
+                select a.exno,a.cmno,a.extype,a.exname,a.edesc,a.etime,a.econdition,a.evtype,a.eqtype,a.israndq,a.israndqi,a.qcount,a.isblur,a.tpoint,a.relaylimit,a.isusebackup,a.isseq,a.isresultopen,a.isreexamable,a.cdt,a.udt
                     ,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">a.cdt</isNull>) rno
                     ,count(a.cno) over() pagetotalcount
                 from cmex a
@@ -780,7 +780,7 @@
         </select>
         <update id="cm.cmex.savetop" parameterClass="cmex">
             UPDATE cmex SET <include refid="sql.up"></include>,exname=#exname#,edesc=#edesc#,econdition=#econdition#,isblur=#isblur#,isusebackup=#isusebackup#
-                ,isseq=#isseq#,isresultopen=#isresultopen#,etime=#etime#
+                ,isseq=#isseq#,isreexamable=#isreexamable#,isresultopen=#isresultopen#,etime=#etime#
             where exno=#exno#
         </update>
         <select id="cm.cmex.extype1count" parameterClass="hashtable" resultClass="int">
@@ -790,8 +790,8 @@
         </select>
         <insert id="cm.cmex.in" parameterClass="cmex">
             INSERT INTO cmex
-            (cmno,extype,exname,edesc,etime,econdition,evtype,eqtype,israndq,israndqi,qcount,isblur,tpoint,relaylimit,isusebackup,isseq,isresultopen,isdel,<include refid="sql.inc"></include>)
-            values (#cmno#,#extype#,#exname#,#edesc#,#etime#,#econdition#,#evtype#,#eqtype#,#israndq#,#israndqi#,#qcount#,#isblur#,#tpoint#,#relaylimit#,#isusebackup#,#isseq#,#isresultopen#,0,<include refid="sql.inv"></include>)
+            (cmno,extype,exname,edesc,etime,econdition,evtype,eqtype,israndq,israndqi,qcount,isblur,tpoint,relaylimit,isusebackup,isseq,isreexamable,isresultopen,isdel,<include refid="sql.inc"></include>)
+            values (#cmno#,#extype#,#exname#,#edesc#,#etime#,#econdition#,#evtype#,#eqtype#,#israndq#,#israndqi#,#qcount#,#isblur#,#tpoint#,#relaylimit#,#isusebackup#,#isseq#,#isreexamable#,#isresultopen#,0,<include refid="sql.inv"></include>)
             <selectKey type="post" property="exno" resultClass="int">SELECT  LAST_INSERT_ID()</selectKey>
         </insert>
         <update id="cm.cmex.up" parameterClass="cmex">
@@ -811,6 +811,7 @@
             ,relaylimit     =#relaylimit#
             ,isusebackup    =#isusebackup#
             ,isseq          =#isseq#
+            ,isreexamable   =#isreexamable#
             ,isresultopen=#isresultopen#
             where exno=#exno#
         </update>
diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 86f5b7e..d6dfabc 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -486,9 +486,9 @@
             order by a.dtype,a.rno
         </select>
         <select id="cr.lectex" parameterClass="hashtable" resultClass="lectex">
-            select a.lectno,a.attrate
+            select a.lectno,a.attrate,a.iscomplete
             ,b.sstime,b.setime
-            ,c.exno,c.exname,c.extype,c.edesc,c.econdition,c.etime,c.evtype,c.eqtype,c.israndq,c.israndqi,c.qcount,c.isblur,c.tpoint,ifnull(c.relaylimit,999) relaylimit,c.isusebackup,c.isseq,c.isresultopen
+            ,c.exno,c.exname,c.extype,c.edesc,c.econdition,c.etime,c.evtype,c.eqtype,c.israndq,c.israndqi,c.qcount,c.isblur,c.tpoint,ifnull(c.relaylimit,999) relaylimit,c.isusebackup,c.isseq,c.isreexamable,c.isresultopen
             ,d.lectno exlectno,d.estart,d.eend,d.tpoint,d.recount,d.rechecktime,ifnull(d.entercount,0) entercount,d.cblock
             ,case when a.etime = 0 then 99999999 else TIMESTAMPDIFF(MINUTE, now(), date_add(ifnull(d.estart, now()), interval c.etime MINUTE)) end rtime
             ,d.recount
diff --git a/FO/Controllers/AccountController.cs b/FO/Controllers/AccountController.cs
index dea7f1e..88e6e44 100644
--- a/FO/Controllers/AccountController.cs
+++ b/FO/Controllers/AccountController.cs
@@ -891,7 +891,6 @@ namespace NP.FO.Controllers
 
         public String XPayVBankMoney()
         {
-            SetError("Account : XPAYVBankMoney");
             var x = new Xpay();
             x.LGD_RESPCODE = Request.Params.Get("LGD_RESPCODE");
             x.LGD_RESPMSG = Request.Params.Get("LGD_RESPMSG");
@@ -956,7 +955,6 @@ namespace NP.FO.Controllers
 
             try
             {
-                SetError("Account : XPAYVBankMoney : 959");
                 // (3) Init_TX: 메모리에 mall.conf, lgdacom.conf 할당 및 트랜잭션의 고유한 키 TXID 생성
                 xpay.Init_TX(x.LGD_MID);
                 x.LGD_HASHDATA2 = xpay.GetHashDataCas(x.LGD_MID, x.LGD_OID, x.LGD_AMOUNT, x.LGD_RESPCODE, x.LGD_TIMESTAMP);
@@ -978,7 +976,6 @@ namespace NP.FO.Controllers
             String resultMSG = "결제결과 상점 DB처리(LGD_CASNOTEURL) 결과값을 입력해 주시기 바랍니다.";
             if (x.LGD_HASHDATA2.Equals(x.LGD_HASHDATA))
             { //해쉬값 검증이 성공이면
-                SetError("Account : XPAYVBankMoney : 981 : "+x.LGD_RESPCODE);
                 if (("0000".Equals(x.LGD_RESPCODE)))
                 { //결제가 성공이면
                     if ("R".Equals(x.LGD_CASFLAG))
@@ -1009,7 +1006,6 @@ namespace NP.FO.Controllers
                         };
                         if (Dao.Save("pay.paylect.vbankin", payvbankin) < 3)
                         {
-                            SetError("Account : XPAYVBankMoney : 1009");
                             //상품구매완료 처리 (최소 3건 업데이트 (payvbankin, pay)
                             return "FAIL";
                         }
@@ -1032,7 +1028,6 @@ namespace NP.FO.Controllers
                    * 상점결과 처리가 정상이면 "OK"
                    */
                   //if( 결제실패 상점처리결과 성공 ) 
-                    SetError("Account : XPAYVBankMoney : 1032");
                     return "FAIL";
                 }
             }
diff --git a/FO/Views/CRoom/EstimationExam.cshtml b/FO/Views/CRoom/EstimationExam.cshtml
index 0793a25..5320933 100644
--- a/FO/Views/CRoom/EstimationExam.cshtml
+++ b/FO/Views/CRoom/EstimationExam.cshtml
@@ -9,6 +9,7 @@
     <tr><th>시험내용</th><td>@Html.Raw((Model.LectEX.edesc??"").Replace(System.Environment.NewLine, "<br />"))</td></tr>
     <tr><th>제한시간</th><td>@(Model.LectEX.etime == 0 ? "제한없음" : string.Format("{0} 분", Model.LectEX.etime))</td></tr>
     <tr><th>응시시간</th><td>@Model.LectEX.sstime.ToString("yy-MM-dd") 00:00 ~ @Model.LectEX.setime.ToString("yy-MM-dd") 23:59</td></tr>
+    <tr><th>재응시여부</th><td>@(Model.LectEX.isreexamable == 0 ? "불가능" : "가능")</td></tr>
     <tr><th>응시상태</th><td>@(Model.LectEX.estart == null ? ("응시전"+(Model.LectEX.recount > 0 ? string.Format(" (재응시승인 {0}회)", Model.LectEX.recount):"")) : Model.LectEX.eend != null ? "응시완료" : Model.LectEX.rtime < 1 ? "응시시간초과":("응시시작 (남은시간 " + Model.LectEX.rtime + "분)" +(Model.LectEX.relaylimit.Value <= Model.LectEX.entercount?", [이어보기 초과]":"")))</td></tr>
     @if (Model.LectEX.estart != null)
     {
@@ -17,6 +18,10 @@
 </table>
 <ul class="lctBtn col1">
     <li><a href="#" class="bk" onclick="goexam()">@(Model.LectEX.eend == null && (Model.LectEX.estart == null || Model.LectEX.relaylimit.Value >= Model.LectEX.entercount) ? "응시하기" : "결과보기")</a></li>
+    @if (Model.LectEX.setime > DateTime.Now && Model.LectEX.estart != null && Model.LectEX.isreexamable == 1 && Model.LectEX.iscomplete != 1)
+    {
+        <li><a href="#" class="bk" onclick="javascript:reexam(@Model.LectEX.exno,@Model.LectEX.lectno)">재응시</a></li>
+    }
 </ul>
 <form id="mform" action="/CRoom/Estimation?@Model.croomparam" method="get">
     @Html.HiddenFor(m => m.croomlectno)
@@ -62,5 +67,19 @@
                 }
             }
         }
+        function reexam(exno, lectno) {
+            confirmtoggle(true, "이전 시험기록을 초기화하고 다시 시험에 응시하시겠습니까? ", "gogo(" + exno + "," + lectno + ")");
+        }
+        function gogo(exno, lectno) {
+            capp("/fcommon/reexamforuser", { exno: exno, lectno: lectno }, "cbreexam");
+        }
+        function cbreexam() {
+            if (capResult.code == 1000) {
+                msg("재응시 처리했습니다.", null, null, null, true);
+                setTimeout(function () {
+                    refresh();
+                }, 1000);
+            }
+        }
     </script>
 }
\ No newline at end of file
diff --git a/Model/CM.cs b/Model/CM.cs
index ce3d21e..37ae46a 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -1821,6 +1821,7 @@ namespace NP.Model
         /// 시험결과공개여부
         /// </summary>
         public int isresultopen { get; set; }
+        public int isreexamable { get; set; }
         public IList<CMEXLayer> cmexlayers { get; set; }
         public IList<CMEXQ> cmexqs { get; set; }
 
@@ -3166,6 +3167,7 @@ namespace NP.Model
         public Int64 exlectno { get; set; }
         public IList<LectEXQ> UED { get; set; }
         public int issubmit { get; set; }
+        public int? iscomplete { get; set; }
     }
     [Serializable]
     public class LectEXQ : LectEX