From 47e7f7c9ca67299655a30f77119323da0dd02158 Mon Sep 17 00:00:00 2001
From: hyunho <hyunho  @example.com>
Date: Thu, 17 Dec 2020 05:00:02 +0000
Subject: [PATCH]

---
 BO/Controllers/dataController.cs | 58 ++++++++++++++++++++++++++------
 BO/Views/data/sales0.cshtml      | 11 ++----
 Model/VMMM.cs                    |  1 +
 3 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/BO/Controllers/dataController.cs b/BO/Controllers/dataController.cs
index 569485f..83c3d13 100644
--- a/BO/Controllers/dataController.cs
+++ b/BO/Controllers/dataController.cs
@@ -78,16 +78,54 @@ namespace NP.BO.Controllers
             {
                 vm.stringval = vm.stringval ?? DateTime.Now.Year.ToString();
                 vm.Datas = Dao.Get<Data>("cm.sales.bycm", vm.stringval);
-                if (vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Count() < 1) { vm.Datas.Insert(0, new Data() { dtype = 0, intval = 0, strval = "강좌", strval2 = "매출" }); }
-                if (vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Count() < 1) { vm.Datas.Insert(1, new Data() { dtype = 0, intval = 1, strval2 = "환불" }); }
-                vm.Datas.Insert(2, new Data() { dtype = 0, intval = 2, strval2 = "합계", longval = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval), longval2 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval2), longval3 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval3), longval4 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval4), longval5 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval5), longval6 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval6), longval7 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval7), longval8 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval8), longval9 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval9), longval10 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval10), longval11 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval11), longval12 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval12), });
-                if (vm.Datas.Where(w => w.dtype == 1 && w.intval == 0).Count() < 1) { vm.Datas.Insert(3, new Data() { dtype = 1, intval = 0, strval = "시험", strval2 = "매출" }); }
-                if (vm.Datas.Where(w => w.dtype == 1 && w.intval == 1).Count() < 1) { vm.Datas.Insert(4, new Data() { dtype = 1, intval = 1, strval2 = "환불" }); }
-                vm.Datas.Insert(5, new Data() { dtype = 1, intval = 2, strval2 = "합계", longval = vm.Datas.Where(w => w.dtype == 1).Sum(s => s.longval), longval2 = vm.Datas.Where(w => w.dtype == 1).Sum(s => s.longval2), longval3 = vm.Datas.Where(w => w.dtype == 1).Sum(s => s.longval3), longval4 = vm.Datas.Where(w => w.dtype == 1).Sum(s => s.longval4), longval5 = vm.Datas.Where(w => w.dtype == 1).Sum(s => s.longval5), longval6 = vm.Datas.Where(w => w.dtype == 1).Sum(s => s.longval6), longval7 = vm.Datas.Where(w => w.dtype == 1).Sum(s => s.longval7), longval8 = vm.Datas.Where(w => w.dtype == 1).Sum(s => s.longval8), longval9 = vm.Datas.Where(w => w.dtype == 1).Sum(s => s.longval9), longval10 = vm.Datas.Where(w => w.dtype == 1).Sum(s => s.longval10), longval11 = vm.Datas.Where(w => w.dtype == 1).Sum(s => s.longval11), longval12 = vm.Datas.Where(w => w.dtype == 1).Sum(s => s.longval12), });
-                if (vm.Datas.Where(w => w.dtype == 2 && w.intval == 0).Count() < 1) { vm.Datas.Insert(6, new Data() { dtype = 2, intval = 0, strval = "교재", strval2 = "매출" }); }
-                if (vm.Datas.Where(w => w.dtype == 2 && w.intval == 1).Count() < 1) { vm.Datas.Insert(7, new Data() { dtype = 2, intval = 1, strval2 = "환불" }); }
-                vm.Datas.Insert(8, new Data() { dtype = 1, intval = 2, strval2 = "합계", longval = vm.Datas.Where(w => w.dtype == 2).Sum(s => s.longval), longval2 = vm.Datas.Where(w => w.dtype == 2).Sum(s => s.longval2), longval3 = vm.Datas.Where(w => w.dtype == 2).Sum(s => s.longval3), longval4 = vm.Datas.Where(w => w.dtype == 2).Sum(s => s.longval4), longval5 = vm.Datas.Where(w => w.dtype == 2).Sum(s => s.longval5), longval6 = vm.Datas.Where(w => w.dtype == 2).Sum(s => s.longval6), longval7 = vm.Datas.Where(w => w.dtype == 2).Sum(s => s.longval7), longval8 = vm.Datas.Where(w => w.dtype == 2).Sum(s => s.longval8), longval9 = vm.Datas.Where(w => w.dtype == 2).Sum(s => s.longval9), longval10 = vm.Datas.Where(w => w.dtype == 2).Sum(s => s.longval10), longval11 = vm.Datas.Where(w => w.dtype == 2).Sum(s => s.longval11), longval12 = vm.Datas.Where(w => w.dtype == 2).Sum(s => s.longval12), });
-                vm.Datas.Insert(9, new Data() { dtype = 3, intval = 3, strval = "총계", longval = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval), longval2 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval2), longval3 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval3), longval4 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval4), longval5 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval5), longval6 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval6), longval7 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval7), longval8 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval8), longval9 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval9), longval10 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval10), longval11 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval11), longval12 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval12), });
+                if (vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Count() < 1)
+                {
+                    vm.Datas.Insert(0, new Data() { dtype = 0, intval = 0, strval = "강좌", strval2 = "매출" });
+                }
+                if (vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Count() < 1)
+                {
+                    vm.Datas.Insert(1, new Data() { dtype = 0, intval = 1, strval2 = "환불" });
+                }
+                vm.Datas2 = new List<Data>();
+                vm.Datas2.Insert(0, new Data() {
+                    dtype = 0,
+                    intval = 0,
+                    strval = "강좌",
+                    strval2 = "매출",
+                    longval = vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Sum(s => s.longval),
+                    longval2 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Sum(s => s.longval2),
+                    longval3 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Sum(s => s.longval3),
+                    longval4 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Sum(s => s.longval4),
+                    longval5 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Sum(s => s.longval5),
+                    longval6 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Sum(s => s.longval6),
+                    longval7 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Sum(s => s.longval7),
+                    longval8 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Sum(s => s.longval8),
+                    longval9 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Sum(s => s.longval9),
+                    longval10 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Sum(s => s.longval10),
+                    longval11 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Sum(s => s.longval11),
+                    longval12 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 0).Sum(s => s.longval12)
+                });
+                vm.Datas2.Insert(1, new Data()
+                {
+                    dtype = 0,
+                    intval = 1,
+                    strval = "",
+                    strval2 = "환불",
+                    longval = vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Sum(s => s.longval),
+                    longval2 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Sum(s => s.longval2),
+                    longval3 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Sum(s => s.longval3),
+                    longval4 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Sum(s => s.longval4),
+                    longval5 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Sum(s => s.longval5),
+                    longval6 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Sum(s => s.longval6),
+                    longval7 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Sum(s => s.longval7),
+                    longval8 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Sum(s => s.longval8),
+                    longval9 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Sum(s => s.longval9),
+                    longval10 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Sum(s => s.longval10),
+                    longval11 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Sum(s => s.longval11),
+                    longval12 = vm.Datas.Where(w => w.dtype == 0 && w.intval == 1).Sum(s => s.longval12)
+                });
+                vm.Datas2.Insert(vm.Datas2.Count, new Data() { dtype = 0, intval = 2, strval2 = "합계", longval = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval), longval2 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval2), longval3 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval3), longval4 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval4), longval5 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval5), longval6 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval6), longval7 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval7), longval8 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval8), longval9 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval9), longval10 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval10), longval11 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval11), longval12 = vm.Datas.Where(w => w.dtype == 0).Sum(s => s.longval12), });
+                //vm.Datas.Insert(9, new Data() { dtype = 3, intval = 3, strval = "총계", longval = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval), longval2 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval2), longval3 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval3), longval4 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval4), longval5 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval5), longval6 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval6), longval7 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval7), longval8 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval8), longval9 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval9), longval10 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval10), longval11 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval11), longval12 = vm.Datas.Where(w => w.intval == 2).Sum(s => s.longval12), });
                 if (vm.isexceldown == 1)
                 {
                     return ExportExcel(
diff --git a/BO/Views/data/sales0.cshtml b/BO/Views/data/sales0.cshtml
index c3d280a..cad57f4 100644
--- a/BO/Views/data/sales0.cshtml
+++ b/BO/Views/data/sales0.cshtml
@@ -39,19 +39,14 @@
                     </tr>
                 </thead>
                 <tbody class="data" id="tbody1">
-                    @foreach (var item in Model.Datas)
+                    @foreach (var item in Model.Datas2)
                     {
                     <tr>
                         @if (item.intval == 0)
                         {
-                            seq++;
-                            <td @(seq < 4 ? "rowspan="+"3" : "") id="@seq">@item.strval</td>
+                            <td rowspan="3">@item.strval</td>
                         }
-                        else if (item.intval == 3)
-                        {
-                            <td colspan="2">@item.strval</td>
-                        }
-                        @Html.Raw(item.intval == 3 ? "" : ("<td>" + item.strval2 + "</td>"))
+                        <td>@item.strval2</td>
                         <td class="text-right">@item.longval.ToString("#,0")</td>
                         <td class="text-right">@item.longval2.ToString("#,0")</td>
                         <td class="text-right">@item.longval3.ToString("#,0")</td>
diff --git a/Model/VMMM.cs b/Model/VMMM.cs
index e0b930c..fe9d39c 100644
--- a/Model/VMMM.cs
+++ b/Model/VMMM.cs
@@ -30,6 +30,7 @@ namespace NP.Model
         public IList<NCS> NCSs { get; set; }
         public IList<NCS> NCSs2 { get; set; }
         public IList<Data> Datas { get; set; }
+        public IList<Data> Datas2 { get; set; }
         public IList<CMLect> CMLects { get; set; }
         public IList<CM> PCMs { get; set; }
         public IList<CM> CMs { get; set; }