<오류수정>

1. PMS NO : 
2. (주요)작업내용 
 - 기존 system.net.http.formatting.dll 잇슈 문제로
   지태연작업 프로젝트와 서인덕 작업 프로젝트 파일 매칭 작업을 진행함

BO/Controllers/ccController.cs

@@ -44,14 +44,36 @@ namespace NP.BO.Controllers
             }
             return View(vm);
         }
-        /*덕이 엑셀*/
-        public ActionResult exelboard()
-        {
-            return View();
-        }
-        /*덕이 엑셀기록*/
 
-        /*덕이...*/
+        /// <summary>
+        /// 엑셀로그
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult exelboard(VMCM vm)
+        {
+            if (!IsPost())
+            {
+                vm.stringval5 = null;
+                vm.stringval6 = null;
+            }
+
+            var ht = SetHash(vm, false);
+            if (string.IsNullOrEmpty(vm.stringval))
+            {
+                vm.stringval = DateTime.Now.Year.ToString();
+            }
+
+            ht.Add("userid", vm.stringval4);
+            ht.Add("sstime", vm.stringval5);
+            ht.Add("setime", vm.stringval6);
+            ht.Add("isallday", "1");
+            /*Excellog excellog = new Excellog();*/
+            vm.excelloglook = Dao.Get<Excellog>("excellog.look", ht);
+            vm.pagetotalcount = GetCount(vm.excelloglook.FirstOrDefault());
+
+            return View(vm);
+        }
+
         public ActionResult homesemployess(NP.Model.VMCC vm)
         {
             vm.Boards = InitM<Board>();
@@ -86,7 +108,6 @@ namespace NP.BO.Controllers
             }
             return View(vm);
         }
- /*덕이꺼 끝*/
         public ActionResult homes(NP.Model.VMCC vm)
         {
             vm.Boards = InitM<Board>();
@@ -122,16 +143,12 @@ namespace NP.BO.Controllers
             }
             return View(vm);
         }
-        //이거 숙제라고 하셨사와용
-        /*public ActionResult cmmasters(NP.Model.VMCM vm)
-        {
-            vm.viewidx = 1;
-            vm.viewname = "cmmasterreg";
-            vm.listviewname = "cmmasters";
-            return homes(vm);
-        }*/
 
-        /*덕이 직원게시판 등록*/
+        /// <summary>
+        /// 외부 직원게시판
+        /// </summary>
+        /// <param name="vm"></param>
+        /// <returns></returns>
         public ActionResult homer2(NP.Model.VMCC vm)
         {
             if (vm.Board != null && vm.Board.pbno != null)
@@ -187,7 +204,7 @@ namespace NP.BO.Controllers
             vm.SCUserName = SUserInfo.UserName;
             return View(vm);
         }
-        /*덕이 직원게시판 등록 끝*/
+
         public ActionResult homer(NP.Model.VMCC vm)
         {
             if (vm.Board != null && vm.Board.pbno != null)

BO/Controllers/croomController.cs

@@ -179,11 +179,18 @@ namespace NP.BO.Controllers
             if (vm.isexceldown == 1)
             {
                 vm.Lects = Dao.Get<Lect>("lect.lects.att",ht);
+
+                if (vm.excellog != null)
+                {
+                    vm.excellog.userno = SUserInfo.UserNo;
+                    vm.excellog.userip = GetUserIP();
+                }
+
                 return ExportExcel(
                         new String[] { "고객사", "이름","직위", "교육생ID", "이메일", "전화번호", "휴대폰번호", "신청일", "수강상태", "결제상태" , "교육일", "기술인구분","직무분야","교육목적","등급"},
                         new String[] { "asname", "username", "uduty", "userid", "email", "telno", "mobile", "cdtymd", "statusname", "pstatusname", "estartstring", "typemanname", "typejobname", "typeeduname", "typegradename" },
                         vm.Lects,
-                        "신청자명단");
+                        "신청자명단", null, null, vm.excellog);
 
             }
             else
@@ -721,6 +728,14 @@ namespace NP.BO.Controllers
             {
                 ht.Add(vm.stringval6, vm.stringval7);
             }
