From 3eeb9b13e6be85db3b29a1b176eba254ad5a299e Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Fri, 21 May 2021 01:59:15 +0000
Subject: [PATCH] =?UTF-8?q?=20-=20=EC=97=91=EC=85=80=EB=8B=A4=EC=9A=B4?=
 =?UTF-8?q?=EB=A1=9C=EB=93=9C=20=EC=8B=9C=20=ED=95=AD=EB=AA=A9=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20(=ED=99=98=EA=B8=89=EC=9D=80=ED=96=89=EB=AA=85,=20?=
 =?UTF-8?q?=ED=99=98=EA=B8=89=EA=B3=84=EC=A2=8C=EB=B2=88=ED=98=B8,=20?=
 =?UTF-8?q?=ED=99=98=EA=B8=89=EC=98=88=EA=B8=88=EC=A3=BC,=20=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=EC=9E=A5=EC=86=8C,=20=EA=B0=95=EC=A2=8C=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=EC=8B=9C=EC=9E=91=EC=9D=BC,=20=EA=B0=95=EC=A2=8C?=
 =?UTF-8?q?=EA=B5=90=EC=9C=A1=EC=A2=85=EB=A3=8C=EC=9D=BC)=20=20-=20?=
 =?UTF-8?q?=ED=99=98=EA=B8=89=EC=9D=80=ED=96=89=EB=AA=85,=20=ED=99=98?=
 =?UTF-8?q?=EA=B8=89=EA=B3=84=EC=A2=8C=EB=B2=88=ED=98=B8,=20=ED=99=98?=
 =?UTF-8?q?=EA=B8=89=EC=98=88=EA=B8=88=EC=A3=BC=20:=20=EA=B5=90=EC=9C=A1?=
 =?UTF-8?q?=20=EC=8B=A0=EC=B2=AD=20=EC=8B=9C=20=EA=B8=B0=EC=9E=85=ED=95=9C?=
 =?UTF-8?q?=20=ED=99=98=EA=B8=89=EC=A0=95=EB=B3=B4=20=20-=20=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=EC=9E=A5=EC=86=8C,=20=EA=B0=95=EC=A2=8C=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=EC=8B=9C=EC=9E=91=EC=9D=BC,=20=EA=B0=95=EC=A2=8C?=
 =?UTF-8?q?=EA=B5=90=EC=9C=A1=EC=A2=85=EB=A3=8C=EC=9D=BC=20:=20=EA=B0=95?=
 =?UTF-8?q?=EC=A2=8C=EC=97=90=20=EC=9E=85=EB=A0=A5=EB=90=9C=20=ED=95=99?=
 =?UTF-8?q?=EC=8A=B5=EC=9E=A5=EC=86=8C,=20=ED=95=99=EC=8A=B5=EA=B8=B0?=
 =?UTF-8?q?=EA=B0=84=20=EC=9E=85=EB=A0=A5=20=20-=20=EC=8B=A0=EC=B2=AD?=
 =?UTF-8?q?=EA=B5=90=EC=9C=A1=EC=9E=A5=EC=86=8C,=20=EA=B5=90=EC=9C=A1?=
 =?UTF-8?q?=EC=8B=A0=EC=B2=AD=EC=9D=BC=20:=20=ED=98=BC=ED=95=A9=EA=B0=95?=
 =?UTF-8?q?=EC=A2=8C=20=EC=8B=A0=EC=B2=AD=20=EC=8B=9C=20=EC=84=A0=ED=83=9D?=
 =?UTF-8?q?=ED=95=9C=20=EA=B5=90=EC=9C=A1=EC=9D=BC=20=EB=B0=8F=20=EA=B7=B8?=
 =?UTF-8?q?=EC=97=90=20=ED=95=B4=EB=8B=B9=ED=95=98=EB=8A=94=20=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=EC=9E=A5=EC=86=8C=20=EC=B6=9C=EB=A0=A5=20=20-=20?=
 =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B5=AC=EB=B6=84,=20=EC=83=81=ED=92=88?=
 =?UTF-8?q?=EA=B5=AC=EB=B6=84=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/Controllers/croomController.cs | 13 ++++--
 BO/Views/Shared/_Layout.cshtml    |  8 +++-
 BO/Views/croom/pay.cshtml         |  4 +-
 Dao/MyBatis/Maps/CRoom.xml        |  3 +-
 Model/Pay.cs                      | 77 +++++++++++++++++++++++++++++--
 5 files changed, 90 insertions(+), 15 deletions(-)

diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs
index e543c47..dcc1e86 100644
--- a/BO/Controllers/croomController.cs
+++ b/BO/Controllers/croomController.cs
@@ -679,13 +679,16 @@ namespace NP.BO.Controllers
                 DateTime.Now.AddMonths(-2).ToString("yyyy-MM-dd");
             if (vm.isexceldown == 1)
             {
+                foreach (var payItem in vm.PayItems)
+                {
+                    payItem.studyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == payItem.studyplace).FirstOrDefault()?.cname;
+                    payItem.cmistudyplacename = vm.ComCodes.Where(w => w.cgroup.ToString() == "studyplace" && w.ccode == payItem.cmistudyplace).FirstOrDefault()?.cname;
+                }
                 return ExportExcel(
-                        new String[] { "결제번호", "신청자이름", "ID", "회사명", "상품구분", "상품유형","환급여부", "상품명", /*"교육일정",*/ "결제금액", "결제방법", "입금금액", "환불금액", "신청일", "입금일", "결제상태"
-                            ,"환급은행명","환급계좌번호","환급예금주"},
-                        new String[] { "payno", "username", "userid", "asname", "ptypename","isrebatename", "itemname", /*"stimeymd",*/ "payamt", "pptypename", "payamt", "refundamt", "cdtymd", "payymd", "pstatusname2"
-                            ,"rbankname","rbankacc","rbankowner"},
+                        new String[] { "결제번호", "신청자이름", "ID", "회사명", "상품유형", "환급여부", "상품명", "결제금액", "결제방법", "입금금액", "환불금액", "신청일", "입금일", "결제상태", "환급은행명", "환급계좌번호", "환급예금주", "교육장소", "강좌교육시작일", "강좌교육종료일", "신청교육장소", "교육신청일 " },
+                        new String[] { "payno", "username", "userid", "asname", "cshapename", "isrebatename", "itemname", "payamt", "pptypename", "payamt", "refundamt", "cdtymd", "payymd", "pstatusname2", "rbankname", "rbankacc", "rbankowner", "studyplacename", "sdateymd", "edateymd", "cmistudyplacename", "cmiestartymd" },
                         vm.PayItems,
-                        "ProductSales_"+DateTime.Now.Year+DateTime.Now.Month+DateTime.Now.Day);
+                        "ProductSales_" + DateTime.Now.Year + DateTime.Now.Month + DateTime.Now.Day);
             }
             return View(vm);
         }
diff --git a/BO/Views/Shared/_Layout.cshtml b/BO/Views/Shared/_Layout.cshtml
index 2bf253b..272f1a5 100644
--- a/BO/Views/Shared/_Layout.cshtml
+++ b/BO/Views/Shared/_Layout.cshtml
@@ -29,7 +29,11 @@
     @RenderSection("scriptscdn", required: false)
     <script type="text/javascript">
         var ismainlayout = 1;
