From 612b6f03108993dd02e4446c254defe6b5d65f7f Mon Sep 17 00:00:00 2001 From: lch Date: Tue, 29 Jun 2021 08:27:56 +0000 Subject: [PATCH] =?UTF-8?q?"1.=20=EA=B5=90=EC=9C=A1=EC=9E=A5=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=9D=B4=20=EB=90=98=EA=B3=A0=20=EC=9E=88=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EC=9D=8C=20=20-=202021=EB=85=84/=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=EC=9E=A5=EA=B5=90=EC=9C=A1=20=EC=97=90=EC=84=9C=20=EA=B5=90?= =?UTF-8?q?=EC=9C=A1=EC=9E=A5=EC=9D=84=20=EC=96=B4=EB=8A=90=EA=B3=B3?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=84=A0=ED=83=9D=ED=95=B4=EB=8F=84=20?= =?UTF-8?q?=EB=8F=99=EC=9D=BC=ED=95=9C=20=EA=B0=92=EC=9D=B4=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EB=90=98=EA=B3=A0=20=EC=9E=88=EC=9D=8C=202.=20?= =?UTF-8?q?=ED=95=99=EC=8A=B5=EA=B8=B0=EA=B0=84=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EC=8B=9C=20=EC=88=98=EB=A3=8C=EC=9D=BC=20=EA=B8=B0=EC=A4=80?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EA=B2=80=EC=83=89=20=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=20-=20=EC=88=98=EB=A3=8C=EC=9D=BC=EC=9D=B4=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=20=EA=B8=B0=EA=B0=84=20=EB=82=B4=EC=97=90=20=ED=8F=AC?= =?UTF-8?q?=ED=95=A8=EB=90=98=EC=96=B4=20=EC=9E=88=EC=9D=84=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20=EC=B6=9C=EB=A0=A5=20=20-=20=EA=B8=B0=EB=B3=B8?= =?UTF-8?q?=EA=B0=92:=20null=203.=20=EA=B2=80=EC=83=89=EB=8B=A8=EC=96=B4?= =?UTF-8?q?=20ID=20=EB=88=84=EB=9D=BD"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Controllers/croomController.cs | 8 +++----- BO/Views/croom/completions.cshtml | 2 +- Dao/MyBatis/Maps/CRoom.xml | 6 ++++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index af35e77..7420d5b 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -1008,9 +1008,7 @@ namespace NP.BO.Controllers { vm.Completions = InitM(); vm.CGs = Dao.Get("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } }); - vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace"); - vm.stringval8 = vm.stringval8 ?? DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01"); - vm.stringval9 = vm.stringval9 ?? DateTime.Now.AddMonths(1).ToString("yyyy-MM-01"); + vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace"); var ht = SetHash(vm); ht.Add("tyear", vm.stringval); @@ -1020,8 +1018,8 @@ namespace NP.BO.Controllers ht.Add("typeman", vm.stringval5); ht.Add("studyplace", vm.stringval6); ht.Add("typejob", vm.stringval7); - ht.Add("sdate", vm.stringval8); - ht.Add("edate", vm.stringval9); + ht.Add("scompletetime", vm.stringval8); + ht.Add("ecompletetime", vm.stringval9); ht.Add("typegrade", vm.stringval10); ht.Add("typeedu", vm.stringval11); diff --git a/BO/Views/croom/completions.cshtml b/BO/Views/croom/completions.cshtml index f496857..1bdb4f1 100644 --- a/BO/Views/croom/completions.cshtml +++ b/BO/Views/croom/completions.cshtml @@ -81,7 +81,7 @@ 검색단어
- @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "username:이름;userpno:주민등록번호;completeno:수료번호;asname:업체명;brno:사업자등록번호" }, { "name", "searchtype" }, { "selected", Model.searchtype }, { "style", "width: 100%" }, { "df", ":-유형선택" } }) + @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "userid:ID;username:이름;userpno:주민등록번호;completeno:수료번호;asname:업체명;brno:사업자등록번호" }, { "name", "searchtype" }, { "selected", Model.searchtype }, { "style", "width: 100%" }, { "df", ":-유형선택" } })
diff --git a/Dao/MyBatis/Maps/CRoom.xml b/Dao/MyBatis/Maps/CRoom.xml index bc3ecf3..e702b32 100644 --- a/Dao/MyBatis/Maps/CRoom.xml +++ b/Dao/MyBatis/Maps/CRoom.xml @@ -1547,12 +1547,13 @@ left outer join pplog pp on pp.pplno = p.pplno where l.iscomplete = 1 l.lectno = #lectno# - l.sdate >= #sdate# - l.edate <= #edate# + l.completetime >= #scompletetime# + l.completetime <= #ecompletetime# t.tyear=#tyear# cg.cgno=#cgno# cg.pcgno=#pcgno# cm.cshape=#cshape# + cm.studyplace=#studyplace# pp.typeman=#typeman# pp.edukind=#edukind# pp.typeedu=#typeedu# @@ -1560,6 +1561,7 @@ pp.typejob=#typejob# + u.userid like concat('%',#searchtext#,'%') u.username like concat('%',#searchtext#,'%') u.userpno = HEX(AES_ENCRYPT(replace(#searchtext#,'-',''), ))