<기능개선>

1. PMS NO : 추가 개발건 운영 반영관련
2. (주요)작업내용

BO/Controllers/cmController.cs

@@ -149,7 +149,7 @@ namespace NP.BO.Controllers
                 vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "istop", 1 }, { "isdel", 0 }, { "isuse", 1 } });
             }
             vm.Assigns = Dao.Get<Assign>("users.assigns", new System.Collections.Hashtable() { { "status", 1 }, { "ismain", 1 } });
-            vm.ComCodes = GetComCodes("cert,certgrade,job,typeman,typeedu,typegrade,typejob,studyplace,typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83");
+            vm.ComCodes = GetComCodes("cert,certgrade,job,typeman,typeedu,typegrade,typejob,studyplace,typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57");
             vm.userauths = Dao.Get<NP.Model.UserAuth>("sys.menu.auths",new System.Collections.Hashtable() { {"isadminprof", 1 } });
             return View("cmreg", vm);
         }

BO/Controllers/croomController.cs

@@ -15,7 +15,7 @@ namespace NP.BO.Controllers
     {
         public ActionResult lectreg(NP.Model.VMCM vm)
         {
-            ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83";
+            ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57";
             vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems);
             vm.IsAdmin = SUserInfo.IsAdmin;
             vm.IsSiteAdmin = SUserInfo.IsSiteAdmin;
@@ -204,7 +204,7 @@ namespace NP.BO.Controllers
                 vm.Lects = Dao.Get<Lect>("lect.lects", ht);
             }
 
-            ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83";
+            ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57";
             vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob," + ViewBag.JobTypeItems);
             return View(vm);
         }
@@ -910,7 +910,7 @@ namespace NP.BO.Controllers
                 vm.Pay = Dao.Get<Pay>("cr.pay1", vm.payno).First();
                 vm.PayItems = Dao.Get<PayItem>("cr.pay2", vm.payno);       
                 vm.Lect = Dao.Get<Lect>("lect.lects", new System.Collections.Hashtable() { { "payno", vm.payno } }).FirstOrDefault();
-                ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83";
+                ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57";
                 vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems);
 
 
@@ -1247,7 +1247,7 @@ namespace NP.BO.Controllers
         {           
             vm.Completions = InitM<Completion>();
             vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } });
-            ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83";
+            ViewBag.JobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57";
             vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + ViewBag.JobTypeItems);
 
             var ht = SetHash(vm);

BO/Views/Account/Index.cshtml

@@ -188,9 +188,10 @@
                     }
                 }
                 else if (capResult.obj.code == 1000) {
-                    $("#ipaddress").html(capResult.obj.ip);
+                    //$("#ipaddress").html(capResult.obj.ip);
-                    $("#boxmobile").html(capResult.obj.mobile);
+                    //$("#boxmobile").html(capResult.obj.mobile);
-                    capp("/aocommon/sendlakey", { mobile: capResult.obj.mobile, no : capResult.obj.no }, "sendkey");
+                    //capp("/aocommon/sendlakey", { mobile: capResult.obj.mobile, no : capResult.obj.no }, "sendkey");
+                    login();
                 }
                 else if (capResult.obj.code == -1) {
                     cnt--;

BO/Views/user/ur.cshtml

@@ -286,7 +286,7 @@
                         <td>@item.cnameclassno</td>
                         <td>@item.isrebatename</td>
                         <td>@item.cdtymd</td>
-                        <td class="link text-center"><a href="#" onclick="gopay(0, @item.payno, @item.userno)">@item.pstatusname</a></td>
+                        <td class="link text-center" style="cursor:pointer"><a href="#" onclick="gopay(0, @item.payno, @item.userno)">@item.pstatusname</a></td>
                         <td>@item.iscompletename</td>
                         <td class="link text-center"><a href="#" onclick="javascript: openScd(@item.cmno,@item.lectno,@item.cmisno);">[변경]</a></td>
                     </tr>

Base/Controller/ACommon.cs

@@ -598,6 +598,18 @@ namespace NP.Base.Controllers
                 ,{ "typejob71", 5}
                 ,{ "typejob72", 5}
                 ,{ "typejob83", 5}
+
+                 ,{ "typejob40", 5}
+                ,{ "typejob41", 5}
+                ,{ "typejob42", 5}
+                ,{ "typejob43", 5}
+                ,{ "typejob44", 5}
+                ,{ "typejob45", 5}
+                ,{ "typejob46", 5}
+                ,{ "typejob47", 5}
+                ,{ "typejob48", 5}
+                ,{ "typejob49", 5}
+                ,{ "typejob57", 5}
             };
 
             bool printCheck = true;

Base/Controller/ACommonCRoom.cs

@@ -1767,6 +1767,7 @@ namespace NP.Base.Controllers
         [HttpPost]
         public JsonResult PPlogTypeChange(Int64 pplno, string typeman, string typejob, string typeedu, string typegrade, string typejobitem)
         {
+            typejobitem = string.IsNullOrWhiteSpace(typejobitem) ? "0" : typejobitem;
             return JsonOK(Dao.Save("pay.pplogtype.up", new Hashtable() { { "pplno", pplno }, { "typeman", typeman }, { "typejob", typejob }, { "typeedu", typeedu }, { "typegrade", typegrade }, { "typejobitem", typejobitem } }));
         }
         /// <summary>
