+ 교육신청

- 고용보험관리번호 위치 변경
        기존: 회사정보확인
        변경: 환급금 수령계좌 등록-예금주 아래
        * 고용보험관리번호는 오프라인강좌-환급 선택시에만 노출되어야 함
    - 회사정보확인 부분에서 담당자성명/담당자연락처 필수값 제외
    - 기존 회사정보(Assign) : 공란일시 업데이트 제외
    - 신청정보(pplog) : 공란으로 인서트

Dao/MyBatis/Maps/CM.xml

@@ -1898,16 +1898,16 @@
         ,asname=#asname#
         ,ceoname=#ceoname#
         ,brno  =#brno#
-        ,post  =#post#
-        ,address1=#address1#
-        ,address2=#address2#
-        ,btype =#btype#
-        ,bkind =#bkind#
+        <isNotEmpty property="post">,post  =#post#</isNotEmpty>
+        <isNotEmpty property="address1">,address1=#address1#</isNotEmpty>
+        <isNotEmpty property="address2">,address2=#address2#</isNotEmpty>
+        <isNotEmpty property="btype">,btype =#btype#</isNotEmpty>
+        <isNotEmpty property="bkind">,bkind =#bkind#</isNotEmpty>
         <isNotNull property="fgnobno">,fgnobno=#fgnobno#</isNotNull>
-        ,eino=#eino#
-        ,mname=#mname#
-        ,mphone =case when #mphone# is not null then HEX(AES_ENCRYPT(#mphone#, <include refid="sql.digest"></include>)) else mphone end
-        ,taxemail =case when #taxemail# is not null then HEX(AES_ENCRYPT(#taxemail#, <include refid="sql.digest"></include>)) else taxemail end
+        <isNotEmpty property="eino">,eino=#eino#</isNotEmpty>
+        <isNotEmpty property="mname">,mname=#mname#</isNotEmpty>
+        <isNotEmpty property="mphone">,mphone =case when #mphone# is not null then HEX(AES_ENCRYPT(#mphone#, <include refid="sql.digest"></include>)) else mphone end</isNotEmpty>
+        <isNotEmpty property="taxemail">,taxemail =case when #taxemail# is not null then HEX(AES_ENCRYPT(#taxemail#, <include refid="sql.digest"></include>)) else taxemail end</isNotEmpty>
         where asno=#asno#
       </update>
       <update id="cm.users.applyedu.up" parameterClass="hashtable">
@@ -1919,7 +1919,7 @@
         ,post            =case when #upost# is not null then #upost# else post end
         ,address1        =case when #uaddress1# is not null then #uaddress1# else address1 end
         ,address2        =case when #uaddress2# is not null then #uaddress2# else address2 end
-        ,uduty           = #uduty#
+        <isNotEmpty property="uduty">,uduty           = #uduty#</isNotEmpty>
         ,slevel          = #slevel#
         ,isassignuser    = #isassignuser#
         where userno=#userno#

FO/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>bin\app.publish\</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+  </PropertyGroup>
+</Project>

FO/Views/Course/ApplyEdu.cshtml

@@ -166,6 +166,10 @@
                         <th class="req">예금주</th>
                         <td><input type="text" name="rbankowner" id="rbankowner" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.rbankowner : string.Empty)" /></td>
                     </tr>
+                    <tr>
+                        <th class="req">고용보험관리번호</th>
+                        <td><input type="text" name="eino" id="eino" class="apyIpt" value="@(Model.PPLog != null ? Model.PPLog.eino : string.Empty)" /></td>
+                    </tr>
                 </tbody>
             </table>
             <p class="subDsc mt10">※ 환급금액 지급받는 계좌이므로 반드시 소속된 사업장의 법인계좌정보만 입력하여 주시기 바랍니다. (개인계좌 또는 사업주 개인의 계좌로는 환급이 불가합니다)</p>
@@ -179,6 +183,7 @@
             <p class="subDsc">*는 필수 입력사항입니다.</p>
             <p class="subDsc">계산서 발급을 원할 경우 담당자성명, 담당자연락처를 제외한 모든 사항 필수 입력을 해주세요.</p>
             @Html.HiddenFor(x => x.Assign.asno)
+            @Html.HiddenFor(x => x.Assign.eino)
             <table class="clsTable">
                 <tbody>
                     <tr>
@@ -222,11 +227,7 @@
                     <tr>
                         <th class="offreq">종목</th>
                         <td>@Html.TextBoxFor(x => x.Assign.bkind, new { @class = "apylpt", @maxlength = "50" })</td>
