From 0483aef5dcb67259ba8488fc209c204904e5ddc6 Mon Sep 17 00:00:00 2001
From: shjang <shjang  @example.com>
Date: Wed, 10 Aug 2022 00:34:44 +0000
Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?=
 =?UTF-8?q?MS=20NO=20:=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EB=82=B4=EC=9A=A9=20:=20=EC=88=98=EA=B0=95=EC=8B=A0=EC=B2=AD?=
 =?UTF-8?q?=EC=8B=9C=20=EA=B5=90=EC=9C=A1=EC=9D=BC=EC=A0=95=20=EC=8B=9C?=
 =?UTF-8?q?=EC=9E=91=20=EC=A2=85=EB=A3=8C=EC=9D=98=20=EA=B0=92=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20lect=EC=97=90=20=EB=84=A3=EA=B8=B0,=20=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=EC=9D=BC=EC=A0=95=EB=B3=80=EA=B2=BD=20=ED=8C=9D?=
 =?UTF-8?q?=EC=97=85=20=09/Base/Controller/FCommonPay.cs=20=09/Dao/MyBatis?=
 =?UTF-8?q?/Maps/Lect.xml=20=09/Dao/MyBatis/Maps/Pay.xml=20=09/FO/Controll?=
 =?UTF-8?q?ers/CourseController.cs=20=09/FO/Controllers/FOBaseController.c?=
 =?UTF-8?q?s=20=09/FO/Controllers/MyController.cs=20=09/FO/Views/Course/Ap?=
 =?UTF-8?q?plyPay.cshtml=20=09/FO/Views/Course/SmartSearch.cshtml=20=09/FO?=
 =?UTF-8?q?/Views/Course/XpayREQ.cshtml=20=09/FO/Views/My/LectureOn.cshtml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Base/Controller/FCommonPay.cs      |   5 ++
 Dao/MyBatis/Maps/Lect.xml          |   5 +-
 Dao/MyBatis/Maps/Pay.xml           | 120 +++++++++++++++++++++--------
 FO/Controllers/CourseController.cs |  61 +++++++--------
 FO/Controllers/FOBaseController.cs |   1 +
 FO/Controllers/MyController.cs     |  15 +++-
 FO/Views/Course/ApplyPay.cshtml    |   1 -
 FO/Views/Course/SmartSearch.cshtml |  36 ++-------
 FO/Views/Course/XpayREQ.cshtml     |   4 +-
 FO/Views/My/LectureOn.cshtml       |  91 ++++++++++++++++++++--
 10 files changed, 233 insertions(+), 106 deletions(-)

diff --git a/Base/Controller/FCommonPay.cs b/Base/Controller/FCommonPay.cs
index 2c3ef7f..a5929f7 100644
--- a/Base/Controller/FCommonPay.cs
+++ b/Base/Controller/FCommonPay.cs
@@ -168,6 +168,7 @@ namespace NP.Base.Controllers
             {
                 return JsonBack(new JsonRtn() { code = 1000, msg = "승인된 승인대기신청데이터가 아닙니다.", obj = 0 });
             }
+
             vm.PayItems = new List<PayItem>() { };
             if (vm.payno > 0)
             {
@@ -250,6 +251,7 @@ namespace NP.Base.Controllers
                     });
                 }
             }
+
             if (vm.isgroup == 1)
             {
                 
@@ -288,6 +290,7 @@ namespace NP.Base.Controllers
                     }
                 }
             }
+
             //교재확인
             if (!vm.ispaycert && vm.PayItems.Where(w => w.ptype == 2).Count() > 0)
             {
@@ -303,6 +306,7 @@ namespace NP.Base.Controllers
                     pi.orgamt = pi.payamt = b.price * (pi.pcnt < 1 ? 1 : pi.pcnt);
                 }
             }
