From aee9c0e37e30cd2841b46dbb0a873d7be5ecdbe3 Mon Sep 17 00:00:00 2001 From: kdh0120 Date: Mon, 12 Jul 2021 01:39:26 +0000 Subject: [PATCH] --- BO/Controllers/croomController.cs | 8 ++++---- Dao/MyBatis/Maps/Pay.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index b793792..b240c3d 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -1006,13 +1006,13 @@ namespace NP.BO.Controllers vm.DocumentList = Dao.Get("cr.documnetspasts", ht); return ExportExcel( new String[] {"순번","사용자ID","이름","주민번호","교육생연락처","교육유형","교육구분","기술인분류","직무분야","교육목적","등급","교육시작일","교육종료일", - "과정명","수료번호","주문번호","업체명","업체주소","사업자등록번호","고용보험관리번호","업태","종목","구분", + "과정명","수료번호","주문번호","업체명","업체주소","사업자등록번호","고용보험관리번호","업태","종목", "대표자","학력","직위","업체담당자","업체담당당자 연락처","교육비","환급액","환급은행명","환급계좌" ,"환급계좌예금주","계산서이메일", - "소속협회","과정분류","교육이수시간","교육연도"}, + "소속협회","교육상위분류","교육하위분류","교육장","교육이수시간","교육연도"}, new String[] {"rno","userid", "username", "userpnostr","phone", "cshape", "edukind", "typeman", "typejob", "typeedu", "typegrade", "ssdateymd2","sedateymd2", - "cgname", "completeno","paynostr", "companyname", "companyaddr", "brno", "eino", "btype", "bkind", "kind", + "cgname", "completeno","paynostr", "companyname", "companyaddr", "brno", "eino", "btype", "bkind", "ceoname","slevel","uduty","mname","mphone","sprice","rprice","rbank","rbankno","rbankuser","taxemail", - "assign", "cg","sctime","syear"}, + "assign","userid","userid","userid","sctime","syear"}, vm.DocumentList, "증빙서류출력(과거)",null,",0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38"); } diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml index 7283276..e1837ec 100644 --- a/Dao/MyBatis/Maps/Pay.xml +++ b/Dao/MyBatis/Maps/Pay.xml @@ -838,7 +838,7 @@ ,#rreason#,#fgnor#,#fgnob#,#ramt#, from pay a inner join payitem b on b.payno=a.payno and b.pino in ($pinos$) and a.pstatus=1 and a.rstatus=0 - left outer join cm c0 on b.ptype in (0,4) and c0.cmno=b.itemno and ifnull(c0.retime,date_add(now(), interval 1 day)) > now() + left outer join cm c0 on b.ptype in (0,4) and c0.cmno=b.itemno left outer join book c2 on b.ptype=2 and c2.bkno=b.itemno left outer join exam c3 on b.ptype=3 and c3.exno=b.itemno and c3.retime > now() where a.payno=#payno# and a.userno=#uno# and a.pstatus=1 and a.rstatus < 2 and (b.ptype=2 or c0.cmno is not null or c3.exno is not null); @@ -849,7 +849,7 @@ select #rfdno#,b.pino, from pay a inner join payitem b on b.payno=a.payno and b.pino in ($pinos$) and a.pstatus=1 and a.rstatus=0 - left outer join cm c0 on b.ptype in (0,4) and c0.cmno=b.itemno and ifnull(c0.retime,date_add(now(), interval 1 day)) > now() + left outer join cm c0 on b.ptype in (0,4) and c0.cmno=b.itemno left outer join book c2 on b.ptype=2 and c2.bkno=b.itemno left outer join exam c3 on b.ptype=3 and c3.exno=b.itemno and c3.retime > now() where a.payno=#payno# and a.userno=#uno# and a.pstatus=1 and a.rstatus < 2 and (b.ptype=2 or c0.cmno is not null or c3.exno is not null)