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

교육운영>수료관리 : 

"주문번호 추가
1. 수정화면 수료번호/교육연도 아래에 주문번호 출력
2. 검색단어에 주문번호 추가
3. 다운로드 엑셀 양식에 있는 주문번호(P열) 에 값 입력"
This commit is contained in:
lch 2021-07-13 09:15:10 +00:00
parent 164c4cd001
commit e510464a80
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BO/Controllers/croomController.cs
View File

@ -1080,7 +1080,7 @@ namespace NP.BO.Controllers
"대표자","학력","직위","업체담당자","업체담당당자 연락처","교육비","환급액","환급은행명","환급계좌" ,"환급계좌예금주","계산서이메일",
"소속협회","교육상위분류","교육하위분류","교육장","교육이수시간","교육연도"},
new String[] {"rno","userid","username", "userpnostr","mobile", "cshapename", "edukind", "typemanName", "typejobName", "typeeduName", "typegradeName", "sdateymd2","edateymd2",
"cname","completeno","paynostr","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",
"association","pcgname", "cgname", "studyplaceName","studytime","tyear"},
vm.Completions,

6
BO/Views/croom/completions.cshtml
View File

@ -81,7 +81,7 @@
<th>검색단어</th>
<td>
<div class="col-md-4">
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "userid:ID;username:이름;userpno:주민등록번호;completeno:수료번호;asname:업체명;brno:사업자등록번호" }, { "name", "searchtype" }, { "selected", Model.searchtype }, { "style", "width: 100%" }, { "df", ":-유형선택" } })
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "userid:ID;username:이름;userpno:주민등록번호;completeno:수료번호;asname:업체명;brno:사업자등록번호;payno:주문번호" }, { "name", "searchtype" }, { "selected", Model.searchtype }, { "style", "width: 100%" }, { "df", ":-유형선택" } })
</div>
<div class="col-md-8">
@ -198,6 +198,10 @@
<th>교육연도</th>
<td id="completion_tyear"></td>
</tr>
<tr>
<th>주문번호</th>
<td id="completion_payno" colspan="3"></td>
</tr>
</table>
<h5>ㆍ사용자정보</h5>
<table class="regtable">

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

@ -1527,7 +1527,7 @@
select a.*
from (
select
l.lectno,l.iscomplete,l.completetime,l.completeno,l.cmisno,l.sdate,l.edate,l.cmno
l.lectno,l.iscomplete,l.completetime,l.completeno,l.cmisno,l.sdate,l.edate,l.cmno,l.payno
,l.cdt,l.cno,pp.udt,l.uno,l.uip
,cm.cgno,cm.studytime,cm.cshape,cm.cname,cm.studyplace
,cmi.estart
@ -1545,7 +1545,6 @@
,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.taxemail), <include refid="sql.digest"></include>) AS char) as taxemail
,case when p.ispg = 1 then p.payno else 0 end
,row_number() over(order by l.lectno desc) rno
,count(l.lectno) over() pagetotalcount
from lect l
@ -1582,6 +1581,7 @@
<isEqual property="searchtype" compareValue="completeno" prepend="and"> l.completeno like concat('%',#searchtext#,'%')</isEqual>
<isEqual property="searchtype" compareValue="asname" prepend="and"> pp.asname like concat('%',#searchtext#,'%')</isEqual>
<isEqual property="searchtype" compareValue="brno" prepend="and"> pp.brno like concat('%',#searchtext#,'%')</isEqual>
<isEqual property="searchtype" compareValue="payno" prepend="and"> l.payno = #searchtext#</isEqual>
</isNotNull>
</isNotNull>
) a

7
Model/CM.cs
View File

@ -3853,13 +3853,6 @@ namespace NP.Model
/// </summary>
public Int64 pplno { get; set; }
public Int64 payno { get; set; }
public String paynostr
{
get
{
return payno > 0 ? "pr" + payno : null;
}
}
/// <summary>
/// 결제일 : pay.payoktime
/// </summary>