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

<기능개선> 

통합테스트목록 - {524]
후순정리 - {227}
BO/Controllers/croomController.cs
BO/Views/croom/pay.cshtml
Dao/MyBatis/Maps/CRoom.xml - "cr.payitems"
엑셀 열 문구 변경
검색조건에 회사명 like 검색 추가
This commit is contained in:
kdh0120 2021-11-09 23:50:43 +00:00
parent 1f73d15513
commit 0812f592a2
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BO/Controllers/croomController.cs
View File

@ -748,7 +748,6 @@ namespace NP.BO.Controllers
ht.Add("ptypein", vm.stringval7);
ht.Add("isjoin", vm.stringval8);
ht.Add("asname", vm.stringval9);
ht.Add("brno", string.IsNullOrEmpty(vm.stringval10) ? null : vm.stringval10.Replace("-", ""));
ht.Add("piptype", vm.stringval11);
ht.Add("cshape", vm.stringval12);
@ -779,7 +778,7 @@ namespace NP.BO.Controllers
payItem.cmistudyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == payItem.cmistudyplace).FirstOrDefault()?.cname;
}
return ExportExcel(
new String[] { "결제번호", "신청자이름", "ID", "회사명", "상품유형", "환급여부", "상품명", "결제금액", "결제방법", "입금금액", "환불금액", "신청일", "입금일", "결제상태", "환급은행명", "환급계좌번호", "환급예금주", "교육장소", "강좌교육시작일", "강좌교육종료일", "신청교육장소", "교육신청일","등급","목적","수료여부" },
new String[] { "결제번호", "신청자이름", "ID", "회사명", "상품유형", "환급여부", "상품명", "결제금액", "결제방법", "입금금액", "환불금액", "신청일", "입금일", "결제상태", "환급은행명", "환급계좌번호", "환급예금주", "교육장소", "강좌교육시작일", "강좌교육종료일", "신청교육장소", "교육종료일","등급","목적","수료여부" },
new String[] { "payno", "username", "userid", "asname", "cshapename", "isrebatename", "itemname", "payamt", "pptypename", "payamt", "refundamt", "cdtymd", "payymd", "pstatusname2", "rbank", "rbankaccnum", "tbankuser", "studyplacename", "sdateymd", "edateymd", "cmistudyplacename", "cmiestartymd","tgname","tename", "completename" },
vm.PayItems,
"ProductSales_" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day);

2
BO/Views/croom/pay.cshtml
View File