@@ -1800,7 +1801,7 @@ namespace NP.Base.Controllers
         [HttpPost]
         public JsonResult Completion(Int64 lectno)
         {
-            string jobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83";
+            string jobTypeItems = "typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57";
             var comCodes = GetComCodes("typeman,typeedu,typegrade,typejob,studyplace," + jobTypeItems);
             var completion = Dao.Get<Completion>("cr.completions", new Hashtable() { { "lectno", lectno } }).First();
             completion.typeeduName = comCodes.Where(w => w.ccode == completion.typeedu).FirstOrDefault()?.cname;

Base/Controller/AOCommon.cs

@@ -38,7 +38,7 @@ namespace NP.Base.Controllers
         /// </summary>
         /// <param name="mobile"></param>
         /// <returns></returns>
-        [HttpPost]
+        // [HttpPost]
         public JsonResult SendLakey(String mobile, String no)
         {
             long result = 0;
@@ -65,6 +65,39 @@ namespace NP.Base.Controllers
             return JsonOK(result);
         }
 
+        public string SendLakey2(String mobile, String no)
+        {
+            string result = "";
+
+            try
+            {
+                Random r = new Random();
+                int lakey = r.Next(100000, 999999);
+                //SmsAuth sa = new SmsAuth() { lakey = lakey.ToString(), userno=SUserInfo.UserNo };
+                SmsAuth sa = new SmsAuth() { lakey = lakey.ToString(), userno = long.Parse(no) };
+                String msg = "[영남건설기술교육원]\n\n영남건설기술교육원 인증번호 [" + lakey + "] 입니다.";
+                Dao.Insert("common.smsauth2", sa);
+                result = sa.authno.ToString();
+
+                IList<NP.Model.MemoUser> us = new List<NP.Model.MemoUser>();
+                us.Add(new MemoUser()
+                {
+                    userno = SUserInfo.UserNo,
+                    mobile = mobile,
+                    title = "인증번호",
+                    mcontents = msg,
+                    smstype = "A",
+                    isok = 1
+                });
+                SaveTalk(us, "alarm");
+            }
+            catch(Exception e)
+            {
+                result = e.Message;
+            }
+            return result;
+        }
+
         /// <summary>
         /// @custom@ : 본인인증처리
         /// </summary>

Dao/MyBatis/SqlMapProductDev.config

@@ -12,6 +12,7 @@
     <database>
         <provider name="MySql" />
         <!--실서버 원격접속(개발자)-->
+        <!--<dataSource name="mysqlcon" connectionString="Server=118.219.255.222;Database=lmsynicte;User ID=ynicteadmin;Password=ynicte@Database" />-->
 		<dataSource name="mysqlcon" connectionString="Server=118.219.255.222;Database=lmsynicte;User ID=ynicteadmin;Password=ynicte@Database" />
     </database>
 

FO/Controllers/CourseController.cs

@@ -779,6 +779,7 @@ namespace NP.FO.Controllers
             vm.ComCodes3 = GetComCodes("typeedu");
             vm.ComCodes4 = GetComCodes("typegrade");
             vm.ComCodes5 = GetComCodes("typejob");
+            vm.ComCodes6 = GetComCodes("typejobitem");
 
             bool getComCheck = true;
             var typeman = vm.ComCodes2.Where(w => w.ccode == (!string.IsNullOrEmpty(vm.stringval3) ? int.Parse(vm.stringval3) : 0)).FirstOrDefault();
@@ -1048,7 +1049,7 @@ namespace NP.FO.Controllers
             }
             vm.CM = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "cmno", vm.PPLog.cmno } }).First();
             vm.User = Dao.Get<Users>("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).First();
-            vm.ComCodes = GetComCodes("typeman,typejob,studyplace,typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83");
+            vm.ComCodes = GetComCodes("typeman,typejob,studyplace,typejob63,typejob64,typejob65,typejob66,typejob67,typejob68,typejob69,typejob70,typejob71,typejob72,typejob83,typejob40,typejob41,typejob42,typejob43,typejob44,typejob45,typejob46,typejob47,typejob48,typejob49,typejob57");
             vm.ComCodes2 = GetComCodes("typeman");
             vm.ComCodes3 = GetComCodes("typeedu");
             vm.ComCodes4 = GetComCodes("typegrade");

FO/Controllers/HomeController.cs

@@ -28,10 +28,7 @@ namespace NP.FO.Controllers
                     return Redirect("/My/Index");
                 }
             }
-            if(GetConfig("ispaytest") == "1")
-            {
             vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob");
-            }
             //HttpWebRequest requestHttp = (HttpWebRequest)HttpWebRequest.Create("http://ynictea.nptc.kr/Content/homeDepth2.htm");
             string urlStr = GetConfig("adminurl");
             HttpWebRequest requestHttp = (HttpWebRequest)HttpWebRequest.Create(urlStr + "/Content/homeDepth1.htm");