KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit is contained in:
hyunho 2021-03-30 00:08:39 +00:00
parent cad602ecf7
commit 631218e24b
5 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BO/Controllers/dataController.cs
View File

@ -174,8 +174,8 @@ namespace NP.BO.Controllers
if (vm.isexceldown == 1) if (vm.isexceldown == 1)
{ {
return ExportExcel( return ExportExcel(
new String[] { "상위분류", "과정분류", "과정명", "강좌명(반)", "교육기간", "신청완료[총계]", "수료[총계]","미수료[총계]", "신청완료[회원]", "수료[회원]", "신청완료[비환급]", "수료[비환급]","미수료[비환급]", "신청완료[환급]", "수료[환급]","미수료[환급]" ,"신청완료[합숙]", "수료[합숙]", "미수료[합숙]", "신청완료[비합숙]", "수료[비합숙]", "미수료[비합숙]", }, 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" }, new String[] { "strval", "strval2", "strval3", "strval4", "strval5", "intval", "intval2","intval15", "intval7", "intval8","intval13", "intval9", "intval10","intval14", "intval16", "intval17", "intval18", "intval19", "intval20", "intval21" },
vm.Datas, vm.Datas,
vm.excelname); vm.excelname);
} }
@ -383,8 +383,8 @@ namespace NP.BO.Controllers
if (vm.isexceldown == 1) if (vm.isexceldown == 1)
{ {
return ExportExcel( return ExportExcel(
new String[] { "상위분류", "과정분류", "과정명", "강좌명(반)", "교육기간", "신청완료[총계]", "수료[총계]", "미수료[총계]", "신청완료[회원]", "수료[회원]", "신청완료[비환급]", "수료[비환급]", "미수료[비환급]", "신청완료[환급]", "수료[환급]", "미수료[환급]", "신청완료[합숙]", "수료[합숙]", "미수료[합숙]", "신청완료[비합숙]", "수료[비합숙]", "미수료[비합숙]", }, 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" }, new String[] { "strval", "strval2", "strval3", "strval4", "strval5", "intval", "intval2", "intval15", "intval7", "intval8", "intval13", "intval9", "intval10", "intval14", "intval16", "intval17", "intval18", "intval19", "intval20", "intval21" },
vm.Datas, vm.Datas,
vm.excelname); vm.excelname);
} }
@ -399,8 +399,8 @@ namespace NP.BO.Controllers
if (vm.isexceldown == 1) if (vm.isexceldown == 1)
{ {
return ExportExcel( return ExportExcel(
new String[] { "상위분류", "과정분류", "과정명", "강좌명(반)", "교육기간", "신청완료[총계]", "수료[총계]", "미수료[총계]", "신청완료[회원]", "수료[회원]", "신청완료[비환급]", "수료[비환급]", "미수료[비환급]", "신청완료[환급]", "수료[환급]", "미수료[환급]", "신청완료[합숙]", "수료[합숙]", "미수료[합숙]", "신청완료[비합숙]", "수료[비합숙]", "미수료[비합숙]", }, 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" }, new String[] { "strval", "strval2", "strval3", "strval4", "strval5", "intval", "intval2", "intval15", "intval7", "intval8", "intval13", "intval9", "intval10", "intval14", "intval16", "intval17", "intval18", "intval19", "intval20", "intval21" },
vm.Datas, vm.Datas,
vm.excelname); vm.excelname);
} }

7
BO/Views/data/learns0.cshtml
View File

@ -41,7 +41,6 @@
<th rowspan="2">강좌명(반)</th> <th rowspan="2">강좌명(반)</th>
<th rowspan="2">교육기간</th> <th rowspan="2">교육기간</th>
<th colspan="3" style="border-right:double; border-left:double">총계</th> <th colspan="3" style="border-right:double; border-left:double">총계</th>
<th colspan="2" style="border-right:double">회원</th>
<th colspan="3" style="border-right:double">비환급</th> <th colspan="3" style="border-right:double">비환급</th>
<th colspan="3" style="border-right:double">환급</th> <th colspan="3" style="border-right:double">환급</th>
<th colspan="3" style="border-right:double">합숙</th> <th colspan="3" style="border-right:double">합숙</th>
@ -52,9 +51,6 @@
<th>수료</th> <th>수료</th>
<th style="border-right:double">미수료</th> <th style="border-right:double">미수료</th>
<th>신청완료</th>
<th style="border-right:double">수료</th>
<th>신청완료</th> <th>신청완료</th>
<th>수료</th> <th>수료</th>
<th style="border-right:double">미수료</th> <th style="border-right:double">미수료</th>
@ -88,9 +84,6 @@
<td class="text-right">@item.intval2.ToString("#,0")</td> <td class="text-right">@item.intval2.ToString("#,0")</td>
<td class="text-right" style="border-right:double">@item.intval15.ToString("#,0")</td> <td class="text-right" style="border-right:double">@item.intval15.ToString("#,0")</td>
<td class="text-right">@item.intval11.ToString("#,0")</td>
<td class="text-right" style="border-right:double">@item.intval12.ToString("#,0")</td>
<td class="text-right">@item.intval7.ToString("#,0")</td> <td class="text-right">@item.intval7.ToString("#,0")</td>
<td class="text-right">@item.intval8.ToString("#,0")</td> <td class="text-right">@item.intval8.ToString("#,0")</td>
<td class="text-right" style="border-right:double">@item.intval13.ToString("#,0")</td> <td class="text-right" style="border-right:double">@item.intval13.ToString("#,0")</td>

7
BO/Views/data/learns6.cshtml
View File