+
+
+            if (vm.excellog != null)
+            {
+                vm.excellog.userno = SUserInfo.UserNo;
+                vm.excellog.userip = GetUserIP();
+            }
+
             switch (vm.tabidx)
             {
                 case 0:
@@ -744,7 +759,7 @@ namespace NP.BO.Controllers
                                     ,"payamt","isrebatename","rbankamt","rbank","rbankaccnum","rbankuser","taxemail","association"
                                     ,"pcgname","cgname","studyplacename","tyear", "iscompletename" },
                                 vm.Lects,
-                                "성적처리전체" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day,null,",2,4");
+                                "성적처리전체" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day,null,",2,4", vm.excellog);
                     }
                     vm.pagetotalcount = GetCount(vm.Lects.FirstOrDefault());
                     break;
@@ -760,7 +775,7 @@ namespace NP.BO.Controllers
                                     new String[] { "No", "운영기수", "구분", "고객사", "교육장", "과정명", "시험명", "교육생", "ID", "핸드폰",  "교육시작일", "교육종료일", "응시일자(제출일자)","경과시간", "IP", "응시상태", "총점", "수료여부" },
                                     new String[] { "rno", "sseq", "isrebatename", "asname", "studyplacename", "cname", "exname", "username", "userid", "mobile", "leststr", "leestrExcel", "estarteend", "eseterm", "eip", "estatename", "tpoint", "iscompletename" },
                                     vm.LectEXes,
-                                    "성적처리평가" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day);
+                                    "성적처리평가" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day, null, null, vm.excellog);
                         }
                         vm.pagetotalcount = GetCount(vm.LectEXes.FirstOrDefault());
                     }
@@ -779,7 +794,7 @@ namespace NP.BO.Controllers
                                     new String[] { "No", "운영기수", "교육장", "과정명", "교육생", "ID", "핸드폰", "교육시작일", "교육종료일", "상태", "점수", "첨삭", "모사", "최근제출일(IP)", "최근평가일(IP)","수료여부" },
                                     new String[] { "rno", "sseq", "studyplacename", "cname", "username", "userid", "mobile", "leststr", "leestrExcel", "sdstatename", "cpoint2", "feedbox", "copyratename", "submittimeip_format", "checktimeip_format", "iscompletename" },
                                     vm.LectSDs,
-                                    "성적처리과제" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day);
+                                    "성적처리과제" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day, null, null, vm.excellog);
                         }
                         vm.pagetotalcount = GetCount(vm.LectSDs.FirstOrDefault());
                     }
@@ -885,11 +900,18 @@ namespace NP.BO.Controllers
                     payItem.studyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == payItem.studyplace).FirstOrDefault()?.cname;
                     payItem.cmistudyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == payItem.cmistudyplace).FirstOrDefault()?.cname;
                 }
+
+                if(vm.excellog != null)
+                {
+                    vm.excellog.userno = SUserInfo.UserNo;
+                    vm.excellog.userip = GetUserIP();
+                }
+
                 return ExportExcel(
                         new String[] { "결제번호", "신청자이름", "ID","주민번호", "핸드폰", "회사명", "상품유형", "환급여부", "상품명", "결제금액", "결제방법", "입금금액", "환불금액", "신청일","신청일시", "입금일", "결제상태", "환급은행명", "환급계좌번호", "환급예금주", "교육장소", "강좌교육시작일", "강좌교육종료일", "신청교육장소", "교육종료일","기술인분류","교육구분","직무분야","등급","목적","수료여부" },
                         new String[] { "payno", "username", "userid"," userpno", "mobile", "asname", "cshapename", "isrebatename", "itemname", "payamt", "pptypename", "payamt", "refundamt", "cdtymd","cdtymdhms", "payymd", "pstatusname2", "rbank", "rbankaccnum", "tbankuser", "studyplacename", "sdateymd", "edateymd", "cmistudyplacename", "cmiestartymd","tmname","edukind","tjname","tgname","tename", "completename" },
                         vm.PayItems,
-                        "ProductSales_" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day);
+                        "ProductSales_" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day, null, null, vm.excellog);
             }
             return View(vm);
         }
