From 5eb8d246d56c780b1c4a7a71262ef6d16e85d82b Mon Sep 17 00:00:00 2001 From: shjang Date: Tue, 2 Aug 2022 07:45:45 +0000 Subject: [PATCH] --- FO/Controllers/CourseController.cs | 93 ++++++++++++++++++++++++++++-- FO/Views/Course/ApplyAgree.cshtml | 48 ++++++--------- FO/Views/Course/ApplyEdu.cshtml | 20 ++----- FO/Views/Course/ApplyPay.cshtml | 71 ++++++++++------------- FO/Views/Course/XpayREQ.cshtml | 2 + 5 files changed, 143 insertions(+), 91 deletions(-) diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index d2010f0..b95485a 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -890,13 +890,15 @@ namespace NP.FO.Controllers [NP.Base.Auth.CFilter] public ActionResult ApplyEdu(VMCourse vm) { + //20220802 추가 long?[] lngTmp = new long?[2]; lngTmp[0] = vm.CM.cmino; lngTmp[1] = vm.CM.cmisno; vm.CM = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "cmno", vm.cmno } }).FirstOrDefault(); + //20220802 추가 vm.CM.cmino = lngTmp[0]; - vm.CM.cmisno = lngTmp[1]; + vm.CM.cmisno = lngTmp[1]; vm.CM.applicableCM = (vm.CM.quota != 0 && vm.CM.quota - vm.CM.lectcnt <= 0) ? "대기접수" : "정상접수"; vm.CMInningscds = Dao.Get("cm.cminningscds.applyedu", new System.Collections.Hashtable() { { "cmno", vm.cmno },{"month", (vm.scdMonth == null)? DateTime.Now.Year : vm.scdMonth } }); @@ -933,7 +935,7 @@ namespace NP.FO.Controllers vm.Assign = new Assign() { }; } - //20220801 선택한 교육장 정보 + #region 20220801 선택한 교육장 정보 Hashtable hsData = new Hashtable(); hsData.Add("cmno", vm.cmno); var cmInningscdTmp = Dao.Get("cm.cminningscds.applyedu", hsData).Where(w => w.cmino == lngTmp[0] && w.cmisno == lngTmp[1]); @@ -960,7 +962,8 @@ namespace NP.FO.Controllers { vm.SelectCMInningscd.isEnd = true; } - } + } + #endregion vm.User = Dao.Get("cm.user.applyedu", new Hashtable() { { "userno", SUserInfo.UserNo } }).FirstOrDefault(); if (!string.IsNullOrEmpty(vm.User.MobileFormat) && vm.User.MobileFormat.IndexOf("-") >= 0) @@ -1015,7 +1018,12 @@ namespace NP.FO.Controllers } [NP.Base.Auth.CFilter] public ActionResult ApplyPay(VMCourse vm) - { + { + //20220802 추가 + long?[] lngTmp = new long?[2]; + lngTmp[0] = vm.CM.cmino; + lngTmp[1] = vm.CM.cmisno; + if (vm.payno > 0) { //신청대기 => 승인 => 결제진입 @@ -1103,11 +1111,47 @@ namespace NP.FO.Controllers vm.CM = Dao.Get("cm.cms", new System.Collections.Hashtable() { { "cmno", vm.PPLog.cmno } }).First(); vm.User = Dao.Get("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).First(); vm.viewname4 = "/Course/OnPayReturn"; + + //20220802 추가 + 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("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] public ActionResult ApplyAgree(VMCourse vm) { + //20220802 추가 long?[] lngTmp = new long?[2]; lngTmp[0] = vm.CM.cmino; lngTmp[1] = vm.CM.cmisno; @@ -1132,8 +1176,40 @@ namespace NP.FO.Controllers vm.ComCodes2 = GetComCodes("typeman"); vm.ComCodes3 = GetComCodes("typeedu"); vm.ComCodes4 = GetComCodes("typegrade"); + //20220802 추가 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("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); } public ActionResult ApplyComplete(VMPay vm) @@ -1163,6 +1239,11 @@ namespace NP.FO.Controllers string LGD_HASHDATA = ""; string LGD_OID = Request["LGD_OID"]; string LGD_AMOUNT = Request["LGD_AMOUNT"]; + + long?[] lngTmp = new long?[2]; + lngTmp[0] = vm.CM.cmino; + lngTmp[1] = vm.CM.cmisno; + vm.payParams = new Hashtable(); vm.payParams.Add("CST_PLATFORM", CST_PLATFORM); vm.payParams.Add("CST_MID", CST_MID); @@ -1316,7 +1397,9 @@ namespace NP.FO.Controllers vm.payParams.Add("isCompany", Request["isCompany"]); Session.Add("PAYREQ_MAP", vm.payParams); - + //20220802 추가 + vm.CM.cmino = lngTmp[0]; + vm.CM.cmisno = lngTmp[1]; return View(vm); } public ActionResult XpayReturnURL(VMPay vm) diff --git a/FO/Views/Course/ApplyAgree.cshtml b/FO/Views/Course/ApplyAgree.cshtml index 0491ba6..8b48e03 100644 --- a/FO/Views/Course/ApplyAgree.cshtml +++ b/FO/Views/Course/ApplyAgree.cshtml @@ -14,48 +14,34 @@ @*pplno*@ @*교육일정선택(selMonth)*@ @*업체/개인 선택*@ - - + +

신청강좌

    • - @if (Model.CM.cshape == 0) - { - if (!isallday) + + @(Model.CM.cshape == 0 ? "온라인" : Model.CM.cshape == 1 ? "교육장교육" : "온라인교육") + + @{ + string strStudyPlaceTmp = ""; + if (Model.SelectCMInningscd.studyplace != null) { -

      + strStudyPlaceTmp = string.Format("[{0}교육장] {1}", Model.SelectCMInningscd.studyplacename, Model.CM.cname); } else { -

      - } - } - else if (Model.CM.cshape == 1) - { - if (!isallday) - { -

      - } - else - { -

      - } - } - else if (Model.CM.cshape == 2) - { - if (!isallday) - { - @*

      *@ -

      - } - else - { - @*

      *@ -

      + strStudyPlaceTmp = string.Format("{0}", Model.CM.cname); } + + //Model.SelectCMInningscd.eend2 교육종료일 + string strEduInfo = string.Format("교육기간 {0} | 교육종료일 {1} | {2}시간과정 | {3}과정 | 교육비 {4}원", + Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0")); } + + +

    diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml index 559843f..0d40140 100644 --- a/FO/Views/Course/ApplyEdu.cshtml +++ b/FO/Views/Course/ApplyEdu.cshtml @@ -14,6 +14,8 @@ @*pplno*@ @*교육일정선택(selMonth)*@ @*업체/개인 선택*@ + +
    @*강좌번호*@ @@ -27,9 +29,6 @@ - - -

    신청강좌

    • @@ -40,33 +39,22 @@ @{ string strStudyPlaceTmp = ""; - string strEduTerm = ""; if (Model.SelectCMInningscd.studyplace != null) { strStudyPlaceTmp = string.Format("[{0}교육장] {1}", Model.SelectCMInningscd.studyplacename, Model.CM.cname); } else { - strStudyPlaceTmp = string.Format("{1}", Model.CM.cname); + strStudyPlaceTmp = string.Format("{0}", Model.CM.cname); } //Model.SelectCMInningscd.eend2 교육종료일 string strEduInfo = string.Format("교육기간 {0} | 교육종료일 {1} | {2}시간과정 | {3}과정 | 교육비 {4}원", Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0")); } - @*@(string.Format("[{0}] | {1} 시간과정 | {2}과정 | 교육비 {3}원", item.cname, Model.CM.studytime,(item.isrefund == 1 ? "환급" : "비환급"), item.infee.ToString("#,0")))*@

      - - @if (Model.CM.applicableCM == "정상접수") - { - @*정상접수*@ - } - else - { - @*대기접수*@ - }
    @@ -75,7 +63,7 @@
-
+