From dad4aceaa64897208398eea2b0f65fc95b2e404a Mon Sep 17 00:00:00 2001
From: hyunho <hyunho  @example.com>
Date: Tue, 5 Jan 2021 05:00:46 +0000
Subject: [PATCH]

---
 BO/Views/cm/cmreg.cshtml |  1 +
 Dao/MyBatis/Maps/CM.xml  | 11 ++++++-----
 Model/CM.cs              |  4 ++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/BO/Views/cm/cmreg.cshtml b/BO/Views/cm/cmreg.cshtml
index 456ebe5..024de3b 100644
--- a/BO/Views/cm/cmreg.cshtml
+++ b/BO/Views/cm/cmreg.cshtml
@@ -115,6 +115,7 @@
                     <label class="col-sm-4 col-md-2 control-label req">수강료/정원</label>
                     <div class="col-sm-8 col-md-10">
                         수강료 : @Html.TextBoxFor(m => m.CM.infee, new { @class = "form-control disp-init int text-right", @style = "width: 150px;", @maxlength = "12" })
+                        &nbsp;&nbsp;&nbsp;&nbsp;합숙비용 : @Html.TextBoxFor(m => m.CM.accommofee, new { @class = "form-control disp-init int text-right", @style = "width: 150px;", @maxlength = "12" })
                         <div style="display:none">&nbsp;&nbsp;&nbsp;&nbsp;비회원 : @Html.TextBoxFor(m => m.CM.outfee, new { @class = "form-control disp-init int text-right", @style = "width: 150px;", @maxlength = "12" })</div>
                         &nbsp;&nbsp;&nbsp;&nbsp;정원 : @Html.TextBoxFor(m => m.CM.quota, new { @class = "form-control disp-init int text-right", @style = "width: 150px;", @maxlength = "6" })
                     </div>
diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml
index 2b76496..03ad24d 100644
--- a/Dao/MyBatis/Maps/CM.xml
+++ b/Dao/MyBatis/Maps/CM.xml
@@ -120,7 +120,7 @@
             from (
                 select a.cmno,case when a.ismaster=2 then a.cmno else 0 end pcno,a.ismaster,a.cgno,a.pcmno,a.cname,a.kname
                         ,a.tmno,a.classno,a.rstime,a.retime,a.sstime,a.setime,a.gstime,a.getime
-                        ,a.cshape,a.infee,a.outfee,a.quota
+                        ,a.cshape,a.infee,a.outfee,a.quota,a.accommofee
                         ,a.introhtml,a.targethtml,a.goalhtml,a.contenthtml
                         ,a.studytime,a.studyplace,a.certcc,a.certgradecc,a.jobcc,a.jobpositiongrade,a.difficulty,a.isrefund,a.isuse,a.isseq,a.fgnocm
                         ,a.typeman,a.typeedu,a.typegrade,a.typejob,a.iscertificate
@@ -236,11 +236,11 @@
         </select>
         <insert id="cm.cmin" parameterClass="cm">
             insert into cm(ismaster,cgno,pcmno,cname,kname,tmno,classno,rstime,retime,sstime,setime,gstime,getime,cshape
-                ,infee,outfee,quota
+                ,infee,outfee,accommofee,quota
                 ,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime
                 ,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,isuse,isdel,isseq,fgnocm,typeman,typeedu,typegrade,typejob,iscertificate,ischkatt,<include refid="sql.inc"></include>)
             values (#ismaster#,#cgno#,#pcmno#,#cname#,#kname#,#tmno#,#classno#,#rstime#,#retime#,#sstime#,#setime#,#gstime#,#getime#,#cshape#
-            ,#infee#,#outfee#,#quota#
+            ,#infee#,#outfee#,#accommofee#,#quota#
             ,#introhtml#,#targethtml#,#goalhtml#,#contenthtml#
             ,#studyplace#,#studytime#,#certcc#,#certgradecc#,#jobcc#,#jobpositiongrade#,#difficulty#,#isrefund#,#isuse#,0,#isseq#,#fgnocm#,#typeman#,#typeedu#,#typegrade#,#typejob#,#iscertificate#,#ischkatt#,<include refid="sql.inv"></include>);
             <selectKey type="post" property="cmno" resultClass="int">SELECT  LAST_INSERT_ID()</selectKey>
@@ -260,6 +260,7 @@
           ,cshape             =#cshape#
           ,infee              =#infee#
           ,outfee             =#outfee#
+          ,accommofee         =#accommofee#
           ,quota              =#quota#
           ,introhtml          =#introhtml#
           ,targethtml         =#targethtml#
@@ -1277,14 +1278,14 @@
             order by dtype,intval,longval2
         </select>
         <insert id="cm.cmcopy0" parameterClass="cm">
-            insert into cm(ismaster,cgno,pcmno,cname,kname,tmno,classno,rstime,retime,sstime,setime,gstime,getime,cshape,typeman,typeedu,typegrade,typejob,infee,outfee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime
+            insert into cm(ismaster,cgno,pcmno,cname,kname,tmno,classno,rstime,retime,sstime,setime,gstime,getime,cshape,typeman,typeedu,typegrade,typejob,infee,outfee,accommofee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime
                 ,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,isuse,isseq,iscertificate,isdel,<include refid="sql.inc"></include>)
             select #ismaster#,cgno,case when a.ismaster = 1 and #ismaster# = 0 then a.cmno else a.pcmno end,ifnull(#cname#, concat('사본_', cname)),a.kname,#tmno#
                 ,case when #tmno# is null then null else ifnull(b.classno,0)+1 end
                 ,t.rstime,date_format(t.retime,'%Y-%m-%d 23:59:59') retime
                 ,t.sstime,date_format(t.setime,'%Y-%m-%d 23:59:59') setime
                 ,t.gstime,date_format(t.getime,'%Y-%m-%d 23:59:59') getime
-                ,a.cshape,a.typeman,a.typeedu,a.typegrade,a.typejob,infee,outfee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime
+                ,a.cshape,a.typeman,a.typeedu,a.typegrade,a.typejob,infee,outfee,accommofee,quota,introhtml,targethtml,goalhtml,contenthtml,studyplace,studytime
                 ,certcc,certgradecc,jobcc,jobpositiongrade,difficulty,isrefund,1,isseq,a.iscertificate,0,<include refid="sql.inv"></include>
             from cm a
             left outer join (
diff --git a/Model/CM.cs b/Model/CM.cs
index 5a02058..556db5f 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -285,6 +285,10 @@ namespace NP.Model
         /// 비회원수강료
         /// </summary>
         public int outfee              {get;set;}
+        /// <summary>
+        /// 합숙비용
+        /// </summary>
+        public int accommofee { get; set; }
         public int fee { get; set; }
         /// <summary>
         /// 정원	0: 제한없음