From 437ec9f0336c3c8585ab7c5bae5e69dcb3136a17 Mon Sep 17 00:00:00 2001 From: lch Date: Fri, 4 Jun 2021 09:01:04 +0000 Subject: [PATCH] =?UTF-8?q?=EA=B5=90=EC=9C=A1=EC=83=9D=20=EA=B0=9C?= =?UTF-8?q?=EB=B3=84=EB=93=B1=EB=A1=9D=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/BO.csproj | 4 - BO/Views/Shared/Partial/CMBox2.cshtml | 9 +- BO/Views/Shared/Partial/UserBox.cshtml | 3 +- BO/Views/croom/lectreg.cshtml | 344 +++++++++++++++---------- Base/Base.csproj | 3 - Base/Controller/ACommonCRoom.cs | 130 ++++++---- Base/Controller/FCommon.cs | 102 ++++---- Dao/Dao.csproj | 4 - Dao/MyBatis/Maps/Pay.xml | 4 +- Model/VMCM.cs | 1 + 10 files changed, 351 insertions(+), 253 deletions(-) diff --git a/BO/BO.csproj b/BO/BO.csproj index 26370ac..a8e8357 100644 --- a/BO/BO.csproj +++ b/BO/BO.csproj @@ -47,10 +47,6 @@ 4 - - False - ..\..\LMS_TSTI\Source\Web\SMU.LMS.Web\bin\Castle.DynamicProxy.dll - False ..\packages\Common.Logging.3.0.0\lib\net40\Common.Logging.dll diff --git a/BO/Views/Shared/Partial/CMBox2.cshtml b/BO/Views/Shared/Partial/CMBox2.cshtml index 430d1b3..38c9418 100644 --- a/BO/Views/Shared/Partial/CMBox2.cshtml +++ b/BO/Views/Shared/Partial/CMBox2.cshtml @@ -95,7 +95,14 @@ + getint(r.outfee) + ":" + r.ismaster + ":" + r.ismastername + ":" - + r.ssseterm + + r.ssseterm + ":" + + r.cshape + ":" + + r.typeman + ":" + + r.typeedu + ":" + + r.typegrade + ":" + + r.typejob + ":" + + r.typejob + ":" + + r.isaccommodation + "\" />" + r.rnorvt + "" + r.cmno + "" + r.pcgname + " | " + r.cgname + "" + r.tmname + "" + r.cshapename + "" + (@(issingle?1:0)== 1 ? ("[" + r.ismastername + "] " + r.cnameclassno.replace(/:/gi, '|').replace(/;/gi, '|') + ""): ("" + r.cnameclassno.replace(/:/gi, '|').replace(/;/gi, '|') + "")) + ""); diff --git a/BO/Views/Shared/Partial/UserBox.cshtml b/BO/Views/Shared/Partial/UserBox.cshtml index 8c655d1..2b878aa 100644 --- a/BO/Views/Shared/Partial/UserBox.cshtml +++ b/BO/Views/Shared/Partial/UserBox.cshtml @@ -108,7 +108,8 @@ r.isjoin + ":" + getdb(r.isjoinname) + ":" + getdb(r.asname) + ":" + - getdb(r.userid) + "\" />" + + getdb(r.userid) + ":" + + getdb(r.asno) + "\" />" + "" + r.usertypestr + "" + "" + getdb((r.usertype == 11 ? r.pasname : r.asname)).replace(/:/gi, '|').replace(/;/gi, '|') + "" + (@(issingle?1:0) == 1 ? diff --git a/BO/Views/croom/lectreg.cshtml b/BO/Views/croom/lectreg.cshtml index 3c77136..9a4f769 100644 --- a/BO/Views/croom/lectreg.cshtml +++ b/BO/Views/croom/lectreg.cshtml @@ -24,74 +24,76 @@
-
- @Html.Partial("./Partial/Radio", Model.ComCodes.Where(w => w.cgroup.ToString() == "typeman"), new ViewDataDictionary() { { "name", "typeman" } }) +
-
- @Html.Partial("./Partial/Radio", Model.ComCodes.Where(w => w.cgroup.ToString() == "typeedu"), new ViewDataDictionary() { { "name", "typeedu" } }) +
-
- @Html.Partial("./Partial/Radio", Model.ComCodes.Where(w => w.cgroup.ToString() == "typegrade"), new ViewDataDictionary() { { "name", "typegrade" } }) +
-
- @Html.Partial("./Partial/Radio", Model.ComCodes.Where(w => w.cgroup.ToString() == "typejob"), new ViewDataDictionary() { { "name", "typejob" } }) +
-
-
- -
- @Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "0:아니오;1:예" }, { "name", "isaccommodation" } }) + -
-
- -
- @Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "0:비환급;1:환급" }, { "name", "isrebate" } }) + -
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- - -
    -