-                    </tr>
-                    <tr>
-                        <th class="offreq">고용보험관리번호</th>
-                        <td>@Html.TextBoxFor(x => x.Assign.eino, new { @class = "apylpt", @maxlength = "30" })</td>
-                    </tr>
+                    </tr>                   
                     <tr>
                         <th>담당자성명</th>
                         <td>@Html.TextBoxFor(x => x.Assign.mname, new { @class = "apylpt", @maxlength = "30" })</td>
@@ -407,9 +408,7 @@
     model.assign = @Html.Raw(Json.Encode(new List<NP.Model.Assign>() { Model.Assign }.Select(s => new { s.asno, s.asname }).First()));;
     model.pplog = @Html.Raw(Json.Encode(new List<NP.Model.PPLog>() { ( Model.PPLog != null ? Model.PPLog : new NP.Model.PPLog {}) }.Select(s => new { s.isrebate, s.isaccommodation, s.cmisno }).First()));;
     model.selMonth = @(Model.selMonth != null ? Model.selMonth.ToString() : "null");
-    model.iscompany = @(Model.isCompany != null ? Model.isCompany.ToString() : "null");
-    model.isonline = "@(Model.CM.cshape)" == "1" ? false : true;
-
+    model.iscompany = @(Model.isCompany != null ? Model.isCompany.ToString() : "null"); 
 
     $(document).ready(function () {
         $(".div-companyInfo").find(".clsTable").find("tr th").removeClass("req");
@@ -553,6 +552,7 @@
             setv("Assign_btype", capResult.obj.btype);
             setv("Assign_bkind", capResult.obj.bkind);
             setv("Assign_eino", capResult.obj.eino);
+            setv("eino", capResult.obj.eino);
             setv("Assign_mname", capResult.obj.mname);
             setv("Assign_mphone1", mphone1);
             setv("Assign_mphone2", mphone2);
@@ -561,7 +561,6 @@
             setv("Assign_taxemail2", taxemail2);
         }
     }
-
     function setScd() {
         capp("/focommon/GetScdForMixEdu", { cmno: model.cm.cmno, month: $("#selMonth").val() }, "renderScd");
     }
@@ -607,40 +606,38 @@
             $("input:radio[name='rdoScds'][value='" + model.pplog.cmisno + "']").click();
         }
     }