+
             if (vm.ispaycert)
             {
                 //자격증강좌 결제 시작
@@ -438,6 +442,7 @@ namespace NP.Base.Controllers
                 {
                     vm.Pay.ptype = 1;
                 }
+
                 if (Dao.PayIn(vm.Pay) > 0)
                 {
                     var pginfos = GetConfig("pginfo").Split('|');
diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml
index 103f7fc..931226d 100644
--- a/Dao/MyBatis/Maps/Lect.xml
+++ b/Dao/MyBatis/Maps/Lect.xml
@@ -1603,10 +1603,11 @@
 			left outer join cminningscd scd on scd.cmisno = a.cmisno
 			left outer join cminning ci on ci.cmino = scd.cmino
 			left outer join comcode cc on cc.ccode = b.studyplace
-			where a.userno=#userno# and a.status=1 and a.ischanged=0 and a.sdate &lt; <include refid="sql.now"></include>
+			where a.userno=#userno# and a.status=1 and a.ischanged=0 <!-- 20220810 and a.sdate &lt; <include refid="sql.now"></include>-->
+			<!--20220810 where a.userno=#userno# and a.status=1 and a.ischanged=0 and a.sdate &lt; <include refid="sql.now"></include>-->
 			<isNotNull property="cshape">and b.cshape=#cshape#</isNotNull>
 			<isNotNull property="issubtable">
-				and (ifnull(a.iscomplete,0) = 0 and b.cshape = 2 and scd.estart &gt; '1900-01-01' and scd.eend &gt; '1900-01-01'
+				and (ifnull(a.iscomplete,0) = 0  <!-- 20220810 and b.cshape = 2 --> and scd.estart &gt; '1900-01-01' and scd.eend &gt; '1900-01-01'
 				<!--and scd.estart &gt; now()-->
 				<!--and (date_add(scd.eend,interval +5 day) &gt; date_format(now(),'%Y-%m-%d 23:59:59'))-->
 				and date_add(a.cdt, interval +1 year) &gt;= date_format(now(),'%Y-%m-%d 23:59:59'))
diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml
index ef50bcf..76d179b 100644
--- a/Dao/MyBatis/Maps/Pay.xml
+++ b/Dao/MyBatis/Maps/Pay.xml
@@ -46,10 +46,16 @@
         <update id="pay.lect.sedate.save" parameterClass="pay">
             update lect a
             inner join cm b on a.cmno = b.cmno
-            inner join pay c on a.payno = c.payno
+            <!--20220809 inner join pay c on a.payno = c.payno-->
             left outer join cminningscd d on d.cmisno = a.cmisno
             set  
-              a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
+			    a.sdate =
+                    case
+					    when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
+              	        else date_format(a.cdt,'%Y-%m-%d 00:00:00')
+              	    end
+                , a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
+              <!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
             	  else
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
             	  	else b.sstime end
@@ -64,9 +70,10 @@
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
             	  	else b.setime
             	  	end
-            	  end
+            	  end-->
               ,a.udt=now(),a.uno=#uno#,a.uip=#uip#
-            where a.payno = #payno# and c.pstatus = 1
+            where a.payno = #payno#;
+			<!--20220809 and c.pstatus = 1-->
         </update>
         <select id="pay.paydvrs" parameterClass="hashtable" resultClass="paydvr">
             select a.*
@@ -302,10 +309,16 @@
             <!--수강시작일 / 종료일 추가 2021-01-21-->
             update lect a
             inner join cm b on a.cmno = b.cmno
-            inner join pay c on a.payno = c.payno
+            <!--20220809 inner join pay c on a.payno = c.payno-->
             left outer join cminningscd d on a.cmisno = d.cmisno
             set
-              a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
+			    a.sdate =
+                    case
+					    when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
+              	        else date_format(a.cdt,'%Y-%m-%d 00:00:00')
+              	    end
+                , a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
+              <!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
             	  else
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
             	  	else b.sstime end
@@ -320,8 +333,9 @@
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
             	  	else b.setime
             	  	end
-            	  end
-            where a.payno = #payno# and c.pstatus = 1
+            	  end-->
+			where a.payno = #payno#;
+			<!--20220809 and c.pstatus = 1-->
         </update>
         <update id="pay.paydvr.save" parameterClass="hashtable">
             update paydvr set <include refid="sql.up"></include>
@@ -353,10 +367,16 @@
             
             update lect a
             inner join cm b on a.cmno = b.cmno
-            inner join pay c on a.payno = c.payno
+            <!--20220809 inner join pay c on a.payno = c.payno-->
             left outer join cminningscd d on d.cmisno = a.cmisno
             set
-              a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
+			    a.sdate =
+                    case
+					    when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
+              	        else date_format(a.cdt,'%Y-%m-%d 00:00:00')
+              	    end
+                , a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
+              <!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
               	  else
               	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
               	  	else b.sstime end
@@ -371,8 +391,9 @@
               	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
               	  	else b.setime
               	  	end
-              	  end
-            where a.payno = #payno# and c.pstatus = 1 and c.payoktime is not null;
+              	  end-->
+            where a.payno = #payno#;
+			<!--20220809 and c.pstatus = 1 and c.payoktime is not null;-->
         </update>
         <select id="pay.pay" parameterClass="hashtable" resultClass="pay">
             select a.payno,a.ptype,a.isgroup,a.isexam,a.userno,a.pstatus,a.payamt,a.rstatus,a.refundamt,a.ispg,a.paylimit
@@ -432,10 +453,16 @@
           <!--수강시작일 / 종료일 추가 2021-01-21-->
           update lect a
           inner join cm b on a.cmno = b.cmno
-          inner join pay c on a.payno = c.payno
+          <!--20220809 inner join pay c on a.payno = c.payno-->
           left outer join cminningscd d on d.cmisno = a.cmisno
           set
-            a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
+		        a.sdate =
+                    case
+					    when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
+              	        else date_format(a.cdt,'%Y-%m-%d 00:00:00')
+              	    end
+                , a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
+             <!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
             	  else
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
             	  	else b.sstime end
@@ -450,8 +477,9 @@
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
             	  	else b.setime
             	  	end
-            	  end
-          where a.payno = #payno# and c.pstatus = 1
+            	  end-->
+          where a.payno = #payno#;
+		  <!--20220809 and c.pstatus = 1;-->
 
           <!--update examuser a
             inner join pay b on b.isexam=1 and b.payno=#payno# and b.pstatus in (22,1)
@@ -495,10 +523,16 @@
             
             update lect a
             inner join cm b on a.cmno = b.cmno
-            inner join pay c on a.payno = c.payno
+            <!--20220809 inner join pay c on a.payno = c.payno-->
             left outer join cminningscd d on d.cmisno = a.cmisno
             set
-              a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
+			    a.sdate =
+                    case
+					    when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
+              	        else date_format(a.cdt,'%Y-%m-%d 00:00:00')
+              	    end
+                , a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
+              <!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
             	  else
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
             	  	else b.sstime end
@@ -513,8 +547,9 @@
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
             	  	else b.setime
             	  	end
-            	  end
-            where a.payno = #payno# and c.pstatus = 1;
+            	  end-->
+			where a.payno = #payno#;
+			<!--20220809 and c.pstatus = 1;-->
             
             <!--update examuser a
             inner join pay b on b.isexam=1 and b.payno=a.payno and b.pstatus=1 --><!--and b.pgkey=#pgkey#--><!--
@@ -979,10 +1014,16 @@
 
             update lect a
             inner join cm b on a.cmno = b.cmno
-            inner join pay c on a.payno = c.payno
+            <!--20220809 inner join pay c on a.payno = c.payno-->
             left outer join cminningscd d on d.cmisno = a.cmisno
             set
-              a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
+			    a.sdate =
+                    case
+					    when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
+              	        else date_format(a.cdt,'%Y-%m-%d 00:00:00')
+              	    end
+                , a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
+              <!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
             	  else
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
             	  	else b.sstime end
@@ -997,8 +1038,9 @@
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
             	  	else b.setime
             	  	end
-            	  end
-            where a.payno = #payno# and c.pstatus = 1;
+            	  end-->
+            where a.payno = #payno#;
+			<!--20220809 and c.pstatus = 1;-->
         </update>
         <update id="pay.abspay" parameterClass="hashtable">
             update examuser a
@@ -1025,10 +1067,16 @@
             <!--수강시작일 / 종료일 추가 2021-01-21-->
             update lect a
             inner join cm b on a.cmno = b.cmno
-            inner join pay c on a.payno = c.payno
+            <!--20220809 inner join pay c on a.payno = c.payno-->
             left outer join cminningscd d on d.cmisno = a.cmisno
             set
-              a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
+			    a.sdate =
+                    case
+					    when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
+              	        else date_format(a.cdt,'%Y-%m-%d 00:00:00')
+              	    end
+                , a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
+              <!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
             	  else
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
             	  	else b.sstime end
@@ -1043,8 +1091,9 @@
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
             	  	else b.setime
             	  	end
-            	  end
-            where a.payno = #payno# and c.pstatus = 1
+            	  end-->
+            where a.payno = #payno#;
+			<!--20220809 and c.pstatus = 1;-->
         </update>
         <update id="pay.unpaymoney" parameterClass="hashtable">
           update pay
@@ -1053,10 +1102,16 @@
 
           update lect a
           inner join cm b on a.cmno = b.cmno
-          inner join pay c on a.payno = c.payno
+          <!--20220809 inner join pay c on a.payno = c.payno-->
           left outer join cminningscd d on d.cmisno = a.cmisno
           set
-          a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
+		        a.sdate =
+                    case
+					    when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
+              	        else date_format(a.cdt,'%Y-%m-%d 00:00:00')
+              	    end
+                , a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
+          <!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') 
             	  else
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
             	  	else b.sstime end
@@ -1071,8 +1126,9 @@
             	  	case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
             	  	else b.setime
             	  	end
-            	  end
-            where a.payno = #payno# and c.pstatus = 1;
+            	  end-->
+			where a.payno = #payno#;
+			<!--20220809 and c.pstatus = 1;-->
         </update>
         <select id="pay.pplogs" parameterClass="hashtable" resultClass="pplog">
           select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,CAST(AES_DECRYPT(UNHEX(a.rbankacc), <include refid="sql.digest"></include>) AS char) rbankacc,a.rbankowner,a.isaccommodation,a.cshape,a.isreceipt,a.taxdatereq
diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs
index b95485a..748b057 100644
--- a/FO/Controllers/CourseController.cs
+++ b/FO/Controllers/CourseController.cs
@@ -1024,6 +1024,36 @@ namespace NP.FO.Controllers
             lngTmp[0] = vm.CM.cmino;
             lngTmp[1] = vm.CM.cmisno;
 
+            #region 20220801 선택한 교육장 정보            
+            Hashtable hsData = new Hashtable();
+            hsData.Add("cmno", vm.cmno);
+            var cmInningscdTmp = Dao.Get<CMinningscd>("cm.cminningscds.applyedu", hsData).Where(w => w.cmino == lngTmp[0] && w.cmisno == lngTmp[1]);
+
+            foreach (var item in cmInningscdTmp)
+            {
+                vm.SelectCMInningscd = item;
+                if (item.studyplace != null)
+                {
+                    item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일"));
+                }
+                else
+                {
+                    item.scdInfoSummary = string.Format("{0} ~ {1}", DateTime.Now.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일"));
+                }
+
+                if (item.eend != null)
+                {
+                    item.eend2 = item.eend.ToString("yyyy년 MM월 dd일");
+                }
+
+                //vm.SelectCMInningscd.scdInfoSummary = string.Format("{0}", vm.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일까지"));
+                if (vm.SelectCMInningscd.estart < Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")))
+                {
+                    vm.SelectCMInningscd.isEnd = true;
+                }
+            }
+            #endregion
+
             if (vm.payno > 0)
             {
                 //신청대기 => 승인 => 결제진입
@@ -1108,6 +1138,7 @@ namespace NP.FO.Controllers
                     return Redirect("/");
                 }
             }
+
             vm.CM = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "cmno", vm.PPLog.cmno } }).First();
             vm.User = Dao.Get<Users>("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).First();
             vm.viewname4 = "/Course/OnPayReturn";
@@ -1116,36 +1147,6 @@ namespace NP.FO.Controllers
             vm.CM.cmino = lngTmp[0];
             vm.CM.cmisno = lngTmp[1];
 
-            #region 20220801 선택한 교육장 정보            
-            Hashtable hsData = new Hashtable();
-            hsData.Add("cmno", vm.cmno);
-            var cmInningscdTmp = Dao.Get<CMinningscd>("cm.cminningscds.applyedu", hsData).Where(w => w.cmino == lngTmp[0] && w.cmisno == lngTmp[1]);
-
-            foreach (var item in cmInningscdTmp)
-            {
-                vm.SelectCMInningscd = item;
-                if (item.studyplace != null)
-                {
-                    item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일"));
-                }
-                else
-                {
-                    item.scdInfoSummary = string.Format("{0} ~ {1}", DateTime.Now.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일"));
-                }
-
-                if (item.eend != null)
-                {
-                    item.eend2 = item.eend.ToString("yyyy년 MM월 dd일");
-                }
-
-                //vm.SelectCMInningscd.scdInfoSummary = string.Format("{0}", vm.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일까지"));
-                if (vm.SelectCMInningscd.estart < Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")))
-                {
-                    vm.SelectCMInningscd.isEnd = true;
-                }
-            }
-            #endregion
-
             return View(vm);
         }
         [NP.Base.Auth.CFilter]
diff --git a/FO/Controllers/FOBaseController.cs b/FO/Controllers/FOBaseController.cs
index 16e15e0..893488a 100644
--- a/FO/Controllers/FOBaseController.cs
+++ b/FO/Controllers/FOBaseController.cs
@@ -631,6 +631,7 @@ namespace NP.FO.Controllers
                                         vm.Pay.cardprtccode = xpay.Response("LGD_PCANCELFLAG", 0);
                                         vm.Pay.checkflag = xpay.Response("LGD_CARDGUBUN2", 0);
                                     }
+
                                     vm.Pay.payresult = xpay.Response("LGD_RESPCODE", 0);
                                     vm.Pay.payresultmsg = xpay.Response("LGD_RESPMSG", 0);
                                     vm.Pay.pgkey = xpay.Response("LGD_TID", 0);
diff --git a/FO/Controllers/MyController.cs b/FO/Controllers/MyController.cs
index 0cb1560..aca500b 100644
--- a/FO/Controllers/MyController.cs
+++ b/FO/Controllers/MyController.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
-
+using System.Collections;
 using NP.Model;
 using NP.Base;
 using System.Web.Routing;
@@ -158,12 +158,21 @@ namespace NP.FO.Controllers
         public ActionResult Lecture(VMMy vm)
         {
             ViewBag.reporturl = GetConfig("reporturl");
-            vm.Lects = Dao.Get<Lect>("lect.mylectures", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "cgcode", vm.intval > 0 ? TestCode3 : null }, { "cshape", vm.stringval } });   
+            Hashtable hsData = new Hashtable();
+            hsData.Add("userno", SUserInfo.UserNo);
+            hsData.Add("cgcode", vm.intval > 0 ? TestCode3 : null);
+            hsData.Add("cshape", vm.stringval);
+            vm.Lects = Dao.Get<Lect>("lect.mylectures", hsData);   
             return View(vm);
         }
         public ActionResult LectureOn(VMMy vm)
         {
-            vm.Lects = Dao.Get<Lect>("lect.mylectures", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "cgcode", vm.intval > 0 ? TestCode3 : null }, { "cshape", 2 },{"issubtable" ,1} });
+            Hashtable hsData = new Hashtable();
+            hsData.Add("userno", SUserInfo.UserNo);
+            hsData.Add("cgcode", vm.intval > 0 ? TestCode3 : null);
+            //hsData.Add("cshape", 2);
+            hsData.Add("issubtable", 1);            
+            vm.Lects = Dao.Get<Lect>("lect.mylectures", hsData);
             return View(vm);
         }
         public ActionResult CertPrint(VMMy vm)
diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml
index 5b53ffb..123f45b 100644
--- a/FO/Views/Course/ApplyPay.cshtml
+++ b/FO/Views/Course/ApplyPay.cshtml
@@ -230,7 +230,6 @@
             else {
                 if (capResult.obj.ptype == 6 || capResult.obj.ptype == 7) {
                     location.href = "@Model.viewname4?payno=" + capResult.obj.payno + "&absptype=" + capResult.obj.ptype;
-                    alert(location.href);
                     return;
                 }
                 else {
diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml
index 9a440ea..8ea7501 100644
--- a/FO/Views/Course/SmartSearch.cshtml
+++ b/FO/Views/Course/SmartSearch.cshtml
@@ -333,7 +333,7 @@
     }
 
     //20220726 교육장, 교육일정 조회
-    function getCmInning(cshape, cmno, place) {
+    function getCmInning(cshape, cmno) {
         var btnSelect = $("#btnSelect" + cmno)
         var divInfo = $("#divInfo_" + cmno);
         var divPlace = $("#divPlace_" + cmno);
@@ -355,7 +355,8 @@
     }
 
     //20220729 교육장 또는 교육장별 교육일정 정보 생성
-    function renderScdInning(job, cshape, cmno, studyPlace) {
+    // job (1=교육장정보+교육일정 활성화, 0=교육일정만 활성화)
+    function renderScdInning(job, cshape, cmno) {
         let strTmp = "";
         let strStudyPlaceTag = "";
         var divPlace = $("#divPlace_" + cmno);
@@ -448,9 +449,10 @@
             var aApplyClass = $("<a />", { "onclick": "javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ");" });
             /*var spanApplyClass = $("<span />", { "class": "smtlChkBtn smtlChk03", "style": "font-size:18px" });*/
             var spanApplyClass = $("<span />", { "style": "font-size:18px" });
-            var radioEduDay = "<input type='radio' style='display:none' name='rdoScds' value='" + d.cmisno + /*"' onclick='javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ")*/ + "' ";
+            var radioEduDay = "<input type='radio' style='display:none' name='rdoScds' value='" + d.cmisno + "' ";
+            /*var radioEduDay = "<input type='radio' style='display:none' name='rdoScds' value='" + d.cmisno + "' onclick='javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ") + "' ";*/
             var strStudyPlacename = "";
-            if (d.studyplace != null && d.studyplace !='' &&  d.studyplacename != '') {
+            if (d.studyplace != null && d.studyplace != '' && d.studyplacename != null &&  d.studyplacename != '') {
                 strStudyPlacename = '[' + d.studyplacename + '교육장]';
             }
 
@@ -467,6 +469,7 @@
                             spanApplyClass.text("수강신청");
                             aApplyClass.append(spanApplyClass);
                             pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + " checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
+                            pData.append(aApplyClass);
                         }
                         else {
                             spanApplyClass.text("수강신청");
@@ -474,12 +477,6 @@
                             pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label> " + "</label>");
                             pData.append(aApplyClass);
                         }
-                        //if (seq == 0) {
-                        //    li.append("<label>" + radioEduDay + " checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
-                        //}
-                        //else {
-                        //    li.append("<label>" + radioEduDay + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
-                        //}
                     }
                 }
                 else {
@@ -489,29 +486,12 @@
                     else {
                         pData.html("<label>" + strStudyPlacename + " " + radioEduDay + "'> " + d.scdInfoSummary + "</label></label>");
                     }
-                    //if (seq == 0) {
-                    //    li.append("<label>" + radioEduDay + " checked> " + d.scdInfoSummary + "</label>");
-                    //}
-                    //else {
-                    //    li.append("<label>" + radioEduDay + "'> " + d.scdInfoSummary + "</label>");
-                    //}
                 }
             }
 
-
-            //aApplyClass.append(spanApplyClass);
-            //pData.append(aApplyClass);
             li.append(pData);
-            //li.append(aApplyClass);
             ulScd.append(li);
-
-            //ulScd.append(li2);
         });
