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

<기능개선> 

1. PMS NO : 7019
2. (주요)작업내용 
(1)BO/Controllers/croomController.cs
 - 항목 추가
(2) Dao/MyBatis/Maps/CRoom.xml
 - 추가된 항목 쿼리 수정
This commit is contained in:
jity7777 2022-12-05 01:54:45 +00:00
parent 0bf3dbff83
commit c1a053e651
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BO/Controllers/croomController.cs
View File

@ -1350,11 +1350,11 @@ namespace NP.BO.Controllers
vm.excellog.userip = GetUserIP(); vm.excellog.userip = GetUserIP();
} }
return ExportExcel( 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", "cname","completeno","payno","asname", "companyaddr", "brno", "eino", "btype", "bkind",
"ceoname","slevelName","uduty","mname","mphone","payamt","rbankamt","rbank","rbankaccnum","rbankuser","taxemail", "ceoname","slevelName","uduty","mname","mphone","payamt","rbankamt","rbank","rbankaccnum","rbankuser","taxemail",
"association","pcgname", "cgname", "studyplaceName","studytime","tyear"}, "association","pcgname", "cgname", "studyplaceName","studytime","tyear"},

4
BO/Web.config
View File

@ -55,8 +55,8 @@
<!--<add key="talk" value="https://alimtalk-api.bizmsg.kr/v2/sender/send,?,?,?,?,?,023103312" />--> <!--<add key="talk" value="https://alimtalk-api.bizmsg.kr/v2/sender/send,?,?,?,?,?,023103312" />-->
<!--<add key="configpath" value="Product" />--> <!--<add key="configpath" value="Product" />-->
<!--<add key="configpath" value="ProductDev" />--> <add key="configpath" value="ProductDev" />
<add key="configpath" value="staging" /> <!--<add key="configpath" value="staging" />-->
<add key="lgdacomConfigPath" value="D:\3rdparti\lgdacomyicte" /> <add key="lgdacomConfigPath" value="D:\3rdparti\lgdacomyicte" />

35
Dao/MyBatis/Maps/CRoom.xml
View File

@ -1624,24 +1624,25 @@
,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) as rbankaccnum ,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) as rbankaccnum
,p.payamt,p.payoktime ,p.payamt,p.payoktime
,case when ifnull(cmi.estart,now()) &lt; '2021-08-15' then p.payoktime else p.cdt end paycdt ,case when ifnull(cmi.estart,now()) &lt; '2021-08-15' then p.payoktime else p.cdt end paycdt
,pp.pplno,pp.typeman,pp.typeedu,pp.typegrade,pp.typejob, pp.typejobitem ,pp.pplno,pp.typeman,pp.typeedu,pp.typegrade,pp.typejob, pp.typejobitem , cc.cname as zstring0 <!-- 우측으로 변경시 입력에러 ifnull(pp.typejobitem,'') as typejobitem, ifnull( 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 ,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), <include refid="sql.digest"></include>) AS char) as mphone ,CAST(AES_DECRYPT(UNHEX(pp.mphone), <include refid="sql.digest"></include>) AS char) as mphone
,CAST(AES_DECRYPT(UNHEX(pp.taxemail), <include refid="sql.digest"></include>) AS char) as taxemail ,CAST(AES_DECRYPT(UNHEX(pp.taxemail), <include refid="sql.digest"></include>) AS char) as taxemail
,row_number() over(order by l.lectno desc) rno ,row_number() over(order by l.lectno desc) rno
,count(l.lectno) over() pagetotalcount ,count(l.lectno) over() pagetotalcount
from lect l from lect l
left outer join cm cm on cm.cmno = l.cmno left outer join cm cm on cm.cmno = l.cmno
left outer join term t on t.tmno=cm.tmno left outer join term t on t.tmno=cm.tmno
left outer join cg cg on cg.cgno = cm.cgno left outer join cg cg on cg.cgno = cm.cgno
left outer join cg pcg on pcg.cgno = cg.pcgno left outer join cg pcg on pcg.cgno = cg.pcgno
left outer join users u on u.userno = l.userno left outer join users u on u.userno = l.userno
left outer join pay p on p.payno = l.payno left outer join pay p on p.payno = l.payno
left outer join payitem pi on pi.payno = p.payno left outer join payitem pi on pi.payno = p.payno
left outer join pplog pp on pp.pplno = p.pplno left outer join pplog pp on pp.pplno = p.pplno
left outer join cminningscd cmi on cmi.cmisno = l.cmisno left outer join cminningscd cmi on cmi.cmisno = l.cmisno
where l.iscomplete = 1 left outer join comcode cc on pp.typejobitem = cc.ccode
<isNotNull property="lectno" prepend="and">l.lectno = #lectno#</isNotNull> where l.iscomplete = 1
<isNotNull property="lectno" prepend="and">l.lectno = #lectno#</isNotNull>
<isNotNull property="scompletetime" prepend="and">l.completetime &gt;= #scompletetime#</isNotNull> <isNotNull property="scompletetime" prepend="and">l.completetime &gt;= #scompletetime#</isNotNull>
<isNotNull property="ecompletetime" prepend="and">l.completetime &lt;= #ecompletetime#</isNotNull> <isNotNull property="ecompletetime" prepend="and">l.completetime &lt;= #ecompletetime#</isNotNull>
<isNotNull property="tyear" prepend="and">t.tyear=#tyear#</isNotNull> <isNotNull property="tyear" prepend="and">t.tyear=#tyear#</isNotNull>