@@ -1013,7 +1035,7 @@ namespace NP.BO.Controllers
                          new String[] {"payno","cdtymd", "payoktimeymd", "pstatusname2","username", "userid", "mobile", "itemname","eendymd", "asname", "ceoname","asaddr",
                              "brno", "btype","bkind", "manname", "telno", "email", "isreceiptname", "taxamt", "taxdatereqymd","taxdateymd","realtaxdateymd","status"},
                         vm.PayTaxes,
-                        "계산서요청"+DateTime.Now.ToString("yy.MM.dd"), null);
+                        "계산서요청"+DateTime.Now.ToString("yy.MM.dd"));
             }
             vm.pagetotalcount = GetCount(vm.PayTaxes.FirstOrDefault());
                        

BO/Controllers/dataController.cs

@@ -455,11 +455,17 @@ namespace NP.BO.Controllers
             vm.CMs = new List<CM>() { };
             if (vm.isexceldown == 1)
             {
+                if (vm.excellog != null)
+                {
+                    vm.excellog.userno = SUserInfo.UserNo;
+                    vm.excellog.userip = GetUserIP();
+                }
+
                 return ExportExcel(
                     new String[] { "No", "상위분류", "과정분류", "과정", "강좌(반)", "교육기간", "고객사", "교육생(ID)", "부서", "직급", "핸드폰", "이메일", "교육비", "학습진도율", "수료" },
                     new String[] { "rnorvt","pcgname","cgname","pcname","cnameclassno","sssename","asname","usernameid","depart","ccpositionname","mobile","email","payamt","attrate","iscompleteye" },
                     vm.CMLects,
-                    vm.excelname);
+                    vm.excelname, null, null, vm.excellog);
             }
             if (SUserInfo.IsSiteAdmin)
             {

BO/Views/Shared/Partial/ExcelCommentBox.cshtml

@@ -62,7 +62,7 @@
 </style>
 <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
 <script>
-    function exceldown(fid, url, checktbody, exname, limitstringval) {
+    function exceldown2(fid, url, checktbody, exname, limitstringval, jsonDataStr) {
         var limit = 14;
         if (limitstringval) {
             limit = limitstringval;
@@ -74,10 +74,22 @@
             $("#mainexcelform *").remove();
             $("#mainexcelform").attr("action", url);
 
-                let comment = $("#comment").val();
+            let comment = "";
-                let url = $("#excelParam2").val();
+
-                $("#mainexcelform").append("<input type=\"hidden\" name=\"position\" value=\"" + url+"\" />");
+            if ($("#comment").length > 0) {
-                $("#mainexcelform").append("<input type=\"hidden\" name=\"comment\" value=\"" + comment + "\" />");
+                comment = $("#comment").val();
+            }
+
+            if (jsonDataStr != "") {
+                let jsonData = JSON.parse(jsonDataStr);
+                let kk = "";
+                $.each(jsonData, function (key, value) {
+                    $("#mainexcelform").append("<input type=\"hidden\" name=\"" + key + "\" value=\"" + value+"\" />");
+                });
+            }
+
+            $("#mainexcelform").append("<input type=\"hidden\" name=\"excellog.position\" value=\"@(ViewBag.Title)\" />");
+            $("#mainexcelform").append("<input type=\"hidden\" name=\"excellog.comment\" value=\"" + comment + "\" />");
 
             $("#mainexcelform").append("<input type=\"hidden\" name=\"isexceldown\" value=\"1\" />");
             $("#mainexcelform").append("<input type=\"hidden\" name=\"excelname\" value=\"" + exname + "_@DateTime.Now.ToString("yyyyMMdd")\" />");
@@ -99,7 +111,7 @@
     function callComment(fid, url, checktbody, exname, limitstringval) {
         $('#comment').val('');
         $("#excelParam1").val(fid)
-        //$("#excelParam2").val(url)
+        $("#excelParam2").val(url)
         $("#excelParam3").val(checktbody)
         $("#excelParam4").val(exname)
         $("#excelParam5").val(limitstringval)
@@ -121,11 +133,17 @@
             $('#bglayer').hide();
 
             let fid = $("#excelParam1").val()
+            let url = $("#excelParam2").val()
             let checktbody = $("#excelParam3").val()
             let exname = $("#excelParam4").val()
             let limitstringval = $("#excelParam5").val()
+            let jsonDataStr = ""
 
-            exceldown(fid, url, checktbody, exname, limitstringval);
+            if ($("#excelParam10").length > 0) {
+                jsonDataStr = $("#excelParam10").val();
+            }
+
+            exceldown2(fid, url, checktbody, exname, limitstringval, jsonDataStr);
         }
 
     }

BO/Views/croom/cmlects.cshtml

@@ -67,6 +67,10 @@
             @if (!ViewBag.IsSubAdmin96)
             {
                 <a href="#" class="btn btn-success" onclick="callexcel()">엑셀다운로드</a>
+                //location.href = '/croom/cmlects?isexceldown=1&intval=@Model.CM.cmno&addstringval=' + val('addstringval') + '&addstringval2=' + val('addstringval2');
+
+
+                @*<a href="#" onclick="javascript:callComment('mform', '/croom/cmlects', 'tbody1', 'ProductSales', 23);" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>*@
                 @Html.Raw("&nbsp;&nbsp;");
             }
             <a href="#" class="btn btn-default" onclick="golist()">목록</a>
@@ -158,6 +162,7 @@
 <form id="dform" method="post" action="/croom/lectcms">
     @Html.Partial("./Partial/DForm", Model, new ViewDataDictionary { { "preform", 1 } })
 </form>
+@Html.Partial("./Partial/ExcelCommentBox")
 <div id="thisbox" class="findbox draggable regbox" style="width: 600px; z-index: 1041; top: 60px; overflow: auto;">
     <h4><i class="fa fa-bars"></i> <span id="pcap">교육생 정보</span><a href="#" class="btn btn-default btn-xs f-r closethisbox">닫기</a></h4>
     <table class="regtable">
@@ -285,6 +290,7 @@
     @Html.Partial("./Partial/FileScript")
     @Html.Partial("./Partial/ScriptDate")
     @Html.Partial("./Partial/ScdScript", null, new ViewDataDictionary() { { "cmno", Model.CM.cmno } })
+<input type="hidden" id="excelParam10" value="" />
 }
 @section scripts{
     <script>
@@ -326,9 +332,20 @@
             } else { msg("이미 탈퇴된 회원입니다."); }
         }
     }