-        function exceldown(fid, url, checktbody, exname) {
+        function exceldown(fid, url, checktbody, exname, limitstringval) {
+            var limit = 14;
+            if (limitstringval) {
+                limit = limitstringval;
+            }
             if ($("#" + checktbody + " tr").length < 1) {
                 msg("검색결과가 없습니다. 검색결과가 있을때만 다운로드할 수 있습니다.");
             }
@@ -41,7 +45,7 @@
                 $("#mainexcelform").append("<input type=\"hidden\" name=\"excelname\" value=\"" + exname + "_@DateTime.Now.ToString("yyyyMMdd")\" />");
                 if ($("#" + fid).find("*[name='tabidx']").length == 1) { $("#mainexcelform").append("<input type=\"hidden\" name=\"tabidx\" value=\"" + $("#" + fid).find("*[name='tabidx']").val() + "\" />"); }
                 if ($("#" + fid).find("*[name='stringval']").length == 1) { $("#mainexcelform").append("<input type=\"hidden\" name=\"stringval\" value=\"" + $("#" + fid).find("*[name='stringval']").val() + "\" />"); }
-                for (var i = 2; i < 14; i++) {
+                for (var i = 2; i < limit; i++) {
                     if ($("#" + fid).find("*[name='stringval" + i + "']").length == 1) { $("#mainexcelform").append("<input type=\"hidden\" name=\"stringval" + i + "\" value=\"" + $("#" + fid).find("*[name='stringval" + i + "']").val() + "\" />"); }
                 }
                 if ($("#" + fid).find("*[name='searchtype']").length == 1) { $("#mainexcelform").append("<input type=\"hidden\" name=\"searchtype\" value=\"" + $("#" + fid).find("*[name='searchtype']").val() + "\" />"); }
diff --git a/BO/Views/croom/pay.cshtml b/BO/Views/croom/pay.cshtml
index 668c2e3..6fe41e9 100644
--- a/BO/Views/croom/pay.cshtml
+++ b/BO/Views/croom/pay.cshtml
@@ -114,7 +114,7 @@
     <div class="tar buttonbox">
         @Html.Partial("./Partial/sembtns", "#tbody1;" + (ViewBag.isadmin ? "1;1;1" : "0;0;0") + ";1;0;결제안내")
         @Html.Partial("./Partial/pagerow", new ViewDataDictionary { { "tbodyid", "tbody1" }, { "searchmethod", "submit()" }, { "pagesize", Model.pagerowcount } })
-        <a href="#" onclick="javascript:exceldown('mform', '/croom/pay', 'tbody1', 'ProductSales');" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
+        <a href="#" onclick="javascript:exceldown('mform', '/croom/pay', 'tbody1', 'ProductSales', 23);" class="btn btn-s-xs btn-success" style="margin-left: 5px;">엑셀다운로드</a>
     </div>
     <section class="panel panel-default">
         <div class="table-responsive" id="excel1">
@@ -148,7 +148,7 @@
                                     &nbsp;@d.itemname@(d.ccount > 1 ? string.Format(" 외 {0} 건", d.ccount - 1) : "")
                                 </a>
                             </td>
-                            <td>@d.sdate.ToString("yy-MM-dd")~<span style="display: inline-block">@d.edate.ToString("yy-MM-dd")</span></td>
+                            <td>@d.sdateymd~<span style="display: inline-block">@d.sdateymd</span></td>
                             <td>@d.payamt.ToString("#,0")<br />(@(d.pptype == 0 ? "미정" : d.pptypename))</td>
                             <td class="link" style="text-align: right !important;"><a href="#" onclick="gorefund(@d.payno, @d.pstatus)">@(d.pstatus == 1 ? d.payamt.ToString("#,0") : "0")<br /><span class="red">(@(d.refundamt.ToString("#,0")))</span></a></td>
                             <td>@d.cdtymd</td>
diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml
index c62dd15..b8ab5d2 100644
--- a/Dao/MyBatis/Maps/CRoom.xml
+++ b/Dao/MyBatis/Maps/CRoom.xml
@@ -771,12 +771,13 @@
             ,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
             ,ua.asname,ua.isjoin
-            ,cm.cshape,cm.sstime,cm.setime
+            ,cm.cshape,cm.sstime,cm.setime,cm.studyplace
             ,le.sdate,le.edate
             ,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,ppl.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
             from (
                 select 0 isexamready,p.payno,max(case when pi.ptype in (0,1,3,4) then pi.pino else 0 end) pi1,min(pi.pino) pi2,count(pi.pino) ccount
                 from pay p
diff --git a/Model/Pay.cs b/Model/Pay.cs
index 34ae019..3960eb3 100644
--- a/Model/Pay.cs
+++ b/Model/Pay.cs
@@ -406,7 +406,7 @@ namespace NP.Model
         {
             get
             {
-                return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인" : "-";
+                return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인 혼합" : "-";
             }
         }
         public String cname { get; set; }
@@ -497,11 +497,78 @@ namespace NP.Model
         public int? infee { get; set; }
         public int? outfee { get; set; }
         public int ispg { get; set; }
+        /// <summary>
+        /// 학습장소
+        /// </summary>
+        public int studyplace { get; set; }
+        /// <summary>
+        /// 학습장소명
+        /// </summary>
         public String studyplacename { get; set; }
-        public DateTime cmiestart { get; set; }
-        public DateTime cmieend { get; set; }
-        public DateTime sdate { get; set; }
-        public DateTime edate { get; set; }
+        /// <summary>
+        /// 강좌교육시작일
+        /// </summary>
+        public DateTime? sdate { get; set; }
+        /// <summary>
+        /// 강좌교육시작일(ymd)
+        /// </summary>
+        public String sdateymd
+        {
+            get
+            {
+                return sdate == null ? "-" : sdate.Value.ToString("yy-MM-dd");
+            }
+        }
+        /// <summary>
+        /// 강좌교육종료일
+        /// </summary>
+        public DateTime? edate { get; set; }
+        /// <summary>
+        /// 강좌교육종료일(ymd)
+        /// </summary>
+        public String edateymd
+        {
+            get
+            {
+                return edate == null ? "-" : edate.Value.ToString("yy-MM-dd");
+            }
+        }
+        /// <summary>
+        /// 교육일정시작일(온라인혼합)
+        /// </summary>
+        public DateTime? cmiestart { get; set; }
+        /// <summary>
+        /// 교육일정시작일(온라인혼합:ymd)
+        /// </summary>
+        public String cmiestartymd
+        {
+            get
+            {
+                return cmiestart == null ? "-" : cmiestart.Value.ToString("yy-MM-dd");
+            }
+        }
+        /// <summary>
+        /// 교육일정종료일(온라인혼합)
+        /// </summary>
+        public DateTime? cmieend { get; set; }
+        /// <summary>
+        /// 교육일정종료일(온라인혼합:ymd)
+        /// </summary>
+        public String cmieendymd
+        {
+            get
+            {
+                return cmieend == null ? "-" : cmieend.Value.ToString("yy-MM-dd");
+            }
+        }
+        /// <summary>
+        /// 교육일정학습장소(온라인혼합)
+        /// </summary>
+        public int cmistudyplace { get; set; }
+        /// <summary>
+        /// 교육일정학습장소명(온라인혼합)
+        /// </summary>
+        public String cmistudyplacename { get; set; }
     }
 
     /// <summary>