diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index da42b2a..13b05dc 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -648,11 +648,6 @@ namespace NP.BO.Controllers } int pcnt = vm.pagerowcount == 0 ? 100 : vm.pagerowcount; var ht = SetHash(vm); - if(vm.isexceldown == 1) - { - ht.Remove("pagerowsize"); - ht.Add("pagerowsize",pcnt); - } ht.Add("edate", vm.stringval); ht.Add("cshape", vm.stringval2); ht.Add("cname", vm.stringval3); @@ -675,8 +670,8 @@ namespace NP.BO.Controllers if (vm.isexceldown == 1) { return ExportExcel( - new String[] { "No", "운영기수", "구분", "고객사", "교육장", "과정명", "교육생(ID)", "교육시작일", "교육종료일", "진도율", "진행평가", "최종평가", "과제", "환산점수", "집합교육출석여부", "강의평가", "수료여부"}, - new String[] { "rno", "sseqname", "isrebatename", "asname", "studyplacename", "cname", "usernameid", "sdatestr", "edatestr", "attrate", "ex0point", "ex1point", "sd0point", "tpointstr", "isoffabsstr", "rs0point", "iscompletename" }, + new String[] { "No", "운영기수", "구분", "고객사", "교육장", "과정명", "교육생(ID)","연락처", "교육시작일", "교육종료일", "진도율", "진행평가", "최종평가", "과제", "환산점수", "집합교육출석여부", "강의평가", "수료여부"}, + new String[] { "rno", "sseqname", "isrebatename", "asname", "studyplacename", "cname", "usernameid","mobile", "sdatestr", "edatestr", "attrate", "ex0point", "ex1point", "sd0point", "tpointstr", "isoffabsstr", "rs0point", "iscompletename" }, vm.Lects, "성적처리전체" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day); } diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml index 0bfe23a..7727bda 100644 --- a/Dao/MyBatis/Maps/Grade.xml +++ b/Dao/MyBatis/Maps/Grade.xml @@ -248,6 +248,7 @@ ,row_number() over(order by $orderby$c.cname,c.cmno,u.username ) rno ,count(a.lectno) over() pagetotalcount ,b.isrebate,ua.asname,u.username,u.userid,b.iscomplete,b.completetime,b.sdate,b.edate + ,CAST(AES_DECRYPT(UNHEX(u.mobile), ) AS char) mobile ,b.cmisno ,p.payoktime ,c.cshape,c.sstime,c.cmno,c.cname,c.classno