diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 86b95ab..d9d1086 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -685,10 +685,20 @@ namespace NP.BO.Controllers if (vm.isexceldown == 1) { return ExportExcel( - new String[] { "No", "운영기수", "구분", "고객사", "교육장", "과정명", "교육생", "ID", "핸드폰", "교육시작일", "교육종료일", "진도율", "진행평가", "최종평가", "과제", "환산점수", "집합교육출석여부", "강의평가", "수료여부"}, - new String[] { "rno", "sseqname", "isrebatename", "asname", "studyplacename", "cname", "username", "userid", "mobile", "sdatestr", "edatestr", "attrate", "ex0point", "ex1point", "sd0point", "tpointstr", "isoffabsstr", "rs0point", "iscompletename" }, + new String[] { "순번","결제번호", "사용자ID", "이름","주민번호","교육생연락처","교육유형","교육구분" + , "기술인분류", "직무분야","교육목적","등급", "교육시작일", "교육종료일", "과정명","수료번호","교육이수시간" + , "진도율", "평가점수", "과제점수", "총점", "온라인집체교육출석여부", "강의평가" + ,"업체명","업체주소","사업자등록번호","고용보험관리번호","업태","종목","대표자","학력","직위","업체담당자","업체담당자 연락처" + ,"교육비","환급여부","환급액","환급은행명","환급계좌","환급계좌예금주","계산서이메일","소속협회" + ,"교육상위분류","교육하위분류","교육장소","교육연도", "수료여부"}, + new String[] { "rno","payno", "userid", "username","userpno", "mobile","cshapename","edukind" + , "typemanname","typejobname","typeeduname","typegradename", "sdatestr", "edatestr", "cname","completeno","studytime" + , "attrate", "ex1point", "sd0point", "tpointstr", "isoffabsstr", "rs0point" + ,"asname","addr","brno","eino","btype","bkind","ceoname","slevel","uduty","mname","mphone" + ,"payamt","isrebatename","rbankamt","rbank","rbankaccnum","rbankuser","taxemail","association" + ,"pcgname","cgname","studyplacename","tyear", "iscompletename" }, vm.Lects, - "성적처리전체" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day); + "성적처리전체" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day,null,",4"); } vm.pagetotalcount = GetCount(vm.Lects.FirstOrDefault()); break; diff --git a/Dao/MyBatis/Maps/Grade.xml b/Dao/MyBatis/Maps/Grade.xml index 3ec9c2d..da641df 100644 --- a/Dao/MyBatis/Maps/Grade.xml +++ b/Dao/MyBatis/Maps/Grade.xml @@ -244,14 +244,23 @@