@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
+
+
\ 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
+
+
\ 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
+
+
\ 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