-        //20220726
-        //alert("model.cmisno" + model.cmisno);
-        //if (model.cmisno != null) {
-        //    $("input:radio[name='rdoScds'][value='" + model.cmisno + "']").click();
-        //}
     }
 
     //20220729 교육장별 교육일정 정보 조회
@@ -530,7 +510,7 @@
             //else {
             //    $("#divPlace_" + cmno).hide();
             //}
-            capp("/focommon/GetScdForMixEdu", { cmno: cmno, studyPlace: studyPlace}, "renderScdInning(0, " + cshape + "," + cmno + "," + studyPlace + ")");
+            capp("/focommon/GetScdForMixEdu", { cmno: cmno, studyPlace: studyPlace}, "renderScdInning(0, " + cshape + "," + cmno + ")");
         }
     }
 
diff --git a/FO/Views/Course/XpayREQ.cshtml b/FO/Views/Course/XpayREQ.cshtml
index a2d5a58..893b5a3 100644
--- a/FO/Views/Course/XpayREQ.cshtml
+++ b/FO/Views/Course/XpayREQ.cshtml
@@ -19,8 +19,8 @@ else
         <input type="hidden" name="@data.Key" id="@data.Key" value="@data.Value" /><br />
         @*@(data.Key + "-" + data.Value)*@
     }
