diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml index 606d77b..0512b61 100644 --- a/Dao/MyBatis/Maps/CM.xml +++ b/Dao/MyBatis/Maps/CM.xml @@ -1807,5 +1807,29 @@ order by a.estart desc + + \ No newline at end of file diff --git a/FO/Controllers/CourseController.cs b/FO/Controllers/CourseController.cs index 247f920..5bad244 100644 --- a/FO/Controllers/CourseController.cs +++ b/FO/Controllers/CourseController.cs @@ -6,6 +6,8 @@ using System.Web.Mvc; using NP.Model; using NP.Base; +using System.Collections; + namespace NP.FO.Controllers { public class CourseController : FOOpenBaseController @@ -778,6 +780,43 @@ namespace NP.FO.Controllers item.scdInfoSummary = string.Format("[{0}] {1}",item.studyplacename, item.estart.ToString("yyyy년 MM월 dd일 ddd요일 HH:mm")); item.remainPeople = Convert.ToInt32(item.quota) - Convert.ToInt32(item.regmem); } + vm.Assign = Dao.Get("cm.assign.applyedu", new Hashtable() { { "userno", SUserInfo.UserNo } }).FirstOrDefault(); + if (!string.IsNullOrEmpty(vm.Assign.MphoneFormat) && vm.Assign.MphoneFormat.IndexOf("-") >= 0) + { + string[] mphoneArr = vm.Assign.MphoneFormat.Split('-'); + vm.Assign.mphone1 = mphoneArr.Length > 0 ? mphoneArr[0] : string.Empty; + vm.Assign.mphone2 = mphoneArr.Length > 1 ? mphoneArr[1] : string.Empty; + vm.Assign.mphone3 = mphoneArr.Length > 2 ? mphoneArr[2] : string.Empty; + } + if (!string.IsNullOrEmpty(vm.Assign.taxemail) && vm.Assign.taxemail.IndexOf("@") >= 0) + { + string[] taxemailArr = vm.Assign.taxemail.Split('@'); + vm.Assign.taxemail1 = taxemailArr.Length > 0 ? taxemailArr[0] : string.Empty; + vm.Assign.taxemail2 = taxemailArr.Length > 1 ? taxemailArr[1] : string.Empty; + } + + vm.User = Dao.Get("cm.user.applyedu", new Hashtable() { { "userno", SUserInfo.UserNo } }).FirstOrDefault(); + if (!string.IsNullOrEmpty(vm.User.MobileFormat) && vm.User.MobileFormat.IndexOf("-") >= 0) + { + string[] mobileArr = vm.User.MobileFormat.Split('-'); + vm.User.mobile1 = mobileArr.Length > 0 ? mobileArr[0] : string.Empty; + vm.User.mobile2 = mobileArr.Length > 1 ? mobileArr[1] : string.Empty; + vm.User.mobile3 = mobileArr.Length > 2 ? mobileArr[2] : string.Empty; + } + if (!string.IsNullOrEmpty(vm.User.userpno) && vm.User.userpno.Length == 13) + { + string userpnoString = string.Format("{0}-{1}", vm.User.userpno.Substring(0, 6), vm.User.userpno.Substring(6, 7)); + string[] userpnoArr = userpnoString.Split('-'); + vm.User.userpno1 = userpnoArr.Length > 0 ? userpnoArr[0] : string.Empty; + vm.User.userpno2 = userpnoArr.Length > 1 ? userpnoArr[1] : string.Empty; + } + if (!string.IsNullOrEmpty(vm.User.email) && vm.User.email.IndexOf("@") >= 0) + { + string[] emailArr = vm.User.email.Split('@'); + vm.User.email1 = emailArr.Length > 0 ? emailArr[0] : string.Empty; + vm.User.email2 = emailArr.Length > 1 ? emailArr[1] : string.Empty; + } + return View(vm); } diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml index 635c6e1..93be7e7 100644 --- a/FO/Views/Course/ApplyEdu.cshtml +++ b/FO/Views/Course/ApplyEdu.cshtml @@ -42,7 +42,7 @@ - @if (Model.CM.cshape == 2) + @if (Model.CM.cshape == 2 && Model.CM.applicableCM == "정상접수") {

교육일정선택

+ 계좌번호 - + 예금주 - + @@ -103,23 +103,29 @@ 회사명 - + @Html.TextBoxFor(x=>x.Assign.asname, new { @class = "apylpt"}) 사업자등록번호 - + @Html.TextBoxFor(x => x.Assign.brno, new { @class = "apylpt" }) 대표자성명 - + @Html.TextBoxFor(x => x.Assign.ceoname, new { @class = "apylpt" }) 주소 -