+
@@ -105,13 +107,20 @@
+
+
+ +
+ @Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "0:개인;1:업체" }, { "name", "iscompany" }, { "checked", 0} }) +
+
- +
@@ -120,14 +129,7 @@
- @if (Model.IsAdmin) - { -
@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "1:신용카드;2:계좌이체;3:가상계좌;4:현금;5:현금+카드;6:무료;9:위탁계약" }, { "checked", 1 }, { "name", "ptype" } })
- } - else if (Model.IsSiteAdmin) - { -
@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "9:위탁계약" }, { "checked", 9 }, { "name", "ptype" } })
- } +
@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "6:무료;1:신용카드;3:무통장입금(가상계좌);4:현금" }, { "checked", 6 }, { "name", "ptype" } })
@@ -145,7 +147,7 @@ - + @@ -183,24 +185,14 @@ var cmboxtmno = 0; var cmboxnotcmno = ""; $(document).ready(function () { - $("input[name='ptype']").on("change", function () { - $("th.payamtcash,th.payamtcard,td.payamtcash,td.payamtcard").addClass("hide"); - if ($(this).val() == "5") { - $("th.payamtcash,th.payamtcard,td.payamtcash,td.payamtcard").removeClass("hide"); + $("input[name='ptype']").on("click", function () { + if ($(this).val() == "6") { + $("#payamt").val(0); + $("#payamt").prop("readonly", true); + } else { + $("#payamt").prop("readonly", false); } - }); - $("input[name='ismember']").on("change", function () { - $("#userno,#userid,#username,#email,#mobile").val(""); - $("#userinfo").text(""); - $("#newuser").hide(); - $("#olduser").show(); - if ($(this).val() == "1") { - $("#newuser").show(); - $("#username").focus(); - $("#olduser").hide(); - } - }); - + }); $("#btnfindscdshow").on("click", function () { var cmno = $("#cmno").val(); if (cmno != "") { @@ -209,67 +201,160 @@ alert("강좌ID 선택 후 가능합니다.") } }); - - }); - var _ismaster = 0; - function bindCM(vs) { + $("input:radio[name='isrebate']").on("click", function () { + if ($(this).val() == 0) { + setv("rbankname", ""); + setv("rbankacc", ""); + setv("rbankowner", ""); + $("#rbankname").prop("readonly", true); + $("#rbankacc").prop("readonly", true); + $("#rbankowner").prop("readonly", true); + $("input:radio[name='iscompany']").prop("disabled", false); + } else { + $("#rbankname").prop("readonly", false); + $("#rbankacc").prop("readonly", false); + $("#rbankowner").prop("readonly", false); + $("input:radio[name='iscompany'][value='1']").click(); + $("input:radio[name='iscompany']").prop("disabled", true); + } + }); + $("input:radio[name='iscompany']").on("click", function () { + if ($(this).val() == 0) { + $("#btnfindassign").prop("disabled", true); + assigndel(); + } else { + $("#btnfindassign").prop("disabled", false); + } + }); + }); + function bindCM(vs) { var v = vs.split(':'); setv("cmno", v[0]); $("#cmname").text(v[2] + " | " + v[8] + " | " + v[1]); $("#ssseterm").text("교육일 : " + v[9] + "일"); $("#fee").text("교육비 : 회원 " + bindComma3(v[5]) + "원 | 비회원 " + bindComma3(v[6]) + "원"); $("#layertable tbody tr:gt(0)").remove(); - _ismaster = 0; - if (v[7] == "2") { - _ismaster = 2; - capp("/acommon/cmpcget", { pcno: v[0] }, "cbcmpcget"); - } else { - $("#layertable tbody tr").first().attr("data-cmno", v[0]); - $("th.cm,th.payamtcash,th.payamtcard,td.payamtcash,td.payamtcard").addClass("hide"); + $("#layertable tbody tr").first().attr("data-cmno", v[0]); + $("th.cm,th.payamtcash,th.payamtcard,td.payamtcash,td.payamtcard").addClass("hide"); + + var cshape = v[10]; + $("input:radio[name='isrebate'][value='0']").click(); + $("input:radio[name='isaccommodation'][value='0']").click(); + $(".div-rbankInfo").hide(); + setv("rbankname", ""); + setv("rbankacc", ""); + setv("rbankowner", ""); + setv("cmisno", ""); + + if (cshape == 1) { + $(".div-isrebate").show(); + $(".div-cmscd").hide(); + $("input:radio[name='isrebate'][value='1']").click(); + } else if (cshape == 2){ + $(".div-isrebate").hide(); + $(".div-cmscd").show(); + } else { + $(".div-isrebate").hide(); + $(".div-cmscd").hide(); + } + + var types = @Html.Raw(Json.Encode(Model.ComCodes.Select(s=> new { cgroup = s.cgroup, ccode = s.ccode, cname = s.cname}))); + var typemans = v[11].split(","); + var typeedus = v[12].split(","); + var typegrades = v[13].split(","); + var typejobs = v[14].split(","); + + $("#div-typemans").html(radiohtml(types, typemans)); + $("#div-typeedus").html(radiohtml(types, typeedus)); + $("#div-typegrades").html(radiohtml(types, typegrades)); + $("#div-typejobs").html(radiohtml(types, typejobs)); + + var isaccommodation = v[16]; + if (isaccommodation == 1) { + $(".div-isaccommodation").show(); + } else { + $(".div-isaccommodation").hide(); } } - function cbcmpcget() { - $.each(capResult.obj, function (i, d) { - if (i > 0) { - $("#layertable tbody tr").first().clone().appendTo("#layertable tbody"); - } - $("#layertable tbody tr").last().attr("data-cmno", d.cmno); - $("#layertable tbody tr").last().find("th.cm").html(d.tmname + " | " + d.cnameclassno + "
회원가: " + bindComma3(d.infee) + ", 비회원가: " + bindComma3(d.outfee)); - $("#layertable tbody tr").last().find("td.payamt input,td.payamtcash input,td.payamtcard input").val(0); - }); - $("th.cm").removeClass("hide"); - } + function radiohtml(types, ccodes) { + var html = ""; + $.each(ccodes, function (index, ccode) { + $.each(types, function (index, type) { + if (type.ccode == ccode) { + html += " "; + return false; + } + }); + }); + return html; + } function bindUser(vs) { var v = vs.split(':'); setv("userid", v[7]); setv("userno", v[0]); $("#userinfo").text("[" + v[5] + "]" + v[6] + " | " + v[2] + "(" + v[3] + ")"); + assigndel(); + if (v[8]) { + $("input:radio[name='iscompany'][value='1']").click(); + bindAssign(v[8] + ":" + v[6]); + } } - function save() { - var ta = 0; - var tcash = 0; - var tcard = 0; - var sd = ""; - $.each($("#layertable tbody tr"), function (i, r) { - ta += getint($(r).find("td.payamt input").val()); - tcash += getint($(r).find("td.payamtcash input").val()); - tcard += getint($(r).find("td.payamtcard input").val()); - sd += ";" + $(r).attr("data-cmno") + ":" + getint($(r).find("td.payamt input").val()) + ":" + getint($(r).find("td.payamtcash input").val()) + ":" + getint($(r).find("td.payamtcard input").val()); - }); - sd = sd.substr(1); - if (check("cmno", null, "강좌/패키지를 선택해주세요.")) { } - else if ($("#ismember0").prop("checked") && $("#userno").val() == "") { msg("신청자ID를 등록해주세요."); } - else if ($("#ismember1").prop("checked") && $("#username").val() == "") { focus("username"); msg("신청자이름을 입력해주세요."); } - else if ($("#ismember1").prop("checked") && !isemail($("#email").val())) { focus("username"); msg("이메일을 확인해주세요."); } - else if ($("#ismember1").prop("checked") && !ismobile($("#mobile").val())) { focus("username"); msg("핸드폰번호를을 확인해주세요."); } - else if (getrv("ptype") != "6" && getrv("ptype") != "9" && ta < 1) { msg("결제금액을 입력해주세요."); } - else if (getrv("ptype") == "5" && ta != tcash + tcard) { msg("결제금액을 확인해주세요."); } + function bindAssign(data) { + var v = data.split(':')[0]; + setv("asno", v); + $("#asbox").html(""); + $("#asbox").append("
  • X
    • "); + } + function assigndel(a) { + if (a) { + $(a).closest("li").remove(); + setv("asno", ""); + } else { + $("#asbox").empty(); + setv("asno", ""); + } + } + function bindCMScd(data) { + setv("cmisno", data.value); + $("#scdbox").html(""); + $("#scdbox").append("
  • X
    • "); + } + function cmscddel(a) { + setv("cmisno", ""); + $(a).closest("li").remove(); + } + function save() { + var isrebate = $("input:radio[name='isrebate']:checked").val() == "1" ? true : false; + var iscompany= $("input:radio[name='iscompany']:checked").val() == "1" ? true : false; + if (check("cmno", null, "강좌ID를 선택해주세요.")) { } + else if ($("input:radio[name='typeman']").length > 0 && $("input:radio[name='typeman']:checked").val() == undefined) { msg("기술인분류를 선택해주세요."); } + else if ($("input:radio[name='typeedu']").length > 0 && $("input:radio[name='typeedu']:checked").val() == undefined) { msg("교육목적을 선택해주세요."); } + else if ($("input:radio[name='typegrade']").length > 0 && $("input:radio[name='typegrade']:checked").val() == undefined) { msg("등급을 선택해주세요."); } + else if ($("input:radio[name='typejob']").length > 0 && $("input:radio[name='typejob']:checked").val() == undefined) { msg("직무분야를 선택해주세요."); } + else if ($(".div-cmscd").css("display") != "none" && $("#cmisno").val() == "") { msg("교육일정을 선택해주세요."); } + else if (isrebate && check("rbankname", null, "은행명을 등록해주세요.")) { } + else if (isrebate && check("rbankacc", null, "계좌번호를 등록해주세요.")) { } + else if (isrebate && check("rbankowner", null, "예금주를 등록해주세요.")) { } + else if (check("userno", null, "신청자ID를 선택해주세요.")) { } + else if (iscompany && check("asno", null, "회사정보를 선택해주세요.")) { } + else if (getrv("ptype") != "6" && val("payamt") < 1) { msg("결제금액을 입력해주세요."); } else if (confirm("교육생을 등록하시겠습니까?")) { - if (_ismaster == 0) { - capp("/acommon/lectreg", { pis: sd, isnewmember: $("#ismember1").prop("checked"), userno: val("userno") == "" ? 0 : val("userno"), username: val("username"), email: val("email"), mobile: val("mobile"), ptype: getrv("ptype") }, "cbsave"); - } else { - capp("/acommon/lectreg", { pcno: val("cmno"), pis: sd, isnewmember: $("#ismember1").prop("checked"), userno: val("userno") == "" ? 0 : val("userno"), username: val("username"), email: val("email"), mobile: val("mobile"), ptype: getrv("ptype") }, "cbsave"); - } + var pplog = {}; + pplog.cmno = val("cmno"); + pplog.typeman = getrv("typeman"); + pplog.typeedu = getrv("typeedu"); + pplog.typegrade = getrv("typegrade"); + pplog.typejob = getrv("typejob"); + pplog.cmisno = val("cmisno"); + pplog.isaccommodation = getrv("isaccommodation"); + pplog.isrebate = getrv("isrebate"); + pplog.rbankname = val("rbankname"); + pplog.rbankacc = val("rbankacc"); + pplog.rbankowner = val("rbankowner"); + pplog.iscompany = getrv("iscompany"); + pplog.userno = val("userno"); + pplog.asno = val("asno"); + capp("/acommon/lectreg", { ptype: getrv("ptype"), payamt: val("payamt"), pplog: pplog }, "cbsave"); } } function cbsave() { @@ -288,24 +373,5 @@ msgdev(); } } - function bindAssign(data) { - var v = data.split(':')[0]; - setv("asno", v); - $("#asbox").html(""); - $("#asbox").append("
  • X
    • "); - } - function assigndel(a) { - $(a).closest("li").remove(); - setv("asno", ""); - } - function bindCMScd(data) { - setv("cmisno", data.value); - $("#scdbox").html(""); - $("#scdbox").append("
  • X
    • "); - } - function cmscddel(a) { - setv("cmisno", ""); - $(a).closest("li").remove(); - } } \ No newline at end of file diff --git a/Base/Base.csproj b/Base/Base.csproj index 3ab2fd5..01d94a3 100644 --- a/Base/Base.csproj +++ b/Base/Base.csproj @@ -50,9 +50,6 @@ ..\References\IBatisNet.Common.Logging.Log4Net.dll - - ..\..\LMS_TSTI\Source\Core\NPTech.LMS.Core\bin\Release\IBatisNet.DataAccess.dll - False ..\References\IBatisNet.DataMapper.dll diff --git a/Base/Controller/ACommonCRoom.cs b/Base/Controller/ACommonCRoom.cs index c49a348..a2eb386 100644 --- a/Base/Controller/ACommonCRoom.cs +++ b/Base/Controller/ACommonCRoom.cs @@ -83,57 +83,86 @@ namespace NP.Base.Controllers return JsonOK(Dao.Save("lect.lectchange", new Hashtable() { { "lectno", lectno }, { "cmno", cmno }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } })); } [HttpPost] - public JsonResult LECTReg(int? pcno, bool isnewmember, int userno, String username, String email, String mobile, int ptype, String pis) + public JsonResult LECTReg(int ptype, int payamt, PPLog pplog) { - if (isnewmember) - { - //회원정보생성 - //아이디, 이메일 중복확인 - var checkuser = Dao.Get("users.checkuser", new Hashtable() { { "userid", email }, { "email", email } }).First(); - if (checkuser < 9) - { - return JsonOK(checkuser * -1); - } - var User = new Users() { }; - User.uno = SUserInfo.UserNo; User.uip = GetUserIP(); - User.mobile = string.IsNullOrEmpty(mobile) || mobile.Replace("-", "").Length < 10 ? (mobile ?? "") : mobile.Replace("-", "").Length == 10 ? string.Format("{0}-{1}-{2}", mobile.Replace("-", "").Substring(0, 3), mobile.Replace("-", "").Substring(3, 3), mobile.Replace("-", "").Substring(6)) : string.Format("{0}-{1}-{2}", mobile.Replace("-", "").Substring(0, 3), mobile.Replace("-", "").Substring(3, 4), mobile.Replace("-", "").Substring(7)); - User.username = username; - User.userpass = NP.Base.Lib.KISA_SHA256.SHA256Hash(mobile.Replace("-", "")); - User.userid = User.email = email.Trim(); - User.usertype = 1; - User.asno = SUserInfo.IsSiteAdmin ? SUserInfo.ASNo : (int?)null; - User.status = 1; - Dao.Insert("users.in", User); - if (User.userno < 1) - { - return JsonOK(-3); - } - userno = User.userno; + #region PPLog + #region CM + var cm = Dao.Get("cm.cms", new Hashtable() { { "cmno", pplog.cmno } }).First(); + cm.applicableCM = (cm.quota != 0 && cm.quota - cm.lectcnt <= 0) ? "대기접수" : "정상접수"; + + pplog.uno = SUserInfo.UserNo; + pplog.uip = GetUserIP(); + pplog.isready = cm.applicableCM == "정상접수" ? 0 : 1; + pplog.cgcode = cm.pcgcode; + if (pplog.cgcode != "0") + { + pplog.cgno = cm.cgno; } + pplog.cshape = cm.cshape; + #endregion + #region User + var user = Dao.Get("users.users", new Hashtable() { { "userno", pplog.userno } }).First(); + pplog.userpno = user.userpno; + pplog.mobile = user.mobile; + pplog.email = user.email; + pplog.upost = user.post; + pplog.uaddress1 = user.address1; + pplog.uaddress2 = user.address2; + pplog.isassignuser = user.isassignuser; + pplog.uduty = user.uduty; + pplog.slevel = user.slevel; + #endregion + #region Assign + if (pplog.asno != null) + { + var assign = Dao.Get("users.assigns2", new Hashtable() { { "asno", pplog.asno }, { "excel1", ",a.post" }, { "orderby", "a.asname" } }).First(); + pplog.asname = assign.asname; + pplog.brno = assign.brno; + pplog.ceoname = assign.ceoname; + pplog.post = assign.post; + pplog.address1 = assign.address1; + pplog.address2 = assign.address2; + pplog.btype = assign.btype; + pplog.bkind = assign.bkind; + pplog.fgnobno = assign.fgnobno; + pplog.eino = assign.eino; + pplog.mname = assign.mname; + pplog.mphone = assign.mphone; + pplog.taxemail = assign.taxemail; + } + #endregion + Dao.Insert("cm.pplog.applyedu.in", pplog); + #endregion + + #region Users.asno update + Dao.Save("users.asno.save", new Hashtable() { { "asno", pplog.asno }, { "userno", pplog.userno } }); + #endregion + + #region Pay var payitems = new List() { }; var uip = GetUserIP(); - foreach (var v in pis.Split(';')) + payitems.Add(new PayItem() { - var vs = v.Split(':'); - payitems.Add(new PayItem() - { - ptype = pcno == null ? 0 : 1, - pcno = pcno, - itemno = GetInt(vs[0]), - userno = userno, - status = 1, - ispc = pcno == null ? 0 : 1, - pstatus = 1, - pcnt = 1, - payamt = GetInt(vs[1]), - payamtcash = ptype == 5 ? GetInt(vs[2]) : 0, - payamtcard = ptype == 5 ? GetInt(vs[3]) : 0, - uno = SUserInfo.UserNo, - uip = uip - }); - } + ptype = 0, + pcno = null, + itemno = pplog.cmno, + userno = pplog.userno, + status = 1, + ispc = 0, + pstatus = 1, + pcnt = 1, + payamt = payamt, + payamtcash = 0, + payamtcard = 0, + uno = SUserInfo.UserNo, + isrebate = pplog.isrebate ?? 0, + rbank = pplog.rbankname, + rbankaccnum = pplog.rbankacc, + tbankuser = pplog.rbankowner, + uip = uip + }); //정가확인 - var cms = Dao.Get("cm.cms.forpay" + (pcno == null ? "" : "pc"), new Hashtable() { { "userno", userno }, { pcno == null ? "cmno" : "pcno", pcno == null ? payitems.First().itemno : pcno.Value } }); + var cms = Dao.Get("cm.cms.forpay", new Hashtable() { { "userno", pplog.userno }, { "cmno", payitems.First().itemno } }); foreach (var pi in payitems) { pi.orgamt = cms.Where(w => w.cmno == pi.itemno).First().fee; @@ -142,7 +171,8 @@ namespace NP.Base.Controllers var pay = new Pay() { ptype = ptype, - userno = userno, + userno = pplog.userno, + username = user.username, pstatus = 1, rstatus = 0, refunding = 0, @@ -151,11 +181,15 @@ namespace NP.Base.Controllers payamt = payitems.Sum(s => s.payamt), PIs = payitems, cmnos = string.Join(",", payitems.Select(s => s.itemno)), + iscashrct = 0, + pplno = pplog.pplno, uno = SUserInfo.UserNo, uip = GetUserIP() - }; + }; + #endregion + //등록된 교육생인가 확인 - var checklectuser = Dao.Get("lect.checkuser", new Hashtable() { {"userno",userno}, { "cmnos", pay.cmnos } }).Count(); + var checklectuser = Dao.Get("lect.checkuser", new Hashtable() { {"userno", pplog.userno }, { "cmnos", pay.cmnos } }).Count(); if(checklectuser > 0) { return JsonOK(-4); diff --git a/Base/Controller/FCommon.cs b/Base/Controller/FCommon.cs index 0a0a34f..a0a961b 100644 --- a/Base/Controller/FCommon.cs +++ b/Base/Controller/FCommon.cs @@ -252,38 +252,38 @@ namespace NP.Base.Controllers public JsonResult savePPLog(VMCourse vm) { int rtn = 0; - PPLog ppllog = new PPLog(); - ppllog.uno = SUserInfo.UserNo; - ppllog.uip = GetUserIP(); - ppllog.cmno = vm.cmno; - ppllog.userno = vm.User.userno; - ppllog.asno = vm.Assign != null ? vm.Assign.asno : (long?)null; - ppllog.isready = Request["applicableCM"].ToString() == "정상접수" ? 0 : 1; - ppllog.cgcode = vm.stringval; - ppllog.cshape = !string.IsNullOrEmpty(vm.stringval2) ? Convert.ToInt32(vm.stringval2) : (int?)null; - ppllog.asname = string.Empty; + PPLog pplog = new PPLog(); + pplog.uno = SUserInfo.UserNo; + pplog.uip = GetUserIP(); + pplog.cmno = vm.cmno; + pplog.userno = vm.User.userno; + pplog.asno = vm.Assign != null ? vm.Assign.asno : (long?)null; + pplog.isready = Request["applicableCM"].ToString() == "정상접수" ? 0 : 1; + pplog.cgcode = vm.stringval; + pplog.cshape = !string.IsNullOrEmpty(vm.stringval2) ? Convert.ToInt32(vm.stringval2) : (int?)null; + pplog.asname = string.Empty; if (vm.stringval == "0") { - ppllog.typeman = !string.IsNullOrEmpty(vm.stringval3) ? Convert.ToInt32(vm.stringval3) : (int?)null; - ppllog.typeedu = !string.IsNullOrEmpty(vm.stringval4) ? Convert.ToInt32(vm.stringval4) : (int?)null; - ppllog.typegrade = !string.IsNullOrEmpty(vm.stringval5) ? Convert.ToInt32(vm.stringval5) : (int?)null; - ppllog.typejob = !string.IsNullOrEmpty(vm.stringval6) ? Convert.ToInt32(vm.stringval6) : (int?)null; + pplog.typeman = !string.IsNullOrEmpty(vm.stringval3) ? Convert.ToInt32(vm.stringval3) : (int?)null; + pplog.typeedu = !string.IsNullOrEmpty(vm.stringval4) ? Convert.ToInt32(vm.stringval4) : (int?)null; + pplog.typegrade = !string.IsNullOrEmpty(vm.stringval5) ? Convert.ToInt32(vm.stringval5) : (int?)null; + pplog.typejob = !string.IsNullOrEmpty(vm.stringval6) ? Convert.ToInt32(vm.stringval6) : (int?)null; } else { - ppllog.cgno = !string.IsNullOrEmpty(vm.stringval3) ? Convert.ToInt32(vm.stringval3) : (int?)null; + pplog.cgno = !string.IsNullOrEmpty(vm.stringval3) ? Convert.ToInt32(vm.stringval3) : (int?)null; } - ppllog.cmisno = !string.IsNullOrEmpty(Request["cmisno"]) ? Convert.ToInt64(Request["cmisno"]) : (long?)null; - ppllog.isrebate = !string.IsNullOrEmpty(Request["isrebate"]) ? Convert.ToInt32(Request["isrebate"]) : (int?)null; - ppllog.isaccommodation = !string.IsNullOrEmpty(Request["isaccommodation"]) ? Convert.ToInt32(Request["isaccommodation"].ToString()) : (int?)null; + pplog.cmisno = !string.IsNullOrEmpty(Request["cmisno"]) ? Convert.ToInt64(Request["cmisno"]) : (long?)null; + pplog.isrebate = !string.IsNullOrEmpty(Request["isrebate"]) ? Convert.ToInt32(Request["isrebate"]) : (int?)null; + pplog.isaccommodation = !string.IsNullOrEmpty(Request["isaccommodation"]) ? Convert.ToInt32(Request["isaccommodation"].ToString()) : (int?)null; #region 환급금 수령계좌 - if (ppllog.isrebate == 1) + if (pplog.isrebate == 1) { - ppllog.rbankname = !string.IsNullOrEmpty(Request["rbankname"]) ? Request["rbankname"].ToString() : null; - ppllog.rbankacc = !string.IsNullOrEmpty(Request["rbankacc"]) ? Request["rbankacc"].ToString() : null; - ppllog.rbankowner = !string.IsNullOrEmpty(Request["rbankowner"]) ? Request["rbankowner"].ToString() : null; + pplog.rbankname = !string.IsNullOrEmpty(Request["rbankname"]) ? Request["rbankname"].ToString() : null; + pplog.rbankacc = !string.IsNullOrEmpty(Request["rbankacc"]) ? Request["rbankacc"].ToString() : null; + pplog.rbankowner = !string.IsNullOrEmpty(Request["rbankowner"]) ? Request["rbankowner"].ToString() : null; } #endregion @@ -291,7 +291,7 @@ namespace NP.Base.Controllers var isCompany = !string.IsNullOrEmpty(Request["isCompany"]) ? Convert.ToInt32(Request["isCompany"]) : (int?)null; if (isCompany == 0) //개인 { - ppllog.asno = null; + pplog.asno = null; vm.Assign = null; } else if (isCompany == 1) //업체 @@ -307,53 +307,53 @@ namespace NP.Base.Controllers #region Assign if (vm.Assign != null) { - ppllog.asname = vm.Assign.asname; - ppllog.brno = vm.Assign.brno.IndexOf("-") > 0 ? vm.Assign.brno.Replace("-", "") : vm.Assign.brno; - ppllog.ceoname = vm.Assign.ceoname; - ppllog.post = vm.Assign.post; - ppllog.address1 = vm.Assign.address1; - ppllog.address2 = vm.Assign.address2; - ppllog.btype = vm.Assign.btype; - ppllog.bkind = vm.Assign.bkind; + pplog.asname = vm.Assign.asname; + pplog.brno = vm.Assign.brno.IndexOf("-") > 0 ? vm.Assign.brno.Replace("-", "") : vm.Assign.brno; + pplog.ceoname = vm.Assign.ceoname; + pplog.post = vm.Assign.post; + pplog.address1 = vm.Assign.address1; + pplog.address2 = vm.Assign.address2; + pplog.btype = vm.Assign.btype; + pplog.bkind = vm.Assign.bkind; Int64? fgnobno = (Int64?)null; if (Request.Files.GetMultiple("file1").Where(w => !string.IsNullOrEmpty(w.FileName)).Count() > 0) { fgnobno = SetFile(Request.Files.GetMultiple("file1").Where(w => !string.IsNullOrEmpty(w.FileName)).ToList(), fgnobno ?? 0, "assign", "fgnobno"); } - ppllog.fgnobno = fgnobno; + pplog.fgnobno = fgnobno; - ppllog.eino = vm.Assign.eino; - ppllog.mname = vm.Assign.mname; - ppllog.mphone = string.Format("{0}-{1}-{2}", vm.Assign.mphone1, vm.Assign.mphone2, vm.Assign.mphone3); - ppllog.taxemail = string.Format("{0}@{1}", vm.Assign.taxemail1, vm.Assign.taxemail2); + pplog.eino = vm.Assign.eino; + pplog.mname = vm.Assign.mname; + pplog.mphone = string.Format("{0}-{1}-{2}", vm.Assign.mphone1, vm.Assign.mphone2, vm.Assign.mphone3); + pplog.taxemail = string.Format("{0}@{1}", vm.Assign.taxemail1, vm.Assign.taxemail2); } #endregion #region User if (!string.IsNullOrEmpty(vm.User.userpno1) && !string.IsNullOrEmpty(vm.User.userpno2)) { - ppllog.userpno = string.Format("{0}{1}", vm.User.userpno1, vm.User.userpno2); + pplog.userpno = string.Format("{0}{1}", vm.User.userpno1, vm.User.userpno2); } - ppllog.mobile = string.Format("{0}-{1}-{2}", vm.User.mobile1, vm.User.mobile2, vm.User.mobile3); - ppllog.email = string.Format("{0}@{1}", vm.User.email1, vm.User.email2); - ppllog.upost = vm.User.post; - ppllog.uaddress1 = vm.User.address1; - ppllog.uaddress2 = vm.User.address2; - ppllog.isassignuser = vm.User.isassignuser; - ppllog.uduty = vm.User.uduty; - ppllog.slevel = vm.User.slevel; + pplog.mobile = string.Format("{0}-{1}-{2}", vm.User.mobile1, vm.User.mobile2, vm.User.mobile3); + pplog.email = string.Format("{0}@{1}", vm.User.email1, vm.User.email2); + pplog.upost = vm.User.post; + pplog.uaddress1 = vm.User.address1; + pplog.uaddress2 = vm.User.address2; + pplog.isassignuser = vm.User.isassignuser; + pplog.uduty = vm.User.uduty; + pplog.slevel = vm.User.slevel; #endregion - if (ppllog.asno != null) + if (pplog.asno != null) { - Dao.Save("cm.assign.applyedu.up", ppllog); + Dao.Save("cm.assign.applyedu.up", pplog); } - Dao.Save("cm.users.applyedu.up", ppllog); - Dao.Insert("cm.pplog.applyedu.in", ppllog); - if (ppllog.pplno > 0) + Dao.Save("cm.users.applyedu.up", pplog); + Dao.Insert("cm.pplog.applyedu.in", pplog); + if (pplog.pplno > 0) { - return JsonOK(ppllog.pplno); + return JsonOK(pplog.pplno); } return JsonOK(rtn); diff --git a/Dao/Dao.csproj b/Dao/Dao.csproj index 2c6106a..5c7fdcf 100644 --- a/Dao/Dao.csproj +++ b/Dao/Dao.csproj @@ -31,10 +31,6 @@ 4 - - ..\..\LMS_TSTI\Source\Core\NPTech.LMS.Core\bin\Release\Castle.DynamicProxy.dll - True - ..\References\Common.Logging.dll True diff --git a/Dao/MyBatis/Maps/Pay.xml b/Dao/MyBatis/Maps/Pay.xml index a3a7176..94a3dac 100644 --- a/Dao/MyBatis/Maps/Pay.xml +++ b/Dao/MyBatis/Maps/Pay.xml @@ -28,9 +28,9 @@ insert into pay(ptype,ispg,isgroup,userno,username,isexam,pstatus,rstatus,refunding,paylimit,payoktime,pgkey - ,orgamt,discamt,deliamt,isrefunddvr,payamt,refundamt,pplno,isbill,) + ,orgamt,discamt,deliamt,isrefunddvr,payamt,refundamt,pplno,isbill,iscashrct,) values (#ptype#,#ispg#,#isgroup#,#userno#,#username#,0,#pstatus#,#rstatus#,#refunding#,#paylimit#,case when #isinmoney# is not null then else #payoktime# end,#pgkey# - ,#orgamt#,#discamt#,#deliamt#,#isrefunddvr#,#payamt#,#refundamt#,#pplno#,#isbill#,); + ,#orgamt#,#discamt#,#deliamt#,#isrefunddvr#,#payamt#,#refundamt#,#pplno#,#isbill#,#iscashrct#,); SELECT LAST_INSERT_ID() diff --git a/Model/VMCM.cs b/Model/VMCM.cs index 30dba3f..404d535 100644 --- a/Model/VMCM.cs +++ b/Model/VMCM.cs @@ -56,6 +56,7 @@ namespace NP.Model public IList ExamUserRenews { get; set; } public IList userauths { get; set; } public Assign Assign { get; set; } + public PPLog PPLog { get; set; } } }