From 3b39b88bb2d2380d08a72885165699d3a2e6d49e Mon Sep 17 00:00:00 2001 From: hyunho Date: Thu, 18 Mar 2021 08:14:50 +0000 Subject: [PATCH] --- BO/Views/croom/cmlects.cshtml | 34 ++++++++++++++++++++++++++++++--- Base/Controller/ACommonCRoom.cs | 6 ++++++ Dao/MyBatis/Maps/Lect.xml | 2 +- Dao/MyBatis/Maps/Pay.xml | 10 ++++++++++ Model/CM.cs | 1 + 5 files changed, 49 insertions(+), 4 deletions(-) diff --git a/BO/Views/croom/cmlects.cshtml b/BO/Views/croom/cmlects.cshtml index 7179c3d..ecf35b0 100644 --- a/BO/Views/croom/cmlects.cshtml +++ b/BO/Views/croom/cmlects.cshtml @@ -92,7 +92,7 @@ @d.rnorvt @d.asname @(d.cnoname)(@d.cnoid) - @d.username@Html.Raw(string.IsNullOrEmpty(d.fileurl) ? "" : (" ")) + @d.username@Html.Raw(string.IsNullOrEmpty(d.fileurl) ? "" : (" ")) @d.cdtymd @d.statusname @d.pstatusname @@ -183,7 +183,11 @@
심사여부 저장
+
+ 교육신청정보 저장 +


+
@@ -310,6 +314,8 @@ $("#selTypejob").val(ds[14]).attr("selected", "selected"); $("#selTypeedu").val(ds[15]).attr("selected", "selected"); $("#selTypegrade").val(ds[16]).attr("selected", "selected"); + $("#txtpplno").val(ds[17]); + $("#hidpplno").val(ds[17]); } } function change() { @@ -482,8 +488,8 @@ } function afterUpdateScd() { if (capResult.code > 0) { - msg("교육일정을 변경하였습니다."); - submit("mform", 500, true); + msgok(1, "", true); + submit("mform", 800, true); } else { msg("관리자에게 문의하세요."); @@ -493,6 +499,28 @@ function viewas(asno) { winopen("/croom/asrpop?intval=" + asno, 'asrpop', 1200, screen.height - 500); + } + + function savetype() { + if (confirm("교육신청 정보를 저장하시겠습니까??")) { + capp("/acommon/pplogtypechange", { + pplno: $("#hidpplno").val(), + typeman: $("#selTypeman").val(), + typejob: $("#selTypejob").val(), + typeedu: $("#selTypeedu").val(), + typegrade: $("#selTypegrade").val() + }, "afterUpdateType"); + } + } + function afterUpdateType() { + if (capResult.code > 0) { + msgok(1, "", true); + submit("mform", 800, true); + } + else { + msg("관리자에게 문의하세요."); + return; + } } } diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index a07472f..8352ec7 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -1020,5 +1020,11 @@ namespace NP.Base.Controllers return JsonOK(Dao.Save("lect.cmisno.up", new Hashtable() { { "lectno", lectno }, { "cmisno" , cmisno} })); } + [HttpPost] + public JsonResult PPlogTypeChange(Int64 pplno, string typeman, string typejob, string typeedu, string typegrade) + { + return JsonOK(Dao.Save("pay.pplogtype.up", new Hashtable() { { "pplno", pplno }, { "typeman", typeman }, { "typejob", typejob }, { "typeedu", typeedu }, { "typegrade", typegrade } })); + } + } } \ No newline at end of file diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index b61c0c0..252ad6a 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -166,7 +166,7 @@ ,a2.rstime,a2.retime,a2.sstime,a2.setime,a2.cshape,a2.studydays ,a.sdate,a.edate,a.isrebate ,scd.estart,scd.eend - ,pp.typeman, pp.typeedu, pp.typegrade, pp.typejob + ,pp.typeman, pp.typeedu, pp.typegrade, pp.typejob, pp.pplno ,row_number() over(order by $orderby$a.payno,a.pino) rno ,count(a.cdt) over() pagetotalcount from lect a diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml index f355c11..ff81a54 100644 --- a/Dao/MyBatis/Maps/Pay.xml +++ b/Dao/MyBatis/Maps/Pay.xml @@ -932,6 +932,16 @@ inner join pplog a on a.pplno=b.pplno where b.payno=#payno# and a.userno=#userno# + + + update pplog + set + typeman = #typeman# + ,typejob = #typejob# + ,typeedu = #typeedu# + ,typegrade = #typegrade# + where pplno = #pplno# + diff --git a/Model/CM.cs b/Model/CM.cs index edf95c4..e4eaef3 100644 --- a/Model/CM.cs +++ b/Model/CM.cs @@ -1188,6 +1188,7 @@ namespace NP.Model public int typeedu { get; set; } public int typegrade { get; set; } public int typejob { get; set; } + public Int64 pplno { get; set; } } /// /// 자격검정시험