@ -41,7 +41,6 @@
<th rowspan="2">강좌명(반)</th> <th rowspan="2">강좌명(반)</th>
<th rowspan="2">교육기간</th> <th rowspan="2">교육기간</th>
<th colspan="3" style="border-right:double; border-left:double">총계</th> <th colspan="3" style="border-right:double; border-left:double">총계</th>
<th colspan="2" style="border-right:double">회원</th>
<th colspan="3" style="border-right:double">비환급</th> <th colspan="3" style="border-right:double">비환급</th>
<th colspan="3" style="border-right:double">환급</th> <th colspan="3" style="border-right:double">환급</th>
<th colspan="3" style="border-right:double">합숙</th> <th colspan="3" style="border-right:double">합숙</th>
@ -52,9 +51,6 @@
<th>수료</th> <th>수료</th>
<th style="border-right:double">미수료</th> <th style="border-right:double">미수료</th>
<th>신청완료</th>
<th style="border-right:double">수료</th>
<th>신청완료</th> <th>신청완료</th>
<th>수료</th> <th>수료</th>
<th style="border-right:double">미수료</th> <th style="border-right:double">미수료</th>
@ -88,9 +84,6 @@
<td class="text-right">@item.intval2.ToString("#,0")</td> <td class="text-right">@item.intval2.ToString("#,0")</td>
<td class="text-right" style="border-right:double">@item.intval15.ToString("#,0")</td> <td class="text-right" style="border-right:double">@item.intval15.ToString("#,0")</td>
<td class="text-right">@item.intval11.ToString("#,0")</td>
<td class="text-right" style="border-right:double">@item.intval12.ToString("#,0")</td>
<td class="text-right">@item.intval7.ToString("#,0")</td> <td class="text-right">@item.intval7.ToString("#,0")</td>
<td class="text-right">@item.intval8.ToString("#,0")</td> <td class="text-right">@item.intval8.ToString("#,0")</td>
<td class="text-right" style="border-right:double">@item.intval13.ToString("#,0")</td> <td class="text-right" style="border-right:double">@item.intval13.ToString("#,0")</td>

7
BO/Views/data/learns7.cshtml
View File

@ -41,7 +41,6 @@
<th rowspan="2">강좌명(반)</th> <th rowspan="2">강좌명(반)</th>
<th rowspan="2">교육기간</th> <th rowspan="2">교육기간</th>
<th colspan="3" style="border-right:double; border-left:double">총계</th> <th colspan="3" style="border-right:double; border-left:double">총계</th>
<th colspan="2" style="border-right:double">회원</th>
<th colspan="3" style="border-right:double">비환급</th> <th colspan="3" style="border-right:double">비환급</th>
<th colspan="3" style="border-right:double">환급</th> <th colspan="3" style="border-right:double">환급</th>
<th colspan="3" style="border-right:double">합숙</th> <th colspan="3" style="border-right:double">합숙</th>
@ -52,9 +51,6 @@
<th>수료</th> <th>수료</th>
<th style="border-right:double">미수료</th> <th style="border-right:double">미수료</th>
<th>신청완료</th>
<th style="border-right:double">수료</th>
<th>신청완료</th> <th>신청완료</th>
<th>수료</th> <th>수료</th>
<th style="border-right:double">미수료</th> <th style="border-right:double">미수료</th>
@ -88,9 +84,6 @@
<td class="text-right">@item.intval2.ToString("#,0")</td> <td class="text-right">@item.intval2.ToString("#,0")</td>
<td class="text-right" style="border-right:double">@item.intval15.ToString("#,0")</td> <td class="text-right" style="border-right:double">@item.intval15.ToString("#,0")</td>
<td class="text-right">@item.intval11.ToString("#,0")</td>
<td class="text-right" style="border-right:double">@item.intval12.ToString("#,0")</td>
<td class="text-right">@item.intval7.ToString("#,0")</td> <td class="text-right">@item.intval7.ToString("#,0")</td>
<td class="text-right">@item.intval8.ToString("#,0")</td> <td class="text-right">@item.intval8.ToString("#,0")</td>
<td class="text-right" style="border-right:double">@item.intval13.ToString("#,0")</td> <td class="text-right" style="border-right:double">@item.intval13.ToString("#,0")</td>

3
Dao/MyBatis/Maps/System.xml
View File

@ -926,9 +926,6 @@
,sum(case when c.isrebate=1 then 1 else 0 end) intval9 ,sum(case when c.isrebate=1 then 1 else 0 end) intval9
,sum(case when c.isrebate=1 and c.iscomplete=1 then 1 else 0 end) intval10 ,sum(case when c.isrebate=1 and c.iscomplete=1 then 1 else 0 end) intval10
,sum(1) intval11 <!--회원신청완료-->
,sum(case when c.iscomplete=1 then 1 else 0 end) intval12 <!--회원 수료-->
,sum(case when c.isrebate=0 and (c.iscomplete &lt;&gt; 1 or c.iscomplete is null) then 1 else 0 end) intval13 <!--비환급 미수료--> ,sum(case when c.isrebate=0 and (c.iscomplete &lt;&gt; 1 or c.iscomplete is null) then 1 else 0 end) intval13 <!--비환급 미수료-->
,sum(case when c.isrebate=1 and (c.iscomplete &lt;&gt; 1 or c.iscomplete is null) then 1 else 0 end) intval14 <!--환급 미수료--> ,sum(case when c.isrebate=1 and (c.iscomplete &lt;&gt; 1 or c.iscomplete is null) then 1 else 0 end) intval14 <!--환급 미수료-->