<추가사항>

1. 관리자 > 교육운영 > 기본정보 탭

 1) 결제정보에 계산서 확인 여부 표기

 2) 입금계좌 칸 위치 및 크기 변경

 3) 진도율 표기 추가

# 커밋 파일
BO\Views\croom\payview.cshtml
Dao\MyBatis\Maps\CRoom.xml
Model\Pay.cs

# 테스트 결과
- 이상없음

# 특이사항 및 이슈사항
- 이상없음
This commit is contained in:
swpark 2021-12-14 06:01:50 +00:00
parent 29f9508660
commit 3fd1a0816a
3 changed files with 27 additions and 2 deletions

View File

@ -156,9 +156,17 @@
}
</td>
<th>
입금계좌
계산서확인
</th>
<td>
<span>@p.ischeckname</span>
</td>
</tr>
<tr>
<th>
입금계좌
</th>
<td colspan="5">
@p.vactbankname | @p.vactnum | @p.vactname
</td>
</tr>
@ -167,11 +175,12 @@
<section class="panel panel-default">
<header class="panel-heading"><strong><i class="fa fa-bars"></i> 상품내역<span class=""></span></strong></header>
<table class="regtable" style="margin-top: 0;">
<thead><tr><th>상품코드</th><th>상품유형</th><th>과정분류</th><th>상품명</th><th>판매가</th><th>수량</th><th>합계금액</th></tr></thead>
<thead><tr><th>상품코드</th><th>진도율</th><<th>상품유형</th><th>과정분류</th><th>상품명</th><th>판매가</th><th>수량</th><th>합계금액</th></tr></thead>
@foreach (var d in pi)
{
<tr>
<td>@d.itemno</td>
<td>@d.attrate %</td>
<td>@(d.ptype == 2 ? "교재" : d.ptype == 3 ? "시험" : d.pcgname)</td>
<td>@d.cgname</td>
<td class="left">@d.itemname</td>

View File

@ -928,6 +928,7 @@
,CAST(AES_DECRYPT(UNHEX(pd.mobile), <include refid="sql.digest"></include>) AS char) mobile2
,tax.iscancel, tax.taxdate, tax.taxno
,paydata.vactbankname,CAST(AES_DECRYPT(UNHEX(paydata.vactnum), <include refid="sql.digest"></include>) AS char) vactnum,paydata.vactname
,(select ischeck from paytax where payno = p.payno limit 1) ischeck
from pay p
inner join users u on u.userno=p.userno
left outer join payitem pi on pi.payno=p.payno and pi.ptype in (3,4)
@ -956,6 +957,7 @@
,cm.cshape
,cg.cgname
,pcg.cgname pcgname
,(select attrate from lect where payno = pi.payno limit 1) attrate
,pi.rbank , CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) rbankaccnum, pi.tbankuser
from payitem pi
inner join pay p on p.payno=pi.payno

View File

@ -39,6 +39,16 @@ namespace NP.Model
return ptype == 1 ? "신용카드" : ptype == 2 ? "계좌이체" : ptype == 3 ? "가상계좌" : ptype == 4 ? "현금" : ptype == 5 ? "복합" : ptype == 6 ? "무료" : ptype == 9 ? "위탁" : "-";
}
}
public Int32 ischeck { get; set; }
public String ischeckname
{
get
{
return ischeck == 1 ? "확인" : "미확인";
}
}
public int piptype { get; set; }
public String itemname { get; set; }
public int cshape { get; set; }
@ -614,7 +624,11 @@ namespace NP.Model
return iscomplete == null ? "미수료" : iscomplete == 0 ? "미수료" : "수료";
}
}
/// <summary>
/// 진도율
/// </summary>
public int attrate { get; set; }
public String userpno { get; set; }
}