diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index 60b1ffb..a1e0992 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -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,
diff --git a/BO/Views/croom/completions.cshtml b/BO/Views/croom/completions.cshtml
index 171d247..13fe993 100644
--- a/BO/Views/croom/completions.cshtml
+++ b/BO/Views/croom/completions.cshtml
@@ -81,7 +81,7 @@
검색단어 |
- @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", ":-유형선택" } })
@@ -198,6 +198,10 @@
교육연도 |
|
+
+ | 주문번호 |
+ |
+
ㆍ사용자정보
diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index 3d14241..00c5819 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -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
@@ -1544,8 +1544,7 @@
,pp.pplno,pp.typeman,pp.typeedu,pp.typegrade,pp.typejob
,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), ) AS char) as mphone
- ,CAST(AES_DECRYPT(UNHEX(pp.taxemail), ) AS char) as taxemail
- ,case when p.ispg = 1 then p.payno else 0 end
+ ,CAST(AES_DECRYPT(UNHEX(pp.taxemail), ) AS char) as taxemail
,row_number() over(order by l.lectno desc) rno
,count(l.lectno) over() pagetotalcount
from lect l
@@ -1582,6 +1581,7 @@
l.completeno like concat('%',#searchtext#,'%')
pp.asname like concat('%',#searchtext#,'%')
pp.brno like concat('%',#searchtext#,'%')
+ l.payno = #searchtext#
) a
diff --git a/Model/CM.cs b/Model/CM.cs
index 3828083..10e597e 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -3853,13 +3853,6 @@ namespace NP.Model
///
public Int64 pplno { get; set; }
public Int64 payno { get; set; }
- public String paynostr
- {
- get
- {
- return payno > 0 ? "pr" + payno : null;
- }
- }
///
/// 결제일 : pay.payoktime
///
|