-    <input @*type="hidden"*@ name="CM.cmino" id="becmino" value="@Model.CM.cmino" />
-    <input @*type="hidden"*@ name="CM.cmisno" id="becmisno" value="@Model.CM.cmisno" />
+    <input type="hidden" name="CM.cmino" id="becmino" value="@Model.CM.cmino" />
+    <input type="hidden" name="CM.cmisno" id="becmisno" value="@Model.CM.cmisno" />
 </form>
 
 <script>
diff --git a/FO/Views/My/LectureOn.cshtml b/FO/Views/My/LectureOn.cshtml
index de477b8..ea810c8 100644
--- a/FO/Views/My/LectureOn.cshtml
+++ b/FO/Views/My/LectureOn.cshtml
@@ -73,7 +73,7 @@
                     <a href="javascript:mpgPopClose();"></a>
                 </div>
                 <div class="mpgPopCont">
-                    <ul id="ulScd"></ul>
+                    <div id="divScd"></div>
                     <ul class="mpgPopBtn">
                         <li><a href="#" class="bk" onclick="selectScd()">선택완료</a></li>
                         <li><a href="#" onclick="mpgPopClose()">취소</a></li>
@@ -87,11 +87,11 @@
 
 }
 @section scripts{
-    <script>
-        function warningdate() {
-            $('#layermessage').width('600');
-            msg("<sapn style='font-size: 15pt; text-align: left; margin:auto; display: inherit;'>■ 일정변경은 같은 교육과정에서만 가능합니다<br><br> - <span style='color:blue;'>일정변경 가능</span><br><br> 설계시공 최초 전문B교육 -> 설계시공 최초 전문B교육<br><br> -  <span style='color:red;'>일정변경 불가</span><br><br> 설계시공 최초 전문B교육 -> 설계시공 최초 전문A교육 <br><br>■ 변경 할 일정이  <span style='color:red;'>접수마감</span> 인 경우 해당 일정으로  <span style='color:red;'>변경이 불가능 합니다.</span></span>");
-        }
+<script>
+    function warningdate() {
+        $('#layermessage').width('600');
+        msg("<sapn style='font-size: 15pt; text-align: left; margin:auto; display: inherit;'>■ 일정변경은 같은 교육과정에서만 가능합니다<br><br> - <span style='color:blue;'>일정변경 가능</span><br><br> 설계시공 최초 전문B교육 -> 설계시공 최초 전문B교육<br><br> -  <span style='color:red;'>일정변경 불가</span><br><br> 설계시공 최초 전문B교육 -> 설계시공 최초 전문A교육 <br><br>■ 변경 할 일정이  <span style='color:red;'>접수마감</span> 인 경우 해당 일정으로  <span style='color:red;'>변경이 불가능 합니다.</span></span>");
+    }
     var vLectno;
 
     function pc(lectno,userno) {
@@ -103,15 +103,90 @@
     }
     function ps() {
         window.open("/My/CertSet");
-    }
+        }
+
     function openScd(cmno, lectno) {
         vLectno = lectno
         $(".mpgPop").show();
         setScd(cmno);
     }
