KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit is contained in:
kdh0120 2021-07-12 01:39:26 +00:00
parent 4fa01c23b7
commit aee9c0e37e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BO/Controllers/croomController.cs
View File

@ -1006,13 +1006,13 @@ namespace NP.BO.Controllers
vm.DocumentList = Dao.Get<Document>("cr.documnetspasts", ht); vm.DocumentList = Dao.Get<Document>("cr.documnetspasts", ht);
return ExportExcel( return ExportExcel(
new String[] {"순번","사용자ID","이름","주민번호","교육생연락처","교육유형","교육구분","기술인분류","직무분야","교육목적","등급","교육시작일","교육종료일", new String[] {"순번","사용자ID","이름","주민번호","교육생연락처","교육유형","교육구분","기술인분류","직무분야","교육목적","등급","교육시작일","교육종료일",
"과정명","수료번호","주문번호","업체명","업체주소","사업자등록번호","고용보험관리번호","업태","종목","구분", "과정명","수료번호","주문번호","업체명","업체주소","사업자등록번호","고용보험관리번호","업태","종목",
"대표자","학력","직위","업체담당자","업체담당당자 연락처","교육비","환급액","환급은행명","환급계좌" ,"환급계좌예금주","계산서이메일", "대표자","학력","직위","업체담당자","업체담당당자 연락처","교육비","환급액","환급은행명","환급계좌" ,"환급계좌예금주","계산서이메일",
"소속협회","과정분류","교육이수시간","교육연도"}, "소속협회","교육상위분류","교육하위분류","교육장","교육이수시간","교육연도"},
new String[] {"rno","userid", "username", "userpnostr","phone", "cshape", "edukind", "typeman", "typejob", "typeedu", "typegrade", "ssdateymd2","sedateymd2", 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", "ceoname","slevel","uduty","mname","mphone","sprice","rprice","rbank","rbankno","rbankuser","taxemail",
"assign", "cg","sctime","syear"}, "assign","userid","userid","userid","sctime","syear"},
vm.DocumentList, 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"); "증빙서류출력(과거)",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");
} }

4
Dao/MyBatis/Maps/Pay.xml
View File

@ -838,7 +838,7 @@
,#rreason#,#fgnor#,#fgnob#,#ramt#,<include refid="sql.inv"></include> ,#rreason#,#fgnor#,#fgnob#,#ramt#,<include refid="sql.inv"></include>
from pay a 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 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)) &gt; 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 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 &gt; now() left outer join exam c3 on b.ptype=3 and c3.exno=b.itemno and c3.retime &gt; now()
where a.payno=#payno# and a.userno=#uno# and a.pstatus=1 and a.rstatus &lt; 2 and (b.ptype=2 or c0.cmno is not null or c3.exno is not null); where a.payno=#payno# and a.userno=#uno# and a.pstatus=1 and a.rstatus &lt; 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,<include refid="sql.inv"></include> select #rfdno#,b.pino,<include refid="sql.inv"></include>
from pay a 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 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)) &gt; 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 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 &gt; now() left outer join exam c3 on b.ptype=3 and c3.exno=b.itemno and c3.retime &gt; now()
where a.payno=#payno# and a.userno=#uno# and a.pstatus=1 and a.rstatus &lt; 2 and (b.ptype=2 or c0.cmno is not null or c3.exno is not null) where a.payno=#payno# and a.userno=#uno# and a.pstatus=1 and a.rstatus &lt; 2 and (b.ptype=2 or c0.cmno is not null or c3.exno is not null)