<기능개선>
1. PMS NO : 7869 2. (주요)작업내용 (1) BO/Controllers/croomController.cs - 엑셀에 "집체교육 출석일"항목 추가 (2) Dao/MyBatis/Maps/CRoom.xml - "집체교육 출석일" 추가 쿼리 수정
This commit is contained in:
jity7777
parent
69572d81d4
commit
40af01d993
|
|
@ -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"},
|
||||
|
|
|
|||
|
|
@ -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), <include refid="sql.digest"></include>) AS char) as userpno
|
||||
,CAST(AES_DECRYPT(UNHEX(u.mobile), <include refid="sql.digest"></include>) AS char) as mobile
|
||||
,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) 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
|
||||
<isNotNull property="lectno" prepend="and">l.lectno = #lectno#</isNotNull>
|
||||
<isNotNull property="scompletetime" prepend="and">l.completetime >= #scompletetime#</isNotNull>
|
||||
|
|
|
|||
Loading…
Reference in New Issue