From 40af01d99327ded385e8852be6ff05eb366bdd35 Mon Sep 17 00:00:00 2001 From: jity7777 Date: Fri, 12 May 2023 07:59:01 +0000 Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?= =?UTF-8?q?MS=20NO=20:=207869=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91?= =?UTF-8?q?=EC=97=85=EB=82=B4=EC=9A=A9=20(1)=20BO/Controllers/croomControl?= =?UTF-8?q?ler.cs=20=20-=20=EC=97=91=EC=85=80=EC=97=90=20"=EC=A7=91?= =?UTF-8?q?=EC=B2=B4=EA=B5=90=EC=9C=A1=20=EC=B6=9C=EC=84=9D=EC=9D=BC"?= =?UTF-8?q?=ED=95=AD=EB=AA=A9=20=EC=B6=94=EA=B0=80=20(2)=20Dao/MyBatis/Map?= =?UTF-8?q?s/CRoom.xml=20=20-=20"=EC=A7=91=EC=B2=B4=EA=B5=90=EC=9C=A1=20?= =?UTF-8?q?=EC=B6=9C=EC=84=9D=EC=9D=BC"=20=EC=B6=94=EA=B0=80=20=EC=BF=BC?= =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Controllers/croomController.cs | 12 ++++++------ Dao/MyBatis/Maps/CRoom.xml | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 8cea2f1..eb6563a 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -813,13 +813,13 @@ namespace NP.BO.Controllers { return ExportExcel( new String[] { "순번","결제번호", "사용자ID", "이름","주민번호","교육생연락처","교육유형","교육구분" - , "기술인분류", "직무분야","교육목적","등급", "교육시작일", "교육종료일", "과정명","수료번호","교육이수시간" + , "기술인분류", "직무분야","교육목적","등급", "교육시작일", "교육종료일", "집체교육 출석일", "과정명","수료번호","교육이수시간" , "진도율", "평가점수", "과제점수", "총점", "온라인집체교육출석여부", "강의평가" ,"업체명","업체주소","사업자등록번호","고용보험관리번호","업태","종목","대표자","학력","직위","업체담당자","업체담당자 연락처" ,"교육비","환급여부","환급액","환급은행명","환급계좌","환급계좌예금주","계산서이메일","소속협회" ,"교육상위분류","교육하위분류","교육장소","교육연도", "수료여부"}, new String[] { "rno","payno", "userid", "username","userpno", "mobile","cshapename","edukind" - , "typemanname","typejobname","typeeduname","typegradename", "sdatestr", "edatestr", "cname","completeno","studytime" + , "typemanname","typejobname","typeeduname","typegradename", "sdatestr", "edatestr", "zstring3", "cname","completeno","studytime" , "attrate", "ex1point", "sd0point", "tpointstr", "isoffabsstr", "rs0point" ,"asname","addr","brno","eino","btype","bkind","ceoname","slevelName","uduty","mname","mphone" ,"payamt","isrebatename","rbankamt","rbank","rbankaccnum","rbankuser","taxemail","association" @@ -837,13 +837,13 @@ namespace NP.BO.Controllers { return ExportExcel( new String[] { "순번","결제번호", "사용자ID", "이름","주민번호","교육생연락처","교육유형","교육구분" - , "기술인분류", "직무분야","교육목적","등급", "교육시작일", "교육종료일", "과정명","수료번호","교육이수시간" + , "기술인분류", "직무분야","교육목적","등급", "교육시작일", "교육종료일", "집체교육 출석일", "과정명","수료번호","교육이수시간" , "진도율", "평가점수", "과제점수", "총점", "온라인집체교육출석여부", "강의평가" ,"업체명","업체주소","사업자등록번호","고용보험관리번호","업태","종목","대표자","학력","직위","업체담당자","업체담당자 연락처" ,"교육비","환급여부","환급액","환급은행명","환급계좌","환급계좌예금주","계산서이메일","소속협회" ,"교육상위분류","교육하위분류","교육장소","교육연도", "수료여부"}, new String[] { "rno","payno", "userid", "username","userpno", "mobile","cshapename","edukind" - , "typemanname","typejobname","typeeduname","typegradename", "sdatestr", "edatestr", "cname","completeno","studytime" + , "typemanname","typejobname","typeeduname","typegradename", "sdatestr", "edatestr", "zstring3", "cname","completeno","studytime" , "attrate", "exfpoint", "subjectpoint", "tpointstr", "isoffabsstr", "rsCount" ,"asname","addr","brno","eino","btype","bkind","ceoname","slevelName","uduty","mname","mphone" ,"payamt","isrebatename","rbankamt","rbank","rbankaccnum","rbankuser","taxemail","association" @@ -1439,11 +1439,11 @@ namespace NP.BO.Controllers vm.excellog.userip = GetUserIP(); } return ExportExcel( - new String[] {"순번" ,"사용자ID","이름","주민번호","교육생연락처","교육유형","교육구분","기술인분류","직무분야","전문분야","교육목적","등급","교육시작일","교육종료일", + new String[] {"순번" ,"사용자ID","이름","주민번호","교육생연락처","교육유형","교육구분","기술인분류","직무분야","전문분야","교육목적","등급","교육시작일","교육종료일","집체교육 출석일", "과정명","수료번호","주문번호","업체명","업체주소","사업자등록번호","고용보험관리번호","업태","종목", "대표자","학력","직위","업체담당자","업체담당당자 연락처","교육비","환급액","환급은행명","환급계좌" ,"환급계좌예금주","계산서이메일", "소속협회","교육상위분류","교육하위분류","교육장","교육이수시간","교육연도"}, - new String[] {"rno","userid","username", "userpnostr","mobile", "cshapename", "edukind", "typemanName", "typejobName", "zstring0", "typeeduName", "typegradeName", "sdateymd2","edateymd2", + new String[] {"rno","userid","username", "userpnostr","mobile", "cshapename", "edukind", "typemanName", "typejobName", "zstring0", "typeeduName", "typegradeName", "sdateymd2","edateymd2","zstring3", "cname","completeno","payno","asname", "companyaddr", "brno", "eino", "btype", "bkind", "ceoname","slevelName","uduty","mname","mphone","payamt","rbankamt","rbank","rbankaccnum","rbankuser","taxemail", "association","pcgname", "cgname", "studyplaceName","studytime","tyear"}, diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index 1db840d..c23306f 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -1702,7 +1702,7 @@ ,t.tyear ,cg.cgname,cg.pcgno ,pcg.cgname as pcgname - ,u.userno,u.userid,u.username,u.uduty,u.slevel + ,u.userno,u.userid,u.username,u.uduty,u.slevel, date_format(li.stime, '%Y-%m-%d') zstring3 ,CAST(AES_DECRYPT(UNHEX(u.userpno), ) AS char) as userpno ,CAST(AES_DECRYPT(UNHEX(u.mobile), ) AS char) as mobile ,CAST(AES_DECRYPT(UNHEX(u.email), ) AS char) as email @@ -1727,6 +1727,7 @@ left outer join pplog pp on pp.pplno = p.pplno left outer join cminningscd cmi on cmi.cmisno = l.cmisno left outer join comcode cc on pp.typejobitem = cc.ccode + left outer join lectinning li on li.lectno = l.lectno and cmi.cmino = li.cmino where l.iscomplete = 1 l.lectno = #lectno# l.completetime >= #scompletetime#