diff --git a/BO/BO.csproj b/BO/BO.csproj index b70093b..a3bc740 100644 --- a/BO/BO.csproj +++ b/BO/BO.csproj @@ -684,6 +684,7 @@ + diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index adf7523..d2c8754 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -1045,6 +1045,11 @@ namespace NP.BO.Controllers completion.typejobName = vm.ComCodes.Where(w => w.ccode == completion.typejob).FirstOrDefault()?.cname; completion.typemanName = vm.ComCodes.Where(w => w.ccode == completion.typeman).FirstOrDefault()?.cname; completion.studyplaceName = vm.ComCodes.Where(w => w.ccode == completion.studyplace).FirstOrDefault()?.cname; + if(completion.cshape == 2) + { + completion.sdate = completion.payoktime; + completion.edate = completion.estart; + } } if (vm.isexceldown == 1) @@ -1057,6 +1062,11 @@ namespace NP.BO.Controllers completion.typejobName = vm.ComCodes.Where(w => w.ccode == completion.typejob).FirstOrDefault()?.cname; completion.typemanName = vm.ComCodes.Where(w => w.ccode == completion.typeman).FirstOrDefault()?.cname; completion.studyplaceName = vm.ComCodes.Where(w => w.ccode == completion.studyplace).FirstOrDefault()?.cname; + if (completion.cshape == 2) + { + completion.sdate = completion.payoktime; + completion.edate = completion.estart; + } } return ExportExcel( new String[] {"순번" ,"사용자ID","이름","주민번호","교육생연락처","교육유형","교육구분","기술인분류","직무분야","교육목적","등급","교육시작일","교육종료일", diff --git a/BO/Views/Shared/Partial/CMscdBox2.cshtml b/BO/Views/Shared/Partial/CMscdBox2.cshtml index ea8257a..06bc923 100644 --- a/BO/Views/Shared/Partial/CMscdBox2.cshtml +++ b/BO/Views/Shared/Partial/CMscdBox2.cshtml @@ -72,6 +72,6 @@ var data = { value: $(this).val(), text: $(this).data("text"), estart: $(this).data("estart") }; @(Model.Split(';')[0])(data); hidecmscdbox(); - }); + }); } diff --git a/BO/Views/croom/completions.cshtml b/BO/Views/croom/completions.cshtml index f4c6d6d..f610451 100644 --- a/BO/Views/croom/completions.cshtml +++ b/BO/Views/croom/completions.cshtml @@ -164,6 +164,8 @@ + +
ㆍ강좌정보/수료정보
@@ -236,12 +238,25 @@ - + + + + + + + @@ -354,21 +369,32 @@ + @Html.Partial("./Partial/AssignBox2", "bindAssign;고객사 검색;1") +@Html.Partial("./Partial/CMScdBox2", "bindCMScd;교육일정선택;1") @section scriptsHeader{ @Html.Partial("./Partial/ScriptDate") - @Html.Partial("./Partial/ScriptPost") + @Html.Partial("./Partial/ScriptPost") } @section scripts{ - +
교육시작일 * @Html.Partial("./Partial/Date", null, new ViewDataDictionary { { "name", "completion.sdate" } }) 교육종료일 * @Html.Partial("./Partial/Date", null, new ViewDataDictionary { { "name", "completion.edate" } })
교육시작일(결제완료일) *교육종료일(집체교육일) * +
+ @Html.Partial("./Partial/Text", null, Helpers.DicText(new NP.Model.TextDic() { Name = "completion.estart", Style = "width:100%;", IsReadOnly = true })) +
+
+ +
+
기술인분류 * @Html.Partial("./Partial/Select", Model.ComCodes.Where(w => w.cgroup == "typeman"), new ViewDataDictionary { { "name", "completion.typeman" }, { "style", "width: 100%" }, { "df", ":-기술인분류" } })