+
     function setScd(cmno) {
-        capp("/focommon/GetScdForMixEdu", { cmno: cmno, lectno: vLectno }, "renderScd");
+        capp("/focommon/GetScdForMixEdu", { cmno: cmno, lectno: vLectno }, "renderScdInning(" + cmno + ")");
+        //20220809
+        // capp("/focommon/GetScdForMixEdu", { cmno: cmno, lectno: vLectno }, "renderScd");
+        }
+
+    function renderScdInning(cmno) {
+        
+        let strTmp = "";
+        var divScd = $("#divScd");
+
+        divScd.empty();
+
+        //강좌일정 태그 생성
+        strTmp = "<ul id='ulScd" + cmno + "'></ul>";
+        divScd.append(strTmp);
+
+        var ulScd = $("#ulScd" + cmno);
+        ulScd.empty();
+        //var seq = 0;
+        if (capResult.obj.length < 1) {
+            var li = $("<li />");
+            li.append("<label> - 선택 가능한 교육종료일이 없습니다.</label>");
+            ulScd.append(li);
+        }
+
+        $.each(capResult.obj, function (i, d) {
+            var li = $("<li />");
+            var pData = $("<p />");
+            //var aApplyClass = $("<a />", { "onclick": "javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ");" });
+            /*var spanApplyClass = $("<span />", { "class": "smtlChkBtn smtlChk03", "style": "font-size:18px" });*/
+            /*var spanApplyClass = $("<span />", { "style": "font-size:18px" });*/
+            var radioEduDay = "<input type='radio' name='rdoScds' value='" + d.cmisno + "' ";
+            /*var radioEduDay = "<input type='radio' style='display:none' name='rdoScds' value='" + d.cmisno + *//*"' onclick='javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ")*//* + "' ";*/
+            var strStudyPlacename = "";
+            if (d.studyplace != null && d.studyplace != '' && d.studyplacename != null && d.studyplacename != '') {
+                strStudyPlacename = '[' + d.studyplacename + '교육장]';
+            }
+
+            if (d.isEnd == true) {
+                pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[종료] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
+            }
+            else {
+                if (d.quota != 0) {
+                    if (d.remainPeople <= 0) {
+                        pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
+                    }
+                    else {
+                        if (d.isselected == 1) {
+                            //spanApplyClass.text("수강신청");
+                            //aApplyClass.append(spanApplyClass);
+                            pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + " checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
+                        }
+                        else {
+                            //spanApplyClass.text("수강신청");
+                            //aApplyClass.append(spanApplyClass);
+                            pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label> " + "</label>");
+                            //pData.append(aApplyClass);
+                        }
+                    }
+                }
+                else {
+                    if (d.isselected == 1) {
+                        pData.html("<label>" + strStudyPlacename + " " + radioEduDay + " checked> " + d.scdInfoSummary + "</label></label>");
+                    }
+                    else {
+                        pData.html("<label>" + strStudyPlacename + " " + radioEduDay + "'> " + d.scdInfoSummary + "</label></label>");
+                    }                    
+                }
+            }
+
+            li.append(pData);            
+            ulScd.append(li);
+        });
     }
+
     function renderScd() {
         var ulScd = $("#ulScd");
         ulScd.empty();