diff --git a/BO/Controllers/dataController.cs b/BO/Controllers/dataController.cs index 3dba613..aae8c82 100644 --- a/BO/Controllers/dataController.cs +++ b/BO/Controllers/dataController.cs @@ -161,11 +161,14 @@ namespace NP.BO.Controllers } public ActionResult learns(VMMM vm) { + vm.CGs = Dao.Get("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } }); vm.Terms = Dao.Get("cm.term.ys", new System.Collections.Hashtable() { }); 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 } }); + 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.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) }); if (vm.isexceldown == 1) { @@ -178,7 +181,9 @@ namespace NP.BO.Controllers } else if (vm.tabidx == 1) { - vm.Datas = Dao.Get("cm.data.lect.byc", new System.Collections.Hashtable() { { "year" + vm.stringval2 == null ? "" : "x", vm.stringval }, { "tmno", vm.stringval2 } }); + vm.Datas = Dao.Get("cm.data.lect.byc", 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.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) }); if (vm.isexceldown == 1) { diff --git a/BO/Views/data/learns0.cshtml b/BO/Views/data/learns0.cshtml index 344e8f3..194da77 100644 --- a/BO/Views/data/learns0.cshtml +++ b/BO/Views/data/learns0.cshtml @@ -20,6 +20,9 @@ } + @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/Button", new NP.Model.Button() { Special = "search", OnClick = "" }) @@ -85,6 +88,7 @@ \ No newline at end of file diff --git a/BO/Views/data/learns1.cshtml b/BO/Views/data/learns1.cshtml index 2fdeb9f..2f43562 100644 --- a/BO/Views/data/learns1.cshtml +++ b/BO/Views/data/learns1.cshtml @@ -17,9 +17,12 @@ @foreach (var t in Model.Terms.Where(w => w.tyear == DateTime.Now.Year)) { - + } + @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/Button", new NP.Model.Button() { Special = "search", OnClick = "" }) @@ -89,6 +92,7 @@ \ No newline at end of file diff --git a/Dao/MyBatis/Maps/System.xml b/Dao/MyBatis/Maps/System.xml index 3aba8c9..8847720 100644 --- a/Dao/MyBatis/Maps/System.xml +++ b/Dao/MyBatis/Maps/System.xml @@ -881,7 +881,9 @@ order by g.cgname,g.cgno,f.cgname,f.cgno,e.cname,e.cmno