+
     function callexcel() {
-        location.href = '/croom/cmlects?isexceldown=1&intval=@Model.CM.cmno&addstringval=' + val('addstringval') + '&addstringval2=' + val('addstringval2');
+        // location.href = '/croom/cmlects?isexceldown=1&intval=@Model.CM.cmno&addstringval=' + val('addstringval') + '&addstringval2=' + val('addstringval2');
+        callComment('mform', '/croom/cmlects', 'tbody1', 0)
+
+        let jsonData = {};
+        jsonData.intval = @(Model.CM.cmno);
+        jsonData.addstringval = val('addstringval');
+        jsonData.addstringval2 = val('addstringval2');
+
+        $("#excelParam10").val(JSON.stringify(jsonData))
     }
+
+
     var _lectno;
     var _pstatus;
     var _rstatus;

BO/Views/croom/gradeall0.cshtml

@@ -7,7 +7,8 @@
         <div style="padding: 5px 10px; text-align: right;">
             @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
             @Html.Partial("./Partial/sembtns", "#tbody1;" + (Model.IsAdmin ? "1;1" : "0;0") + ";1;1;0;평가안내")
-            <a href="#" onclick="javascript:exceldown('mform', '/croom/gradeall', 'tbody1', '성적처리전체');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
+            @*<a href="#" onclick="javascript:exceldown('mform', '/croom/gradeall', 'tbody1', '성적처리전체');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>*@
+            <a href="#" onclick="javascript:callComment('mform', '/croom/gradeall', 'tbody1', '성적처리전체');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
             @if (Model.IsAdmin)
             {
                 <a href="#" class="btn btn-primary" onclick="save();">수료확인</a>
@@ -121,6 +122,7 @@
         @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
     </section>
 </form>
+@Html.Partial("./Partial/ExcelCommentBox")
 <div id="scdbox" class="findbox draggable regbox" style="width: 400px; z-index: 1041; top: 60px; overflow: auto;">
     <h4><i class="fa fa-bars"></i> <span id="pcap">교육일정변경</span><a href="#" class="btn btn-default btn-xs f-r closethisbox">닫기</a></h4>
     <ul id="ulScd"></ul>

BO/Views/croom/gradeall2.cshtml

@@ -8,7 +8,8 @@
         <div style="padding: 10px 10px">
             @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-응시상태;2:응시완료;1:응시중;0:미응시" }, { "name", "addstringval2" }, { "selected", Model.addstringval2 }, { "onchange", "submit()" } })
             @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
-            <a href="#" onclick="javascript:exceldown('mform', '/croom/gradeall', 'tbody1', '성적처리평가');" class="btn btn-s-xs btn-success" style="margin-left: 5px; float:right;">엑셀다운로드</a>
+            @*<a href="#" onclick="javascript:exceldown('mform', '/croom/gradeall', 'tbody1', '성적처리평가');" class="btn btn-s-xs btn-success" style="margin-left: 5px; float:right;">엑셀다운로드</a>*@
+            <a href="#" onclick="javascript:callComment('mform', '/croom/gradeall', 'tbody1', '성적처리평가');" class="btn btn-s-xs btn-success" style="margin-left: 5px; float:right;">엑셀다운로드</a>
             @Html.Partial("./Partial/sembtns", "#tbody1;" + (Model.IsAdmin ? "1;1;1" : "0;0;0") + ";1;right;평가안내")
 
         </div>
@@ -104,6 +105,7 @@
         @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
     </section>
 </form>
+@Html.Partial("./Partial/ExcelCommentBox")
 <div id="scdbox" class="findbox draggable regbox" style="width: 400px; z-index: 1041; top: 60px; overflow: auto;">
     <h4><i class="fa fa-bars"></i> <span id="pcap">교육일정변경</span><a href="#" class="btn btn-default btn-xs f-r closethisbox">닫기</a></h4>
     <ul id="ulScd"></ul>
@@ -150,14 +152,48 @@
     </div>
 </div>
 <style type="text/css">
-    td.estate0{background-color: #ffd7bb !important; color: red;}
+    td.estate0 {
-    .tablea0{word-break: break-all; width: 100%;}
+        background-color: #ffd7bb !important;
-    .tablea0 tr td{text-align: center;}
+        color: red;
-    .tablea0 tr td.qi{text-align: left;}
+    }
-    .regtable tr td .tablea0 tr td {padding: 6px 5px;}
+
-    #exsummary tr td{text-align: center;}
+    .tablea0 {
-    td.qi div.imgbox.active{position: fixed; left: 10%; top: 10%; height: 80%; width: 80%; z-index: 3000; background-color: #999; text-align: center;padding-top: 10%;}
+        word-break: break-all;
-    td.qi div.imgbox.active img{height: 60%; max-width: 60%;}
+        width: 100%;
+    }
+
+        .tablea0 tr td {
+            text-align: center;
+        }
+
+            .tablea0 tr td.qi {
+                text-align: left;
+            }
+
+    .regtable tr td .tablea0 tr td {
+        padding: 6px 5px;
+    }
+
+    #exsummary tr td {
+        text-align: center;
+    }
+
+    td.qi div.imgbox.active {
+        position: fixed;
+        left: 10%;
+        top: 10%;
+        height: 80%;
+        width: 80%;
+        z-index: 3000;
+        background-color: #999;
+        text-align: center;
+        padding-top: 10%;
+    }
+
+        td.qi div.imgbox.active img {
+            height: 60%;
+            max-width: 60%;
+        }
 </style>
 <script>
     $(document).ready(function () {

BO/Views/croom/gradeall4.cshtml

@@ -7,7 +7,8 @@
         <div style="padding: 10px 10px">
             @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-응시상태;1:제출;0:미제출" }, { "name", "addstringval2" }, { "selected", Model.addstringval2 }, { "onchange", "findme()" } })
             @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
-            <a href="#" onclick="javascript:exceldown('mform', '/croom/gradeall', 'tbody1', '성적처리과제');" class="btn btn-s-xs btn-success" style="margin-left: 5px; float:right;">엑셀다운로드</a>
+            @*<a href="#" onclick="javascript:exceldown('mform', '/croom/gradeall', 'tbody1', '성적처리과제');" class="btn btn-s-xs btn-success" style="margin-left: 5px; float:right;">엑셀다운로드</a>*@
+            <a href="#" onclick="javascript:callComment('mform', '/croom/gradeall', 'tbody1', '성적처리과제');" class="btn btn-s-xs btn-success" style="margin-left: 5px; float:right;">엑셀다운로드</a>
             @Html.Partial("./Partial/sembtns", "#tbody1;" + (Model.IsAdmin ? "1;11;" : "0;0;0") + ";1;right;평가안내")
         </div>
         <div class="table-responsive" id="excel1">
@@ -90,6 +91,7 @@
         @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
     </section>
 </form>
+@Html.Partial("./Partial/ExcelCommentBox")
 <div id="scdbox" class="findbox draggable regbox" style="width: 400px; z-index: 1041; top: 60px; overflow: auto;">
     <h4><i class="fa fa-bars"></i> <span id="pcap">교육일정변경</span><a href="#" class="btn btn-default btn-xs f-r closethisbox">닫기</a></h4>
     <ul id="ulScd"></ul>

BO/Views/croom/pay.cshtml

@@ -122,7 +122,8 @@
     <div class="tar buttonbox">
         @Html.Partial("./Partial/sembtns", "#tbody1;" + (ViewBag.isadmin ? "1;1;1" : "0;0;0") + ";1;0;결제안내")
         @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
-        <a href="#" onclick="javascript:exceldown('mform', '/croom/pay', 'tbody1', 'ProductSales', 23);" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
+        @*<a href="#" onclick="javascript:exceldown('mform', '/croom/pay', 'tbody1', 'ProductSales', 23);" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>*@
+        <a href="#" onclick="javascript:callComment('mform', '/croom/pay', 'tbody1', 'ProductSales', 23);" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
     </div>
     <section class="panel panel-default">
         <div class="table-responsive" id="excel1">
@@ -182,6 +183,7 @@
 <form id="dform" method="post" action="">
     @Html.Partial("./Partial/dform", Model, new ViewDataDictionary { { "preform", 1 } })
 </form>
+@Html.Partial("./Partial/ExcelCommentBox")
 <form id="taxform" method="post" action="/croom/taxdetail">
     <input type="hidden" id="intval" name="intval" />
 </form>

BO/Views/data/learnassigns.cshtml

@@ -47,7 +47,8 @@
         </section>
         <div class="tar buttonbox">
             @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
-            <a href="#" onclick="javascript:exceldown('mform', '/data/learnassigns', 'tbody1', 'CourseAssigns');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
+            @*<a href="#" onclick="javascript:exceldown('mform', '/data/learnassigns', 'tbody1', 'CourseAssigns');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>*@
+            <a href="#" onclick="javascript:callComment('mform', '/data/learnassigns', 'tbody1', 'CourseAssigns');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
         </div>
         <section class="panel panel-default">
             <div class="table-responsive" id="excel1">
@@ -99,6 +100,7 @@
         </section>
         @Html.HiddenFor(m => m.tabidx)
     </form>
+@Html.Partial("./Partial/ExcelCommentBox")
 @section styles{
     <style type="text/css">
         #excel1 {overflow: initial; width: 100%; height: 550px;}

Base/Base.csproj

@@ -142,12 +142,12 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Controller\AOCommon.cs" />
     <Compile Include="Controller\ACommonCC.cs" />
     <Compile Include="Controller\ACommonCRoom.cs" />
     <Compile Include="Controller\ACommonUser.cs" />
     <Compile Include="Controller\ACommonCM.cs" />
     <Compile Include="Controller\ACommon.cs" />
-    <Compile Include="Controller\AOCommon.cs" />
     <Compile Include="Controller\BaseController.cs" />
     <Compile Include="Controller\BasePartialController.cs" />
     <Compile Include="Controller\FCommonCC.cs" />

Base/Controller/BasePartialController.cs

@@ -794,6 +794,11 @@ namespace NP.Base
             }
             return null;
         }
+        public ActionResult ExportExcel(string[] paramHeaders, string[] paramColumns, System.Collections.IEnumerable paramObj, string paramFileNameNoExt)
+        {            
+            return ExportExcel(paramHeaders, paramColumns, paramObj, paramFileNameNoExt, null, null);
+        }
+
         /// <summary>
         ///  해당 컨트롤러에서 View를 ExportExcel로 리턴
         ///  List<CodeMode> test=new List<CodeMode>();
@@ -862,6 +867,69 @@ namespace NP.Base
             System.Web.HttpContext.Current.ApplicationInstance.CompleteRequest();
             return null;
         }
+
+        public ActionResult ExportExcel(string[] paramHeaders, string[] paramColumns, System.Collections.IEnumerable paramObj, string paramFileNameNoExt, System.Data.DataTable _dt = null, string textcolumns = null, Excellog excellog = null)
+        {
+            var dataGrid = new System.Web.UI.WebControls.DataGrid();
+            var dataTable = new System.Data.DataTable(paramFileNameNoExt);
+            if (_dt == null)
+            {
+                //컬럼생성
+                for (int i = 0; i < paramHeaders.Length; i++)
+                {
+                    dataTable.Columns.Add(paramHeaders[i]);
+                }
+
+                foreach (object instance in paramObj)
+                {
+                    Type t = instance.GetType();
+
+                    System.Data.DataRow newRow = dataTable.NewRow();
+                    for (int i = 0; i < paramColumns.Length; i++)
+                    {
+                        System.Reflection.PropertyInfo property = t.GetProperty(paramColumns[i].Trim());
+                        newRow[i] = property.GetValue(instance, null);
+                    }
+                    dataTable.Rows.Add(newRow);
+                }
+            }
+            else
+            {
+                dataTable = _dt;
+            }
+            //@CUSTOM@ : 엑셀컬럼에 text형식으로 받을 columnindex String 지정
+            deidbtextcolumns = textcolumns;
+            dataGrid.ItemDataBound += new System.Web.UI.WebControls.DataGridItemEventHandler(DataExportExcel_ItemDataBound);
+            dataGrid.DataSource = dataTable;
+            dataGrid.DataBind();
+            System.IO.StringWriter sw = new System.IO.StringWriter();
+            System.Web.UI.HtmlTextWriter htmlWrite = new System.Web.UI.HtmlTextWriter(sw);
+            dataGrid.RenderControl(htmlWrite);
+            System.Text.StringBuilder sbResponseString = new System.Text.StringBuilder();
+
+            sbResponseString.Append("<html xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:x=\"urn:schemas-microsoft-com:office:excel\" xmlns=\"http://www.w3.org/TR/REC-html40\">");
+            //@CUSTOM@ : text형식 style 지정 => mso-number-format:\@;
+            sbResponseString.Append("<head><meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\"><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>Sheet1</x:Name><x:WorksheetOptions><x:Panes></x:Panes></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]-->" + (@"<style> .text { mso-number-format:\@; } </style>") + "</head> <body>");
+            sbResponseString.Append(sw.ToString() + "</body></html>");
+
+            Response.Clear();
+            Response.AppendHeader("Content-Type", "application/vnd.ms-excel");
+            Response.AppendHeader("Content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode(string.Format(paramFileNameNoExt + ".xls"), Encoding.UTF8));
+            Response.Charset = "utf-8";
+            Response.ContentEncoding = System.Text.Encoding.GetEncoding("utf-8");
+
+            Response.Write(sbResponseString.ToString());
+            Response.Flush();
+            System.Web.HttpContext.Current.ApplicationInstance.CompleteRequest();
+
+            if(excellog != null)
+            {
+                Dao.Save("excellog.in", excellog);
+            }
+
+
+            return null;
+        }
         //@CUSTOM@ : text형식 style 지정속성
         private string deidbtextcolumns { get; set; }
         public void ExportExcelXLSX<T>(List<T> data, String fname)

Dao/MyBatis/Maps/System.xml

@@ -216,7 +216,9 @@
 			select c.menuno, c.menuname, c.pmenuno, c.menuurl, c.menulevel, c.menuorder, count(d.menuno) ccount, c.isuse, c.ishid
 			from menu c
 			left outer join menu d on d.pmenuno=c.menuno
-            <dynamic prepend="where"><isNotNull property="menuno" prepend="and">c.menuno=#menuno#</isNotNull></dynamic>
+			<dynamic prepend="where">
+				<isNotNull property="menuno" prepend="and">c.menuno=#menuno#</isNotNull>
+			</dynamic>
 			group by c.menuno, c.menuname, c.pmenuno, c.menuurl, c.menulevel, c.menuorder, c.isuse, c.ishid
 			) a
 			left outer join menu b1 on b1.menuno=a.pmenuno
@@ -1347,13 +1349,10 @@
 			,#logmsg#
 			);
 		</update>
-		<!--인덕이에 엑셀 insert into 문 -->
 		<insert id="excellog.in" parameterClass="excellog">
 			INSERT INTO exceldownlog (userno, userid, username, actiontime, position, comment, userip)
 			VALUES ( #userno#, #userid#, #username#, sysdate(), #position#, #comment#, #userip#);
 		</insert>
-		<!--인덕이에 엑셀 insert into 문  끝-->
-        <!--인덕이에 엑셀 select 문-->
 		<select id="excellog.look" parameterClass="hashtable" resultClass="excellog">
 			select *
 			from (
@@ -1374,6 +1373,5 @@
 			<include refid="sql.pagedynamic"></include>
 			order by edno desc
 		</select>
-		<!--인덕이에 엑셀 select 문 끝-->
 	</statements>
 </sqlMap>

FO/Controllers/FOBaseController.cs

@@ -319,6 +319,10 @@ namespace NP.FO.Controllers
                     sb2auth.Append("</ul></li>");
                     //영남요청건으로 하위메뉴 보임인건 하나도 없어도 메뉴출력하도록 수정
                     var menu = GetMENUPAGES.Where(w => w.pdepth == 1 && (w.isopen == 1 || w.isopen == 2) && w.ppno == m.pno && w.pagetype != 4).FirstOrDefault();
+                    if(menu == null)
+                    {
+                        menu = new MenuPage();
+                    }
                     if(m.pno == 16)
                     {
                         sbmauth.Append(string.Format("<li class=\"topmenu{1}\"><a href=\"#\" onclick=\"gomenu({2}, {3}, '{4}', this)\">{0}</a><ul>", m.pagename, m.pno,menu.pno,menu.pagetype,menu.pageurl));

FO/Views/Course/SmartSearch.cshtml

@@ -387,7 +387,7 @@
                 checkLectIsComplete(_cmno);
             }
             else {
-                msg("1. 선택한 교육목적으로 인정되지 않는 경우\n\n2. 이미 신청 또는 수료한 교육과 함께 수료하면 인정이 되지 않는 경우따라서 현제 화면에 나와있는 다른 교육으로 신청하여 주시기 바랍니다.\n\n문의 : 1544 - 7660");
+                msg("이 교육은 아래의 사유 중 하나에 해당되어 신청되지 않는 교육입니다.<br><br>1. 선택한 교육목적으로 인정되지 않는 경우<br>2. 이미 신청 또는 수료한 교육과 함께 수료하면 인정이 되지 않는 경우<br><br>따라서 현재 화면에 나와있는 다른 교육으로 신청하여 주시기 바랍니다.<br><br>문의 : 1544 - 7660");
             }
         }
         else {

Model/VMCRoom.cs

@@ -62,5 +62,7 @@ namespace NP.Model
         public Data ErrLi { get; set; }
         public int todayLectinningCount { get; set; }
         public int daylectinninglimit { get; set; }
+
+        public Excellog excellog { get; set; }
     }
 }

Model/VMLect.cs

@@ -36,5 +36,6 @@ namespace NP.Model
         public EmailSend EmailSend { get; set; }
         public IList<EmailSend> EmailBans { get; set; }
         public IList<CMinningscd> CMinningscds { get; set; }
+        public Excellog excellog { get; set; }
     }
 }

Model/VMMM.cs

@@ -39,5 +39,7 @@ namespace NP.Model
         public IList<Term> Terms { get; set; }
         public IList<CMCalc> CMCalcs { get; set; }
         public IList<CG> CGs { get; set; }
+
+        public Excellog excellog { get; set; }
     }
 }