From 760e82feb148b7d4d0154de7e428eca56975424c Mon Sep 17 00:00:00 2001 From: kdh0120 Date: Wed, 10 Nov 2021 23:19:34 +0000 Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0=20=20--=20?= =?UTF-8?q?=EA=B3=BC=EC=A0=9C=EC=B2=A8=EC=82=AD=EC=86=94=EB=A3=A8=EC=85=98?= =?UTF-8?q?=20=EC=8B=A4=EC=84=9C=EB=B2=84=EB=A7=8C=20=EC=97=B0=EB=8F=99?= =?UTF-8?q?=EB=90=98=EC=96=B4=20=EC=9E=88=EC=9D=8C=20=EA=B5=AC=EB=B6=84?= =?UTF-8?q?=EA=B0=92=EC=97=90=20=EB=94=B0=EB=9D=BC=EC=84=9C=20=EC=BF=BC?= =?UTF-8?q?=EB=A6=AC=EA=B0=9C=EC=84=A0(=EB=B0=B0=ED=8F=AC=ED=95=A0?= =?UTF-8?q?=EB=95=8C=20=EA=B3=84=EC=86=8D=20=ED=99=95=EC=9D=B8=ED=95=B4?= =?UTF-8?q?=EC=A4=98=EC=95=BC=ED=95=B4=EC=84=9C=20=EC=88=98=EC=A0=95)=20we?= =?UTF-8?q?b.config(isstaging=EA=B0=92=20=ED=99=95=EC=9D=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Controllers/croomController.cs | 3 ++- Base/Controller/ACommonCRoom.cs | 7 ++++--- Dao/MyBatis/Maps/Lect.xml | 12 ++++++------ Model/CM.cs | 1 + 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index 2690145..da42b2a 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -600,7 +600,7 @@ namespace NP.BO.Controllers } if (vm.CMSDs.Count() > 0) { - vm.LectSDs = Dao.Get("lect.lectsds", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "sdno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMSDs.First().sdno }, { "isrebate", vm.addstringval2 }, { "sdstate", vm.addstringval3 } }); + vm.LectSDs = Dao.Get("lect.lectsds", new System.Collections.Hashtable() { { "cmno", vm.CM.cmno }, { "sdno", !string.IsNullOrEmpty(vm.addstringval) ? GetInt(vm.addstringval) : vm.CMSDs.First().sdno }, { "isrebate", vm.addstringval2 }, { "sdstate", vm.addstringval3 }, { "isproduct" + (GetConfig("isstaging") == "1" ? "x" : ""), 1 } }); } vm.pagetotalcount = GetCount(vm.LectSDs); } @@ -695,6 +695,7 @@ namespace NP.BO.Controllers ht.Add("sdtype", 0); vm.LectSDs = new List() { }; ht.Add("sdstate", vm.addstringval2); + ht.Add("isproduct" + (GetConfig("isstaging") == "1" ? "x" : ""), 1); vm.LectSDs = Dao.Get("lect.lectsds.all", ht); vm.pagetotalcount = GetCount(vm.LectSDs.FirstOrDefault()); } diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index 8cd5da7..67e7eeb 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -593,7 +593,7 @@ namespace NP.Base.Controllers [HttpPost] public JsonResult LectSDs(int cmno, int sdno, int? isrebate = null, int? sdstate = null) { - return JsonBack(Dao.Get("lect.lectsds", new System.Collections.Hashtable() { { "cmno", cmno }, { "sdno", sdno }, { "isrebate", isrebate }, { "estate", sdstate } })); + return JsonBack(Dao.Get("lect.lectsds", new System.Collections.Hashtable() { { "cmno", cmno }, { "sdno", sdno }, { "isrebate", isrebate }, { "estate", sdstate },{"isproduct"+ (GetConfig("isstaging") == "1" ? "x" : ""), 1 } })); } [HttpPost] public JsonResult LectAllSDs(int pagenum,int pagerowcount,String edate,String cname,String cnamestr,String searchtype,String searchtext,String sdateall,String edateall,String asname, int? studyplace = null, int? iscomplete = null, int? cshape = null, int? sdstate = null,int? sdtype = 0) @@ -601,17 +601,18 @@ namespace NP.Base.Controllers pagenum = pagenum < 1 ? 1 : pagenum; pagerowcount = pagerowcount < 1 ? PageRowCount : pagerowcount; - return JsonBack(Dao.Get("lect.lectsds.all", new System.Collections.Hashtable() { { "estate", sdstate }, { "pagenum", pagenum }, { "pagerowsize", pagerowcount }, { "edate", edate },{"sdateall",sdateall },{"edateall",edateall }, { "cshape", cshape }, { "cname", cname }, { "cnamestr", cnamestr }, { "iscomplete", iscomplete }, { "studyplace", studyplace }, { "searchtype", searchtype }, {"searchtext",searchtext } ,{"sdtype",sdtype },{"asname",asname } })); + return JsonBack(Dao.Get("lect.lectsds.all", new System.Collections.Hashtable() { { "estate", sdstate }, { "pagenum", pagenum }, { "pagerowsize", pagerowcount }, { "edate", edate },{"sdateall",sdateall },{"edateall",edateall }, { "cshape", cshape }, { "cname", cname }, { "cnamestr", cnamestr }, { "iscomplete", iscomplete }, { "studyplace", studyplace }, { "searchtype", searchtype }, {"searchtext",searchtext } ,{"sdtype",sdtype },{"asname",asname }, { "isproduct" + (GetConfig("isstaging") == "1" ? "x" : ""), 1 }, })); } [HttpPost] public JsonResult LectSD(Int64 lectno, int sdno) { - return JsonBack(Dao.Get("lect.lectsd", new Hashtable() { { "lectno", lectno }, { "sdno", sdno } }).First()); + return JsonBack(Dao.Get("lect.lectsd", new Hashtable() { { "lectno", lectno }, { "sdno", sdno }, { "isproduct" + (GetConfig("isstaging") == "1" ? "x" : ""), 1 } }).First()); } [HttpPost] public JsonResult LectSDSave(LectSD d) { d.uno = SUserInfo.UserNo; d.uip = GetUserIP(); + d.isproduct = GetConfig("isstaging") == "1" ? (int?)null : 1; return JsonOK(Dao.Save("lect.lectsd"+(d.ccount == 1 ? "2" : "")+".save" + (string.IsNullOrEmpty(d.lectnos) ? "" : "batch"), d)); } [HttpGet] diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index f2a7b34..e3f801c 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1050,7 +1050,7 @@ diff --git a/Model/CM.cs b/Model/CM.cs index 0a13f29..b34748a 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -3720,6 +3720,7 @@ namespace NP.Model } } } + public int? isproduct { get; set; } } /// /// 토론글