From ba4296b40fbc338c8be33504b492861198e95236 Mon Sep 17 00:00:00 2001 From: hyunho Date: Mon, 29 Mar 2021 06:25:33 +0000 Subject: [PATCH] --- BO/BO.csproj | 3 + BO/Controllers/dataController.cs | 47 ++++++++-- BO/Views/data/learns.cshtml | 7 +- BO/Views/data/learns0.cshtml | 84 +++++++++++------ BO/Views/data/learns5.cshtml | 125 ++++++++++++++++++++++++++ BO/Views/data/learns6.cshtml | 150 +++++++++++++++++++++++++++++++ BO/Views/data/learns7.cshtml | 150 +++++++++++++++++++++++++++++++ Dao/MyBatis/Maps/System.xml | 60 +++++++++---- 8 files changed, 573 insertions(+), 53 deletions(-) create mode 100644 BO/Views/data/learns5.cshtml create mode 100644 BO/Views/data/learns6.cshtml create mode 100644 BO/Views/data/learns7.cshtml diff --git a/BO/BO.csproj b/BO/BO.csproj index 80630a5..6f69be3 100644 --- a/BO/BO.csproj +++ b/BO/BO.csproj @@ -674,6 +674,9 @@ + + + diff --git a/BO/Controllers/dataController.cs b/BO/Controllers/dataController.cs index aae8c82..8f01405 100644 --- a/BO/Controllers/dataController.cs +++ b/BO/Controllers/dataController.cs @@ -166,15 +166,16 @@ namespace NP.BO.Controllers vm.stringval = vm.stringval ?? DateTime.Now.Year.ToString(); if (vm.tabidx == 0) { - vm.Datas = Dao.Get("cm.data.lect.bycm", new System.Collections.Hashtable() { - { "year" + vm.stringval2 == null ? "" : "x", vm.stringval }, { "tmno", vm.stringval2 }, { "cshape", vm.stringval3 }, { "pcgno", vm.stringval4 }, { "cgno", vm.stringval5 } + + vm.Datas = Dao.Get("cm.data.lect.byc", new System.Collections.Hashtable() { + { "year" + vm.stringval2 == null ? "" : "x", vm.stringval }, { "tmno", vm.stringval2 }, { "cshape", 0 }, { "pcgno", vm.stringval4 }, { "cgno", vm.stringval5 } }); - vm.Datas.Add(new Data() { dtype = 1, strval = "총계", intval = vm.Datas.Sum(s => s.intval), intval2 = vm.Datas.Sum(s => s.intval2), intval3 = vm.Datas.Sum(s => s.intval3), intval4 = vm.Datas.Sum(s => s.intval4), intval5 = vm.Datas.Sum(s => s.intval5), intval6 = vm.Datas.Sum(s => s.intval6), intval7 = vm.Datas.Sum(s => s.intval7), intval8 = vm.Datas.Sum(s => s.intval8), intval9 = vm.Datas.Sum(s => s.intval9), intval10 = vm.Datas.Sum(s => s.intval10) }); + vm.Datas.Add(new Data() { dtype = 1, strval = "총계", intval = vm.Datas.Sum(s => s.intval), intval2 = vm.Datas.Sum(s => s.intval2), intval11 = vm.Datas.Sum(s => s.intval11), intval12 = vm.Datas.Sum(s => s.intval12), intval7 = vm.Datas.Sum(s => s.intval7), intval8 = vm.Datas.Sum(s => s.intval8), intval9 = vm.Datas.Sum(s => s.intval9), intval10 = vm.Datas.Sum(s => s.intval10), intval13 = vm.Datas.Sum(s => s.intval13), intval14 = vm.Datas.Sum(s => s.intval14), intval15 = vm.Datas.Sum(s => s.intval15), intval16 = vm.Datas.Sum(s => s.intval16), intval17 = vm.Datas.Sum(s => s.intval17), intval18 = vm.Datas.Sum(s => s.intval18), intval19 = vm.Datas.Sum(s => s.intval19), intval20 = vm.Datas.Sum(s => s.intval20), intval21 = vm.Datas.Sum(s => s.intval21) }); if (vm.isexceldown == 1) { return ExportExcel( - new String[] { "상위분류", "과정분류", "과정명", "신청완료[총계]", "수료[총계]", "신청완료[정회원]", "수료[정회원]", "신청완료[비회원]", "수료[비회원]", "신청완료[비환급]", "수료[비환급]", "신청완료[환급]", "수료[환급]" }, - new String[] { "strval", "strval2", "strval3", "intval", "intval2", "intval3", "intval4", "intval5", "intval6", "intval7", "intval8", "intval9", "intval10" }, + new String[] { "상위분류", "과정분류", "과정명", "강좌명(반)", "교육기간", "신청완료[총계]", "수료[총계]","미수료[총계]", "신청완료[회원]", "수료[회원]", "신청완료[비환급]", "수료[비환급]","미수료[비환급]", "신청완료[환급]", "수료[환급]","미수료[환급]" ,"신청완료[합숙]", "수료[합숙]", "미수료[합숙]", "신청완료[비합숙]", "수료[비합숙]", "미수료[비합숙]", }, + new String[] { "strval", "strval2", "strval3", "strval4", "strval5", "intval", "intval2","intval15", "intval11", "intval12", "intval7", "intval8","intval13", "intval9", "intval10","intval14", "intval16", "intval17", "intval18", "intval19", "intval20", "intval21" }, vm.Datas, vm.excelname); } @@ -368,6 +369,42 @@ namespace NP.BO.Controllers , vm.CMLects, vm.excelname); } } + + else if (vm.tabidx == 5) + { + + } + else if (vm.tabidx == 6) + { + vm.Datas = Dao.Get("cm.data.lect.byc", new System.Collections.Hashtable() { + { "year" + vm.stringval2 == null ? "" : "x", vm.stringval }, { "tmno", vm.stringval2 }, { "cshape", 2 }, { "pcgno", vm.stringval4 }, { "cgno", vm.stringval5 } + }); + vm.Datas.Add(new Data() { dtype = 1, strval = "총계", intval = vm.Datas.Sum(s => s.intval), intval2 = vm.Datas.Sum(s => s.intval2), intval11 = vm.Datas.Sum(s => s.intval11), intval12 = vm.Datas.Sum(s => s.intval12), intval7 = vm.Datas.Sum(s => s.intval7), intval8 = vm.Datas.Sum(s => s.intval8), intval9 = vm.Datas.Sum(s => s.intval9), intval10 = vm.Datas.Sum(s => s.intval10), intval13 = vm.Datas.Sum(s => s.intval13), intval14 = vm.Datas.Sum(s => s.intval14), intval15 = vm.Datas.Sum(s => s.intval15), intval16 = vm.Datas.Sum(s => s.intval16), intval17 = vm.Datas.Sum(s => s.intval17), intval18 = vm.Datas.Sum(s => s.intval18), intval19 = vm.Datas.Sum(s => s.intval19), intval20 = vm.Datas.Sum(s => s.intval20), intval21 = vm.Datas.Sum(s => s.intval21) }); + if (vm.isexceldown == 1) + { + return ExportExcel( + new String[] { "상위분류", "과정분류", "과정명", "강좌명(반)", "교육기간", "신청완료[총계]", "수료[총계]", "미수료[총계]", "신청완료[회원]", "수료[회원]", "신청완료[비환급]", "수료[비환급]", "미수료[비환급]", "신청완료[환급]", "수료[환급]", "미수료[환급]", "신청완료[합숙]", "수료[합숙]", "미수료[합숙]", "신청완료[비합숙]", "수료[비합숙]", "미수료[비합숙]", }, + new String[] { "strval", "strval2", "strval3", "strval4", "strval5", "intval", "intval2", "intval15", "intval11", "intval12", "intval7", "intval8", "intval13", "intval9", "intval10", "intval14", "intval16", "intval17", "intval18", "intval19", "intval20", "intval21" }, + vm.Datas, + vm.excelname); + } + } + + else if (vm.tabidx == 7) + { + vm.Datas = Dao.Get("cm.data.lect.byc", new System.Collections.Hashtable() { + { "year" + vm.stringval2 == null ? "" : "x", vm.stringval }, { "tmno", vm.stringval2 }, { "cshape", 1 }, { "pcgno", vm.stringval4 }, { "cgno", vm.stringval5 } + }); + vm.Datas.Add(new Data() { dtype = 1, strval = "총계", intval = vm.Datas.Sum(s => s.intval), intval2 = vm.Datas.Sum(s => s.intval2), intval11 = vm.Datas.Sum(s => s.intval11), intval12 = vm.Datas.Sum(s => s.intval12), intval7 = vm.Datas.Sum(s => s.intval7), intval8 = vm.Datas.Sum(s => s.intval8), intval9 = vm.Datas.Sum(s => s.intval9), intval10 = vm.Datas.Sum(s => s.intval10), intval13 = vm.Datas.Sum(s => s.intval13), intval14 = vm.Datas.Sum(s => s.intval14), intval15 = vm.Datas.Sum(s => s.intval15), intval16 = vm.Datas.Sum(s => s.intval16), intval17 = vm.Datas.Sum(s => s.intval17), intval18 = vm.Datas.Sum(s => s.intval18), intval19 = vm.Datas.Sum(s => s.intval19), intval20 = vm.Datas.Sum(s => s.intval20), intval21 = vm.Datas.Sum(s => s.intval21) }); + if (vm.isexceldown == 1) + { + return ExportExcel( + new String[] { "상위분류", "과정분류", "과정명", "강좌명(반)", "교육기간", "신청완료[총계]", "수료[총계]", "미수료[총계]", "신청완료[회원]", "수료[회원]", "신청완료[비환급]", "수료[비환급]", "미수료[비환급]", "신청완료[환급]", "수료[환급]", "미수료[환급]", "신청완료[합숙]", "수료[합숙]", "미수료[합숙]", "신청완료[비합숙]", "수료[비합숙]", "미수료[비합숙]", }, + new String[] { "strval", "strval2", "strval3", "strval4", "strval5", "intval", "intval2", "intval15", "intval11", "intval12", "intval7", "intval8", "intval13", "intval9", "intval10", "intval14", "intval16", "intval17", "intval18", "intval19", "intval20", "intval21" }, + vm.Datas, + vm.excelname); + } + } return View(vm); } public ActionResult learnassigns(VMMM vm) diff --git a/BO/Views/data/learns.cshtml b/BO/Views/data/learns.cshtml index d09f986..a1c8230 100644 --- a/BO/Views/data/learns.cshtml +++ b/BO/Views/data/learns.cshtml @@ -1,10 +1,13 @@ @model NP.Model.VMMM diff --git a/BO/Views/data/learns0.cshtml b/BO/Views/data/learns0.cshtml index 194da77..8db16b5 100644 --- a/BO/Views/data/learns0.cshtml +++ b/BO/Views/data/learns0.cshtml @@ -20,16 +20,15 @@ } - @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:온라인;1:오프라인;2:혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "df", ":-유형선택" } }) @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno == null), new ViewDataDictionary { { "name", "stringval4" }, { "selected", Model.stringval4 }, { "style", "width: 100%" }, { "df", ":-상위분류" } }) - @*@Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno != null && w.pcgno.ToString() == Model.stringval4), new ViewDataDictionary { { "name", "stringval5" }, { "selected", Model.stringval5 }, { "style", "width: 100%;" }, { "df", ":-분류" } })*@ + @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno != null && w.pcgno.ToString() == Model.stringval4), new ViewDataDictionary { { "name", "stringval5" }, { "selected", Model.stringval5 }, { "style", "width: 100%;" }, { "df", ":-과정분류" } }) @Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search", OnClick = "" })
- 엑셀다운로드 + 엑셀다운로드
@@ -39,46 +38,75 @@ 상위분류 과정분류 과정명 - 총계 - 정회원 - 비회원 - 비환급 - 환급 + 강좌명(반) + 교육기간 + 총계 + 회원 + 비환급 + 환급 + 합숙 + 비합숙 + 신청완료 + 수료 + 미수료 + + 신청완료 + 수료 + 신청완료 수료 + 미수료 + 신청완료 수료 + 미수료 + 신청완료 수료 + 미수료 + 신청완료 수료 - 신청완료 - 수료 + 미수료 @foreach (var item in Model.Datas) { - - @item.strval - @if (item.dtype < 1) - { - @item.strval2 - @item.strval3 - } - @item.intval.ToString("#,0") - @item.intval2.ToString("#,0") - @item.intval3.ToString("#,0") - @item.intval4.ToString("#,0") - @item.intval5.ToString("#,0") - @item.intval6.ToString("#,0") - @item.intval7.ToString("#,0") - @item.intval8.ToString("#,0") - @item.intval9.ToString("#,0") - @item.intval10.ToString("#,0") - + + @item.strval + @if (item.dtype < 1) + { + @item.strval2 + @item.strval3 + @item.strval4 + @item.strval5 + } + @item.intval.ToString("#,0") + @item.intval2.ToString("#,0") + @item.intval15.ToString("#,0") + + @item.intval11.ToString("#,0") + @item.intval12.ToString("#,0") + + @item.intval7.ToString("#,0") + @item.intval8.ToString("#,0") + @item.intval13.ToString("#,0") + + @item.intval9.ToString("#,0") + @item.intval10.ToString("#,0") + @item.intval14.ToString("#,0") + + @item.intval16.ToString("#,0") + @item.intval17.ToString("#,0") + @item.intval18.ToString("#,0") + + @item.intval19.ToString("#,0") + @item.intval20.ToString("#,0") + @item.intval21.ToString("#,0") + } diff --git a/BO/Views/data/learns5.cshtml b/BO/Views/data/learns5.cshtml new file mode 100644 index 0000000..6deaa4b --- /dev/null +++ b/BO/Views/data/learns5.cshtml @@ -0,0 +1,125 @@ +@model NP.Model.VMMM +
+
+
+ @Html.Partial("./Partial/SearchCaption") +
+
+
+ + + @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno == null), new ViewDataDictionary { { "name", "stringval4" }, { "selected", Model.stringval4 }, { "style", "width: 100%" }, { "df", ":-상위분류" } }) + @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno != null && w.pcgno.ToString() == Model.stringval4), new ViewDataDictionary { { "name", "stringval5" }, { "selected", Model.stringval5 }, { "style", "width: 100%;" }, { "df", ":-과정분류" } }) + @Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search", OnClick = "" }) +
+
+
+
+
+ 엑셀다운로드 +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @foreach (var item in Model.Datas) + { + + + @if (item.dtype < 1) + { + + + + + } + + + + + + + + + + + + } + +
상위분류과정분류과정명강좌명(반)교육기간총계정회원비회원비환급환급
신청완료수료신청완료수료신청완료수료신청완료수료신청완료수료
@item.strval@item.strval2@item.strval3@item.strval4@item.strval5@item.intval.ToString("#,0")@item.intval2.ToString("#,0")@item.intval3.ToString("#,0")@item.intval4.ToString("#,0")@item.intval5.ToString("#,0")@item.intval6.ToString("#,0")@item.intval7.ToString("#,0")@item.intval8.ToString("#,0")@item.intval9.ToString("#,0")@item.intval10.ToString("#,0")
+
+
+ @Html.HiddenFor(m => m.tabidx) +
+ \ No newline at end of file diff --git a/BO/Views/data/learns6.cshtml b/BO/Views/data/learns6.cshtml new file mode 100644 index 0000000..8bbb571 --- /dev/null +++ b/BO/Views/data/learns6.cshtml @@ -0,0 +1,150 @@ +@model NP.Model.VMMM +
+
+
+ @Html.Partial("./Partial/SearchCaption") +
+
+
+ + + @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno == null), new ViewDataDictionary { { "name", "stringval4" }, { "selected", Model.stringval4 }, { "style", "width: 100%" }, { "df", ":-상위분류" } }) + @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno != null && w.pcgno.ToString() == Model.stringval4), new ViewDataDictionary { { "name", "stringval5" }, { "selected", Model.stringval5 }, { "style", "width: 100%;" }, { "df", ":-과정분류" } }) + @Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search", OnClick = "" }) +
+
+
+
+
+ 엑셀다운로드 +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @foreach (var item in Model.Datas) + { + + + @if (item.dtype < 1) + { + + + + + } + + + + + + + + + + + + + + + + + + + + + + + + } + +
상위분류과정분류과정명강좌명(반)교육기간총계회원비환급환급합숙비합숙
신청완료수료미수료신청완료수료신청완료수료미수료신청완료수료미수료신청완료수료미수료신청완료수료미수료
@item.strval@item.strval2@item.strval3@item.strval4@item.strval5@item.intval.ToString("#,0")@item.intval2.ToString("#,0")@item.intval15.ToString("#,0")@item.intval11.ToString("#,0")@item.intval12.ToString("#,0")@item.intval7.ToString("#,0")@item.intval8.ToString("#,0")@item.intval13.ToString("#,0")@item.intval9.ToString("#,0")@item.intval10.ToString("#,0")@item.intval14.ToString("#,0")@item.intval16.ToString("#,0")@item.intval17.ToString("#,0")@item.intval18.ToString("#,0")@item.intval19.ToString("#,0")@item.intval20.ToString("#,0")@item.intval21.ToString("#,0")
+
+
+ @Html.HiddenFor(m => m.tabidx) +
+ \ No newline at end of file diff --git a/BO/Views/data/learns7.cshtml b/BO/Views/data/learns7.cshtml new file mode 100644 index 0000000..8bbb571 --- /dev/null +++ b/BO/Views/data/learns7.cshtml @@ -0,0 +1,150 @@ +@model NP.Model.VMMM +
+
+
+ @Html.Partial("./Partial/SearchCaption") +
+
+
+ + + @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno == null), new ViewDataDictionary { { "name", "stringval4" }, { "selected", Model.stringval4 }, { "style", "width: 100%" }, { "df", ":-상위분류" } }) + @Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno != null && w.pcgno.ToString() == Model.stringval4), new ViewDataDictionary { { "name", "stringval5" }, { "selected", Model.stringval5 }, { "style", "width: 100%;" }, { "df", ":-과정분류" } }) + @Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search", OnClick = "" }) +
+
+
+
+
+ 엑셀다운로드 +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @foreach (var item in Model.Datas) + { + + + @if (item.dtype < 1) + { + + + + + } + + + + + + + + + + + + + + + + + + + + + + + + } + +
상위분류과정분류과정명강좌명(반)교육기간총계회원비환급환급합숙비합숙
신청완료수료미수료신청완료수료신청완료수료미수료신청완료수료미수료신청완료수료미수료신청완료수료미수료
@item.strval@item.strval2@item.strval3@item.strval4@item.strval5@item.intval.ToString("#,0")@item.intval2.ToString("#,0")@item.intval15.ToString("#,0")@item.intval11.ToString("#,0")@item.intval12.ToString("#,0")@item.intval7.ToString("#,0")@item.intval8.ToString("#,0")@item.intval13.ToString("#,0")@item.intval9.ToString("#,0")@item.intval10.ToString("#,0")@item.intval14.ToString("#,0")@item.intval16.ToString("#,0")@item.intval17.ToString("#,0")@item.intval18.ToString("#,0")@item.intval19.ToString("#,0")@item.intval20.ToString("#,0")@item.intval21.ToString("#,0")
+
+
+ @Html.HiddenFor(m => m.tabidx) +
+ \ No newline at end of file diff --git a/Dao/MyBatis/Maps/System.xml b/Dao/MyBatis/Maps/System.xml index 8847720..4e363f9 100644 --- a/Dao/MyBatis/Maps/System.xml +++ b/Dao/MyBatis/Maps/System.xml @@ -909,24 +909,48 @@ order by b3.cgname,b3.cgno,b2.cgname,b2.cgno,f.cname,f.cmno