@ -102,7 +102,7 @@
<tr>
<th>검색어</th>
<td class="text-left">
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":전체검색;username:이름;userid:ID;itemname:상품명;cname:교육과정명;payno:결제번호" }, { "name", "stringval15" }, { "selected", Model.stringval15 } })
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":전체검색;username:이름;userid:ID;itemname:상품명;cname:교육과정명;payno:결제번호;asname:회사명" }, { "name", "stringval15" }, { "selected", Model.stringval15 } })
@Html.Partial("./Partial/Text", Model.stringval16, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval16", Value = Model.stringval16, PH = "", CssClass = "ff" }))
@Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search", OnClick = "searchthis()" })
</td>

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

@ -437,11 +437,19 @@
from (
select 0 dtype
,null strval,0 intval10
,0 intval,0 intval2,0 intval3,0 intval4
,0 intval,0 intval2,0 intval3,0 intval4,0 intval5
,0 rno
,null time
from (select 1 col1) a
where a.col1=0
union all
select -1 dtype
,null strval,0 intval10
,0 intval,0 intval2,0 intval3,0 intval4,a.attrate intval5
,0 rno
,null time
from lect a
where a.lectno=#lectno# and a.userno=#userno#
<isNotNull property="exam">
union all
select b.extype dtype
@ -449,6 +457,7 @@
<!--,case when a2.sstime &lt; now() and a2.setime &gt; now() then a.attrate else -1 end intval,b.econdition intval2-->
,case when a.sdate &lt; now() and a.edate &gt; now() then a.attrate else -1 end intval,b.econdition intval2
,case when c.eend is null then 0 else 1 end intval3
,a.attrate intval5
,null intval4
,row_number() over (partition by b.extype order by b.extype, b.cdt) rno
,a.edate time
@ -466,6 +475,7 @@
,case when a.sdate &lt; now() and a.edate &gt; now() then a.attrate else -1 end intval,b.sdcondition intval2
,case when c.submittime is null then 0 else 1 end intval3
,case when c.checktime is null then 0 else 1 end intval4
,a.attrate intval5
,row_number() over (order by b.cdt) rno
,a.edate time
from lect a
@ -482,6 +492,7 @@
,case when a.sdate &lt; now() and a.edate &gt; now() then a.attrate else -1 end intval,b.sdcondition intval2
,case when count(d.bno) &gt; 0 then 1 else 0 end intval3
,case when c.checktime is null then 0 else 1 end intval4
,a.attrate intval5
,row_number() over (order by b.cdt) rno
,a.edate time
from lect a
@ -840,7 +851,7 @@
<isNotNull property="userid">and u.userid=#userid#</isNotNull>
<isNotNull property="itemname">and (cm.cname like concat('%',#itemname#,'%') or bk.bkname like concat('%',#itemname#,'%') or ex.exname like concat('%',#itemname#,'%'))</isNotNull>
<isNotNull property="cname">and (cm2.cname like concat('%',#cname#,'%'))</isNotNull>
<isNotNull property="usernameiditemname">and (u.username=#usernameiditemname# or u.userid=#usernameiditemname# or cm.cname like concat('%',#usernameiditemname#,'%') or bk.bkname like concat('%',#usernameiditemname#,'%') or ex.exname like concat('%',#usernameiditemname#,'%') or cm2.cname like concat('%',#usernameiditemname#,'%'))</isNotNull>
<isNotNull property="usernameiditemname">and (u.username=#usernameiditemname# or u.userid=#usernameiditemname# or cm.cname like concat('%',#usernameiditemname#,'%') or bk.bkname like concat('%',#usernameiditemname#,'%') or ex.exname like concat('%',#usernameiditemname#,'%') or cm2.cname like concat('%',#usernameiditemname#,'%') or ua.asname like concat('%',#usernameiditemname#,'%'))</isNotNull>
<isNotNull property="isgroup">and p.isgroup=1</isNotNull>
<isNotNull property="isunpay">and p.isunpay=#isunpay#</isNotNull>
<isNotNull property="payno">and p.payno=#payno#</isNotNull>
@ -867,7 +878,7 @@
<isNotNull property="pcgno">and a.exno=0</isNotNull>
<isNotNull property="username">and u.username=#username#</isNotNull>
<isNotNull property="userid">and u.userid=#userid#</isNotNull>
<isNotNull property="usernameiditemname">and (u.username=#usernameiditemname# or u.userid=#usernameiditemname# or ex.exname like concat('%',#usernameiditemname#,'%'))</isNotNull>
<isNotNull property="usernameiditemname">and (u.username=#usernameiditemname# or u.userid=#usernameiditemname# or ex.exname like concat('%',#usernameiditemname#,'%') or ua.asname like concat('%',#usernameiditemname#,'%'))</isNotNull>
<isNotNull property="isgroup">and a.exno=0</isNotNull>
) a
left outer join pay p on a.isexamready=0 and p.payno=a.payno
@ -961,7 +972,13 @@
left outer join exam ex on pi.ptype=3 and ex.exno=pi.itemno
left outer join examuser exu on exu.exno=ex.exno and exu.userno=p.userno
left outer join paydvr pd on pd.payno=p.payno
left outer join paytax tax on tax.payno = p.payno
left outer join (
select pt.payno,pt.iscancel,pt.taxdate,pt.taxno
from paytax pt
where pt.payno = #payno#
order by pt.cdt desc
limit 1
) tax on tax.payno = p.payno
left outer join paydata paydata on paydata.payno=p.payno
where p.payno=#payno#
</select>
@ -1572,7 +1589,7 @@
,pi.tbankuser as rbankuser,pi.rbank,pi.pino,pi.rbankamt
,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) as rbankaccnum
,p.payamt,p.payoktime
,case when ifnull(cmi.estart,<include refid="sql.digest"></include>) &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.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