<요청사항>

2021.11.22 박상완 (swpark@nptc.kr) 

1. 검색창에 항목 추가 : 핸드폰
2. 검색결과 표에서 이름과 아이디 분리 표기
3. 검색결과 표에서 아이디 옆에 핸드폰 표기
4. 엑셀에 핸드폰 번호 추가 : 아이디 오른쪽으로

# 커밋 파일
BO\Controllers\croomController.cs
BO\Views\croom\pay.cshtml
Dao\MyBatis\Maps\CRoom.xml
Model\VMBase.cs


# 테스트 결과 
- 이상없음

# 특이사항 및 이슈사항
- 이상없음

BO/Controllers/croomController.cs

@@ -787,10 +787,24 @@ namespace NP.BO.Controllers
             {
                 ht.Add(vm.stringval15 ?? "usernameiditemname", vm.stringval16);
             }
-            ht.Add("isgroup", vm.stringval17); 
+            ht.Add("isgroup", vm.stringval17);
             ht.Add("estart", vm.stringval20);
             ht.Add("eend", string.IsNullOrEmpty(vm.stringval21) ? null : (vm.stringval21 + " 23:59:59"));
             ht.Add("studyplace", vm.stringval22);
+            ht.Add("mobile", vm.stringval23);
+            if (!string.IsNullOrEmpty(vm.stringval23))
+            {
+                var mobile_temp = vm.stringval23.Replace("-", "");
+                if (mobile_temp.Length == 10)
+                {
+                    vm.stringval23 = mobile_temp.Substring(0, 3) + "-" + mobile_temp.Substring(3, 3) + "-" + mobile_temp.Substring(6);
+                }
+                else if (mobile_temp.Length == 11)
+                {
+                    vm.stringval23 = mobile_temp.Substring(0, 3) + "-" + mobile_temp.Substring(3, 4) + "-" + mobile_temp.Substring(7);
+                }
+                ht["mobile"] = vm.stringval23;
+            }
             vm.PayItems = Dao.Get<PayItem>("cr.payitems", ht);
             vm.pagetotalcount = GetCount(vm.PayItems.FirstOrDefault());
             vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "istop", 1 }, { "isdel", 0 }, { "isuse", 1 } });
@@ -807,8 +821,8 @@ 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" },
+                        new String[] { "payno", "username", "userid", "mobile", "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);
             }

BO/Views/croom/pay.cshtml

@@ -104,6 +104,13 @@
                             <td class="text-left">
                                 @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" }))
+                                
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>핸드폰</th>
+                            <td class="text-left">
+                                @Html.Partial("./Partial/Text", Model.stringval23, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval23", Value = Model.stringval23, PH = "", CssClass = "esitem" }))
                                 @Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search", OnClick = "searchthis()" })
                             </td>
                         </tr>
@@ -124,7 +131,9 @@
                     <tr>
                         <th><input type="checkbox" onclick="javascript: checkall('excel1', this);" /></th>
                         <th width="100">결제번호</th>
-                        <th width="200">신청자(ID)<br />회사명</th>
+                        <th width="200">신청자<br />회사명</th>
+                        <th>ID</th>
+                        <th>핸드폰</th>
                         <th>상품명</th>
                         <th>수강일</th>
                         <th>결제금액<br />(결제방법)</th>
@@ -140,7 +149,9 @@
                         <tr>
                             <td><input type="checkbox" class="autocheck" value="@d.userno" data-userno="@d.userno" /></td>
                             <td>@d.payno</td>
-                            <td>@string.Format("{0}({1}){2}", d.username, d.userid, d.isgroup == 1 && d.ccount > 1 ? string.Format(" 외 {0}명", d.ccount - 1) : "")<br />@*<span class="isjoin@(d.isjoin)">@(d.isjoin == 1 ? "정" : "비")</span>]*@@(d.asname ?? "-")</td>
+                            <td>@string.Format("{0} {1}", d.username, d.isgroup == 1 && d.ccount > 1 ? string.Format(" 외 {0}명", d.ccount - 1) : "")<br />@*<span class="isjoin@(d.isjoin)">@(d.isjoin == 1 ? "정" : "비")</span>]*@@(d.asname ?? "-")</td>
+                            <td>@d.userid</td>
+                            <td>@d.mobile</td>
                             <td class="link">
                                 <a href="#" onclick="gopay(@d.isexamready, @d.payno, @d.userno)">
                                     @*<span class="piptype piptype@(d.ptype)">@d.ptypename</span>*@

Dao/MyBatis/Maps/CRoom.xml

@@ -794,24 +794,25 @@
             update lectsdboardcmt set <include refid="sql.up"></include>,isdel=1 where bcno=#bcno# <isGreaterThan property="cno" compareValue="0">and cno=#cno#</isGreaterThan>
         </update>
         <select id="cr.payitems" parameterClass="hashtable" resultClass="payitem">