-
     function applyEdu() {
 
         var isrebate = $("input:radio[name='isrebate']:checked").val() == "1" ? true : false;
-        var isCompany = $("input:radio[name='isCompany']:checked").val() == "1" ? true : false;
-        var assign_mphone = val("Assign_mphone1").replace(/ /, '').replace(/	/, '') + val("Assign_mphone2").replace(/ /, '').replace(/	/, '') + val("Assign_mphone3").replace(/ /, '').replace(/	/, '');
+        var isCompany = $("input:radio[name='isCompany']:checked").val() == "1" ? true : false;        
         var assign_taxemail = val("Assign_taxemail1") + "@@" + val("Assign_taxemail2");
         var user_mobile = val("User_mobile1").replace(/ /, '').replace(/	/, '') + val("User_mobile2").replace(/ /, '').replace(/	/, '') + val("User_mobile3").replace(/ /, '').replace(/	/, '');
         var user_email = val("User_email1") + "@@" + val("User_email2");
         var isCompanyInfoCheck = false;
-        if (isrebate) {
+        if (isrebate || isCompany) {
             isCompanyInfoCheck = true;
         }
-        else if (isCompany) {
-            isCompanyInfoCheck = true;
+        if (isrebate && getBytes(val("eino")) == 11) {
+            setv("Assign_eino", val("eino"));
         }
 
         if (isrebate && check("rbankname", null, "은행명을 등록해주세요.")) { }
-        else if (isrebate && check("rbankacc", null, "계좌번호를 등록해주세요.")) { }
+        else if (isrebate && check("rbankacc", null, "계좌번호를 등록해주세요.")) { } 
         else if (isrebate && check("rbankowner", null, "예금주를 등록해주세요.")) { }
-        else if (isCompanyInfoCheck && model.isonline && check("Assign_asname", null, "회사명을 등록해주세요.")) { }
-        else if (isCompanyInfoCheck && model.isonline && check("Assign_brno", null, "사업자등록번호를 등록해주세요.")) { }
-        else if (isCompanyInfoCheck && model.isonline && getBytes(val("Assign_brno")) != 10) { focus("Assign_brno"); msg("10자리의 사업자번호를 등록해주세요."); }
-        else if (isCompanyInfoCheck && model.isonline && check("Assign_ceoname", null, "대표자성명을 등록해주세요.")) { }
-        else if (isCompanyInfoCheck && !model.isonline && (check("Assign_post", null, "우편번호를 등록해주세요.") || check("Assign_address1", null, "주소를 등록해주세요.") || check("Assign_address2", null, "상세주소를 등록해주세요."))) { }
-        else if (isCompanyInfoCheck && !model.isonline && check("Assign_btype", null, "업태를 등록해주세요.")) { }
-        else if (isCompanyInfoCheck && !model.isonline && check("Assign_bkind", null, "종목을 등록해주세요.")) { }
-        else if (isCompanyInfoCheck && !model.isonline && check("Assign_eino", null, "고용보험관리번호를 등록해주세요.")) { }
-        else if (isCompanyInfoCheck && !model.isonline && getBytes(val("Assign_eino")) != 11) { focus("Assign_eino"); msg("11자리의 고용보험관리번호를 등록해주세요."); }
-        //else if (isCompanyInfoCheck && check("Assign_mname", null, "담당자성명을 등록해주세요.")) { }
-        //else if (isCompanyInfoCheck && (check("Assign_mphone1", null, "담당자연락처를 등록해주세요.") || check("Assign_mphone2", null, "담당자연락처를 등록해주세요.") || check("Assign_mphone3", null, "담당자연락처를 등록해주세요."))) { }
-        //else if (isCompanyInfoCheck && !ismobilenumber(assign_mphone)) { focus("Assign_mphone1"); msg("담당자연락처를 확인해주세요."); }
-        else if (isCompanyInfoCheck && !model.isonline && (check("Assign_taxemail1", null, "계산서받을 이메일을 등록해주세요.") || check("Assign_taxemail2", null, "계산서받을 이메일을 등록해주세요."))) { }
-        else if (isCompanyInfoCheck && !model.isonline && !isemail(assign_taxemail)) { focus("Assign_taxemail1"); msg("올바른 이메일주소를 입력해주세요."); }
+        else if (isrebate && check("eino", null, "고용보험관리번호를 등록해주세요.")) { }
+        else if (isrebate && getBytes(val("eino")) != 11) { focus("eino"); msg("11자리의 고용보험관리번호를 등록해주세요."); }
+
+        else if (isCompanyInfoCheck && check("Assign_asname", null, "회사명을 등록해주세요.")) { }
+        else if (isCompanyInfoCheck && check("Assign_brno", null, "사업자등록번호를 등록해주세요.")) { }
+        else if (isCompanyInfoCheck && getBytes(val("Assign_brno")) != 10) { focus("Assign_brno"); msg("10자리의 사업자번호를 등록해주세요."); }
+        else if (isCompanyInfoCheck && check("Assign_ceoname", null, "대표자성명을 등록해주세요.")) { }
+
+        else if (isrebate && (check("Assign_post", null, "우편번호를 등록해주세요.") || check("Assign_address1", null, "주소를 등록해주세요.") || check("Assign_address2", null, "상세주소를 등록해주세요."))) { }
+        else if (isrebate && check("Assign_btype", null, "업태를 등록해주세요.")) { }
+        else if (isrebate && check("Assign_bkind", null, "종목을 등록해주세요.")) { }
+        else if (isrebate && (check("Assign_taxemail1", null, "계산서받을 이메일을 등록해주세요.") || check("Assign_taxemail2", null, "계산서받을 이메일을 등록해주세요."))) { }
+        else if (isrebate && !isemail(assign_taxemail)) { focus("Assign_taxemail1"); msg("올바른 이메일주소를 입력해주세요."); }
+
         else if (check("User_userpno1", null, "주민등록번호 앞자리를 입력하십시오.") || check("User_userpno2", null, "주민등록번호 뒷자리를 입력하십시오.")) { }
         else if (check("User_mobile1", null, "휴대전화를 등록해주세요.") || check("User_mobile2", null, "휴대전화를 등록해주세요.") || check("User_mobile3", null, "휴대전화를 등록해주세요.")) { }
         else if (!ismobilenumber(user_mobile)) { focus("mobile"); msg("휴대전화를 확인해주세요."); }

FO/Views/Course/ApplyPay.cshtml

@@ -12,7 +12,7 @@
     <input type="hidden" name="stringval6" value="@Model.stringval6" />@*직무분야*@
     <input type="hidden" name="pplno" value="@Model.pplno" />@*pplno*@
     <input type="hidden" name="selMonth" value="@Model.selMonth" />@*교육일정선택(selMonth)*@
-    <input type="hidden" name="isCompany" value="@Model.isCompany" />@*업체/개인 선택*@
+    <input type="hidden" name="isCompany" value="@Model.isCompany" />@*업체/개인 선택*@    
 </form>
 <form id="mform" name="mform" method="post" action="/Course/XpayREQ">
     @Html.HiddenFor(m => m.payno)