From c1a053e65115c48c1785ec1ea8a0e94e853422b4 Mon Sep 17 00:00:00 2001 From: jity7777 Date: Mon, 5 Dec 2022 01:54:45 +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:=207019=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)BO/Controllers/croomController?= =?UTF-8?q?.cs=20=20-=20=ED=95=AD=EB=AA=A9=20=EC=B6=94=EA=B0=80=20(2)=20Da?= =?UTF-8?q?o/MyBatis/Maps/CRoom.xml=20=20-=20=EC=B6=94=EA=B0=80=EB=90=9C?= =?UTF-8?q?=20=ED=95=AD=EB=AA=A9=20=EC=BF=BC=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 | 4 ++-- BO/Web.config | 4 ++-- Dao/MyBatis/Maps/CRoom.xml | 37 ++++++++++++++++--------------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index b313b12..312e92f 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -1350,11 +1350,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", "typeeduName", "typegradeName", "sdateymd2","edateymd2", + new String[] {"rno","userid","username", "userpnostr","mobile", "cshapename", "edukind", "typemanName", "typejobName", "zstring0", "typeeduName", "typegradeName", "sdateymd2","edateymd2", "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/BO/Web.config b/BO/Web.config index 4eec37f..9b979cd 100644 --- a/BO/Web.config +++ b/BO/Web.config @@ -55,8 +55,8 @@ - - + + diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index e26d7cb..2414b15 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -1624,24 +1624,25 @@ ,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), ) AS char) as rbankaccnum ,p.payamt,p.payoktime ,case when ifnull(cmi.estart,now()) < '2021-08-15' then p.payoktime else p.cdt end paycdt - ,pp.pplno,pp.typeman,pp.typeedu,pp.typegrade,pp.typejob, pp.typejobitem - ,pp.asname,pp.post,pp.address1,pp.address2,pp.brno,pp.eino,pp.btype,pp.bkind,pp.ceoname,pp.mname,pp.association - ,CAST(AES_DECRYPT(UNHEX(pp.mphone), ) AS char) as mphone - ,CAST(AES_DECRYPT(UNHEX(pp.taxemail), ) AS char) as taxemail - ,row_number() over(order by l.lectno desc) rno - ,count(l.lectno) over() pagetotalcount - from lect l - left outer join cm cm on cm.cmno = l.cmno - left outer join term t on t.tmno=cm.tmno - left outer join cg cg on cg.cgno = cm.cgno - left outer join cg pcg on pcg.cgno = cg.pcgno - left outer join users u on u.userno = l.userno - left outer join pay p on p.payno = l.payno - left outer join payitem pi on pi.payno = p.payno - left outer join pplog pp on pp.pplno = p.pplno - left outer join cminningscd cmi on cmi.cmisno = l.cmisno - where l.iscomplete = 1 - l.lectno = #lectno# + ,pp.pplno,pp.typeman,pp.typeedu,pp.typegrade,pp.typejob, pp.typejobitem , cc.cname as zstring0 + ,pp.asname,pp.post,pp.address1,pp.address2,pp.brno,pp.eino,pp.btype,pp.bkind,pp.ceoname,pp.mname,pp.association + ,CAST(AES_DECRYPT(UNHEX(pp.mphone), ) AS char) as mphone + ,CAST(AES_DECRYPT(UNHEX(pp.taxemail), ) AS char) as taxemail + ,row_number() over(order by l.lectno desc) rno + ,count(l.lectno) over() pagetotalcount + from lect l + left outer join cm cm on cm.cmno = l.cmno + left outer join term t on t.tmno=cm.tmno + left outer join cg cg on cg.cgno = cm.cgno + left outer join cg pcg on pcg.cgno = cg.pcgno + left outer join users u on u.userno = l.userno + left outer join pay p on p.payno = l.payno + left outer join payitem pi on pi.payno = p.payno + 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 + where l.iscomplete = 1 + l.lectno = #lectno# l.completetime >= #scompletetime# l.completetime <= #ecompletetime# t.tyear=#tyear#