-            select a.*
+			select a.*
-            from (
+			from (
-            select a.isexamready,a.ccount
+			select a.isexamready,a.ccount
-            ,case when a.isexamready=1 then ue.exno else p.payno end payno
+			,case when a.isexamready=1 then ue.exno else p.payno end payno
-            ,case when a.isexamready=1 then 0 else p.ptype end pptype,p.payoktime,p.isgroup
+			,case when a.isexamready=1 then 0 else p.ptype end pptype,p.payoktime,p.isgroup
-            ,case when a.isexamready=1 then case when ua.isjoin=1 then uee.infee else uee.outfee end else p.payamt end payamt,p.refundamt,p.rstatus
+			,case when a.isexamready=1 then case when ua.isjoin=1 then uee.infee else uee.outfee end else p.payamt end payamt,p.refundamt,p.rstatus
-            ,case when a.isexamready=1 then 21 else p.pstatus end pstatus
+			,case when a.isexamready=1 then 21 else p.pstatus end pstatus
-            ,case when a.isexamready=1 then ue.cdt else case pi.ptype when 3 then exu.cdt when 4 then le.oktime else p.cdt end end cdt
+			,case when a.isexamready=1 then ue.cdt else case pi.ptype when 3 then exu.cdt when 4 then le.oktime else p.cdt end end cdt
-            ,case when a.isexamready=1 then ue.exno else pi.pino end pino,pi.isrebate
+			,case when a.isexamready=1 then ue.exno else pi.pino end pino,pi.isrebate
-            ,case when a.isexamready=1 then 3 else pi.ptype end ptype
+			,case when a.isexamready=1 then 3 else pi.ptype end ptype
-            ,case when a.isexamready=1 then 0 else p.isunpay end isunpay
+			,case when a.isexamready=1 then 0 else p.isunpay end isunpay
-            ,case when p.rstatus=0 and pr.rstatus = 0 and pri.rfdno is not null then 1 else 0 end isrefundcall
+			,case when p.rstatus=0 and pr.rstatus = 0 and pri.rfdno is not null then 1 else 0 end isrefundcall
-            ,u.userno,u.userid,u.username
+			,u.userno,u.userid,u.username
-            ,ua.asname,ua.isjoin
+			,cast(AES_DECRYPT(UNHEX(u.mobile), 'np123@!' ) as char) as mobile
-            ,cm.cshape,cm.sstime,cm.setime,cm.studyplace
+			,ua.asname,ua.isjoin
-            ,le.sdate,le.edate,le.iscomplete
+			,cm.cshape,cm.sstime,cm.setime,cm.studyplace
-            ,case when a.isexamready=1 then uee.exname else case pi.ptype when 2 then bk.bkname when 3 then ex.exname else cm.cname end end itemname
+			,le.sdate,le.edate,le.iscomplete
-            ,ppl.rbankname,CAST(AES_DECRYPT(UNHEX(ppl.rbankacc), <include refid="sql.digest"></include>) AS char) rbankacc,ppl.rbankowner
+			,case when a.isexamready=1 then uee.exname else case pi.ptype when 2 then bk.bkname when 3 then ex.exname else cm.cname end end itemname
+			,ppl.rbankname,CAST(AES_DECRYPT(UNHEX(ppl.rbankacc), <include refid="sql.digest"></include>) AS char) rbankacc,ppl.rbankowner
             ,row_number() over(order by case when pr.rstatus=0 and pri.rfdno is not null then 0 else 1 end, case when a.isexamready=1 then ue.cdt else p.cdt end desc) rno
             ,count(p.payno) over() pagetotalcount
             ,scd.estart cmiestart, scd.eend cmieeend, scd.studyplace cmistudyplace
@@ -854,7 +855,8 @@
                 <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>  
+                <isNotNull property="payno">and p.payno=#payno#</isNotNull>
+			    <isNotNull property="mobile" prepend="and">cast(AES_DECRYPT(UNHEX(u.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')</isNotNull>
                 group by p.payno
                 union all
                 select 1 isexamready,a.exno payno,a.userno pi1,a.userno pi2,1 ccount
@@ -880,6 +882,7 @@
                 <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#,'%') or ua.asname like concat('%',#usernameiditemname#,'%'))</isNotNull>
                 <isNotNull property="isgroup">and a.exno=0</isNotNull>
+			    <isNotNull property="mobile" prepend="and">cast(AES_DECRYPT(UNHEX(u.mobile), 'np123@!' ) as char) like concat('%',#mobile#,'%')</isNotNull>
             ) a
             left outer join pay p on a.isexamready=0 and p.payno=a.payno
             left outer join payitem pi on a.isexamready=0 and pi.pino=case when a.pi1=0 then a.pi2 else a.pi1 end

Model/VMBase.cs

@@ -101,6 +101,8 @@ namespace NP.Model
         public String stringval21 { get; set; }
         public string stringval22 { get; set; }
 
+        public string stringval23 { get; set; }
+
         public String addstringval { get; set; }
         public String addstringval2 { get; set; }
         public String addstringval3 { get; set; }