From a147990fa3d1397b72054ff23c20578d70dd61b2 Mon Sep 17 00:00:00 2001 From: ljs0531 Date: Sun, 4 Sep 2022 10:12:46 +0000 Subject: [PATCH] =?UTF-8?q?<=EA=B8=B0=EB=8A=A5=EA=B0=9C=EC=84=A0>=201.=20P?= =?UTF-8?q?MS=20NO=20:=206638=202.=20(=EC=A3=BC=EC=9A=94)=EC=9E=91?= =?UTF-8?q?=EC=97=85=EB=82=B4=EC=9A=A9=20:=202.=20=ED=98=84=EC=9E=AC=20?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=20=EC=A4=91=EC=9D=B8=20=EA=B5=90=EC=9C=A1=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20-=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=EA=B0=80=EB=8A=A5=ED=95=9C=20=EA=B5=90=EC=9C=A1=20?= =?UTF-8?q?=EC=A2=85=EB=A3=8C=EC=9D=BC=EC=9D=B4=20=EC=97=86=EC=8A=B5?= =?UTF-8?q?=EB=8B=88=EB=8B=A4=20=3D>=20-=EC=84=A0=ED=83=9D=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=9C=20=EA=B5=90=EC=9C=A1=EC=9D=BC=EC=A0=95?= =?UTF-8?q?=EC=9D=B4=20=EC=97=86=EC=8A=B5=EB=8B=88=EB=8B=A4.=20=EB=A1=9C?= =?UTF-8?q?=20=EB=AC=B8=EA=B5=AC=EB=B3=80=EA=B2=BD=20=EB=8B=A8=20=EA=B5=90?= =?UTF-8?q?=EC=9C=A1=EC=9E=A5=EA=B5=90=EC=9C=A1=EC=9D=BC=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=EC=97=90=EB=A7=8C=203.=20=EC=88=98=EA=B0=95=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=20=EC=A1=B0=ED=9A=8C=20=ED=95=9C=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EC=97=90=EC=84=9C=20=EC=A0=91=EC=88=98=EC=A4=91=20?= =?UTF-8?q?=EC=9C=84=EC=97=90=20=EA=B5=90=EC=9C=A1=EC=9E=A5=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=EC=B6=94=EA=B0=80=20(=EA=B5=90=EC=9C=A1=EC=9E=A5?= =?UTF-8?q?=EA=B5=90=EC=9C=A1=20=EC=8B=A0=EC=B2=A0=20=EC=8B=9C=20=EA=B5=90?= =?UTF-8?q?=EC=9C=A1=EC=9E=A5=20=EC=84=A0=ED=83=9D=ED=83=AD=3F=20=EC=9D=B4?= =?UTF-8?q?=20=EC=9E=88=EB=8A=94=EB=8D=B0=20=EC=98=A8=EB=9D=BC=EC=9D=B8=20?= =?UTF-8?q?=EA=B5=90=EC=9C=A1=EC=9D=80=20=EB=AF=B8=EC=A0=81=EC=9A=A9?= =?UTF-8?q?=EC=83=81=ED=83=9C.=204.=20=20=EC=98=A8=EB=9D=BC=EC=9D=B8?= =?UTF-8?q?=EA=B5=90=EC=9C=A1=20=EC=8B=A0=EC=B2=AD=20=EC=8B=9C=20=EC=86=8C?= =?UTF-8?q?=EC=86=8D=EC=84=A0=ED=83=9D=20=EB=B6=80=EB=B6=84=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=97=85=EC=B2=B4=EC=84=A0=ED=83=9D=20=EC=8B=9C=20?= =?UTF-8?q?=EC=97=85=EC=B2=B4=EC=A0=95=EB=B3=B4=EB=9E=80=EC=9D=B4=20?= =?UTF-8?q?=EB=82=98=EC=98=A4=EC=A7=80=20=EC=95=8A=EC=95=84=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=9E=85=EB=A0=A5=EC=9D=B4=20=EB=B6=88=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=20=EA=B7=B8=20=EC=83=81=ED=83=9C=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=88=98=EA=B0=95=EC=8B=A0=EC=B2=AD=EC=9D=84=20=EB=88=84?= =?UTF-8?q?=EB=A5=B4=EB=A9=B4=20=EC=95=8C=EB=A6=BC=EC=B0=BD=EC=9D=B4=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EB=90=98=EB=A9=B0=20=EC=8B=A0=EC=B2=AD?= =?UTF-8?q?=EC=9D=B4=20=EB=90=98=EC=A7=80=20=EC=95=8A=EC=9D=8C=205.=20?= =?UTF-8?q?=EB=AC=B8=EA=B5=AC=EC=88=98=EC=A0=95=206.=20=EB=AC=B8=EA=B5=AC?= =?UTF-8?q?=EC=B6=94=EA=B0=80=207=EB=B2=88=20=EB=AC=B8=EA=B5=AC=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EB=B0=8F=20=EC=B6=94=EA=B0=80=208=EB=B2=88=20?= =?UTF-8?q?=EB=82=98=EC=9D=98=20=ED=95=A0=20=EC=9D=BC=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EA=B5=90=EC=9C=A1=EC=9E=A5=EC=9D=80=20=EC=95=88=EB=B3=B4?= =?UTF-8?q?=EC=9D=B4=EA=B2=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (1) FO\Views\Course\SmartSearch.cshtml FO\Views\Course\ApplyEdu.cshtml FO\Views\Course\ApplyAgree.cshtml FO\Views\Course\ApplyPay.cshtml FO\Views\Course\ApplyComplete.cshtml Model\BaseModel.cs FO\Views\My\Index.cshtml Dao\MyBatis\Maps\Lect.xml --- Dao/MyBatis/Maps/Lect.xml | 22 +- FO/Views/Course/ApplyAgree.cshtml | 2 +- FO/Views/Course/ApplyComplete.cshtml | 14 +- FO/Views/Course/ApplyEdu.cshtml | 297 ++++++++++++++------------- FO/Views/Course/ApplyPay.cshtml | 290 ++++++++++++++------------ FO/Views/Course/SmartSearch.cshtml | 12 +- FO/Views/My/Index.cshtml | 78 +++---- Model/BaseModel.cs | 4 + 8 files changed, 390 insertions(+), 329 deletions(-) diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index 87cad3b..bc5a316 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -1368,9 +1368,10 @@ ,a.time5,a.time6 ,a.rno ,a.iscomplete - ,a.studytime, - a.studyplacename studyplacename, + ,a.studytime + ,a.studyplacename studyplacename, a.studyplace + ,a.cshape from( select 1 dtype ,d.tyear intval,d.tseq intval2,c.cshape intval3,a.pstatus intval4,case when e.rfdno is null then 0 else 1 end intval5,a.isrebate intval6,a.itemno intval7 @@ -1400,6 +1401,7 @@ cc.cname studyplacename, cmis.studyplace, l.cdt + ,c.cshape from payitem a inner join pay b on b.payno=a.payno and b.pstatus in (21,22,51,55) and b.rstatus < 2 inner join cm c on c.cmno=a.itemno and c.rstime < and c.retime > @@ -1425,6 +1427,7 @@ ,a.studytime, a.studyplacename studyplacename, a.studyplace + ,a.cshape from ( select 2 dtype ,c.tyear intval,c.tseq intval2,b.cshape intval3,0 intval4,0 intval5,a.isrebate intval6,a.cmno intval7,0 intval8 @@ -1452,6 +1455,7 @@ ,b.studytime, cc.cname studyplacename, cmis.studyplace + ,b.cshape from lect a inner join pay e on e.payno = a.payno inner join cm b on b.cmno=a.cmno @@ -1475,6 +1479,7 @@ ,a.studytime, a.studyplacename studyplacename, a.studyplace + ,a.cshape from ( select 3 dtype ,1 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8 @@ -1488,6 +1493,7 @@ ,b.studytime, cc.cname studyplacename, cmis.studyplace + ,b.cshape from lect a inner join cm b on b.cmno=a.cmno inner join cminning c on c.cmno=b.cmno and c.isonline=1 and c.isscd = 0 @@ -1511,6 +1517,7 @@ ,a.studytime, a.studyplacename studyplacename, a.studyplace + ,a.cshape from ( select 3 dtype ,2 intval,c.iseq intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8 @@ -1524,6 +1531,7 @@ ,b.studytime, cc.cname studyplacename, cmis.studyplace + ,b.cshape from lect a inner join cm b on b.cmno=a.cmno left outer join comcode bc on bc.ccode=b.studyplace @@ -1547,6 +1555,7 @@ ,a.studytime, a.studyplacename studyplacename, a.studyplace + ,a.cshape from ( select 3 dtype ,3 intval,0 intval2,b.classno intval3,c.extype intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8 @@ -1560,6 +1569,7 @@ ,b.studytime, cc.cname studyplacename, cmis.studyplace + ,b.cshape from lect a inner join cm b on b.cmno=a.cmno left outer join comcode bc on bc.ccode=b.studyplace @@ -1583,6 +1593,7 @@ ,a.studytime, a.studyplacename studyplacename, a.studyplace + ,a.cshape from ( select 3 dtype ,4 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8 @@ -1594,8 +1605,9 @@ ,row_number() over(order by b.setime) rno ,a.iscomplete ,b.studytime, - cc.cname studyplacename, + cc.cname as studyplacename, cmis.studyplace + ,b.cshape from lect a inner join cm b on b.cmno=a.cmno left outer join comcode bc on bc.ccode=b.studyplace @@ -1619,6 +1631,7 @@ ,a.studytime, a.studyplacename studyplacename, a.studyplace + ,a.cshape from ( select 3 dtype ,5 intval,0 intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,a.cmno intval7,0 intval8 @@ -1632,6 +1645,7 @@ ,b.studytime, cc.cname studyplacename, cmis.studyplace + ,b.cshape from lect a inner join cm b on b.cmno=a.cmno left outer join comcode bc on bc.ccode=b.studyplace @@ -1655,6 +1669,7 @@ ,a.studytime, a.studyplacename studyplacename, a.studyplace + ,a.cshape from ( select 4 dtype ,a.scdno intval,a.dday intval2,b.classno intval3,0 intval4,0 intval5,0 intval6,b.cmno intval7,0 intval8 @@ -1666,6 +1681,7 @@ ,b.studytime, cc.cname studyplacename, cmis.studyplace + ,b.cshape from alarms a inner join cm b on b.cmno=a.cmexno inner join lect c on c.cmno=b.cmno and c.userno=a.userno and c.status=1 and c.ischanged=0 diff --git a/FO/Views/Course/ApplyAgree.cshtml b/FO/Views/Course/ApplyAgree.cshtml index cc78582..59be0e8 100644 --- a/FO/Views/Course/ApplyAgree.cshtml +++ b/FO/Views/Course/ApplyAgree.cshtml @@ -149,7 +149,7 @@ - 건설사업관리기술인은 감리업무를 수행하는 기술인을 말합니다.
- 승급교육일 경우 등급은 승급 후 등급이 기재되어야 하며 승급대상 여부 등을 반드시 협회로 확인 해주세요.
- 승급교육 또는 계속교육을 인정받으려면 기본교육 및 최초교육을 먼저 이수하여야 합니다.
- - 모든 최초,승급,계속 교육 등은 직무분야 교육이며전문분야 관련으로 따로 이수하여야 할 교육은 없습니다. + - 모든 최초,승급,계속 교육 등은 직무분야 교육이며 전문분야 관련으로 따로 이수하여야 할 교육은 없습니다.

diff --git a/FO/Views/Course/ApplyComplete.cshtml b/FO/Views/Course/ApplyComplete.cshtml index 8f0971a..04a8074 100644 --- a/FO/Views/Course/ApplyComplete.cshtml +++ b/FO/Views/Course/ApplyComplete.cshtml @@ -78,6 +78,16 @@ else + + +

+
+

교육비 입금기한 안내

+ - 온라인교육 : 신청일로 부터 한 달 이내
+ - 교육장교육 : 교육시작일로 부터 7일 전까지 (단, 교육시작일이 7일 이내 인 경우 교육시작일 전 까지)
+

+ + if (Model.Pay.isready == 0 || Model.Pay.pstatus == 1 || Model.Pay.pstatus == 22) {

결제정보

@@ -101,7 +111,7 @@ else 주문접수일 - @DateTime.Now.ToString("yyyy-MM-dd HH:mm") (만료일: @Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm")) + @DateTime.Now.ToString("yyyy-MM-dd HH:mm") @*(만료일: @Model.Pay.paylimit.Value.ToString("yyyy-MM-dd HH:mm"))*@ } @@ -111,7 +121,7 @@ else diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml index 81244e3..2838d4d 100644 --- a/FO/Views/Course/ApplyEdu.cshtml +++ b/FO/Views/Course/ApplyEdu.cshtml @@ -157,38 +157,38 @@ ※수료증 소속부분에 기재될 내용으로 소속업체가 없으면 개인을 선택해 주세요.

- @if (Model.CM.isrefund ==1) + @if (Model.CM.isrefund == 1) { -
-

환급금 수령계좌 등록 (법인계좌만 입력가능)

-

*는 필수 입력사항입니다.

- - - - - - - - - - - - - - - - - - - -
은행명
계좌번호
예금주
고용보험관리번호
-

※ 환급금액 지급받는 계좌이므로 반드시 소속된 사업장의 법인계좌정보만 입력하여 주시기 바랍니다. (개인계좌 또는 사업주 개인의 계좌로는 환급이 불가합니다)

-
+
+

환급금 수령계좌 등록 (법인계좌만 입력가능)

+

*는 필수 입력사항입니다.

+ + + + + + + + + + + + + + + + + + + +
은행명
계좌번호
예금주
고용보험관리번호
+

※ 환급금액 지급받는 계좌이므로 반드시 소속된 사업장의 법인계좌정보만 입력하여 주시기 바랍니다. (개인계좌 또는 사업주 개인의 계좌로는 환급이 불가합니다)

+
} - @if (Model.CM.isrefund == 1) - { + @*@if (Model.CM.isrefund == 1) + {*@

회사정보 확인

*는 필수 입력사항입니다.

@@ -273,124 +273,124 @@
- } -

개인정보 확인

-

*는 필수 입력사항입니다.

- @Html.HiddenFor(x => x.User.userno) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
이름

@Html.TextBoxFor(x => x.User.username, new { @class = "apylpt", @maxlength = "10", @style = "background-color:#ddd;", @readonly = true })

주민등록번호 -
    -
  • @Html.TextBoxFor(x => x.User.userpno1, new { @maxlength = "6", @readonly = "readonly", @style = "background-color:#ddd;" })
    • -
  • -
    • -
  • @Html.TextBoxFor(x => x.User.userpno2, new { @maxlength = "7", @readonly = "readonly", @style = "background-color:#ddd;" })
    • -
-
휴대전화 -
    -
  • @Html.TextBoxFor(x => x.User.mobile1, new { @maxlength = "3", @readonly = "readonly", @style = "background-color:#ddd;" })
    • -
  • -
    • -
  • @Html.TextBoxFor(x => x.User.mobile2, new { @maxlength = "4", @readonly = "readonly", @style = "background-color:#ddd;" })
    • -
  • -
    • -
  • @Html.TextBoxFor(x => x.User.mobile3, new { @maxlength = "4", @readonly = "readonly", @style = "background-color:#ddd;" })
    • -
-
이메일 -
    -
  • @Html.TextBoxFor(x => x.User.email1, new { @maxlength = "100" })
    • -
  • ＠
    • -
  • @Html.TextBoxFor(x => x.User.email2, new { @maxlength = "30" })
    • -
-
주소 -
    -
  • - @Html.TextBoxFor(x => x.User.post, new { @class = "postno", @style = "background-color:#ddd;", @readonly = true }) -
    • -
  • - @Html.TextBoxFor(x => x.User.address1, new { @class = "postadr", @style = "background-color:#ddd;", @readonly = true, @placeholder = "주소입력" }) -
    • -
  • - @Html.TextBoxFor(x => x.User.address2, new { @class = "postadrsub", @placeholder = "나머지 주소입력", @maxlength = "200" }) -
    • -
  • - 우편번호검색 -
    • -
-
채용형태 -
    -
  • - @Html.RadioButtonFor(model => model.User.isassignuser, "1", new { @name = "recruit", @checked = "checked" })정규직 -
    • -
  • - @Html.RadioButtonFor(model => model.User.isassignuser, "0", new { @name = "recruit" })비정규직 -
    • -
-
직위 - @Html.TextBoxFor(x => x.User.uduty, new { @class = "apylpt", @maxlength = "20" }) -
학력 -
    -
  • - @Html.RadioButtonFor(model => model.User.slevel, "0", new { @name = "eduGrade", @checked = "checked" })기타 -
    • -
  • - @Html.RadioButtonFor(model => model.User.slevel, "1", new { @name = "eduGrade" })고졸 -
    • -
  • - @Html.RadioButtonFor(model => model.User.slevel, "2", new { @name = "eduGrade" })학사 -
    • -
  • - @Html.RadioButtonFor(model => model.User.slevel, "3", new { @name = "eduGrade" })석사 -
    • -
  • - @Html.RadioButtonFor(model => model.User.slevel, "4", new { @name = "eduGrade" })박사 -
    • -
-
+ @*}*@ +

개인정보 확인

+

*는 필수 입력사항입니다.

+ @Html.HiddenFor(x => x.User.userno) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
이름

@Html.TextBoxFor(x => x.User.username, new { @class = "apylpt", @maxlength = "10", @style = "background-color:#ddd;", @readonly = true })

주민등록번호 +
    +
  • @Html.TextBoxFor(x => x.User.userpno1, new { @maxlength = "6", @readonly = "readonly", @style = "background-color:#ddd;" })
    • +
  • -
    • +
  • @Html.TextBoxFor(x => x.User.userpno2, new { @maxlength = "7", @readonly = "readonly", @style = "background-color:#ddd;" })
    • +
+
휴대전화 +
    +
  • @Html.TextBoxFor(x => x.User.mobile1, new { @maxlength = "3", @readonly = "readonly", @style = "background-color:#ddd;" })
    • +
  • -
    • +
  • @Html.TextBoxFor(x => x.User.mobile2, new { @maxlength = "4", @readonly = "readonly", @style = "background-color:#ddd;" })
    • +
  • -
    • +
  • @Html.TextBoxFor(x => x.User.mobile3, new { @maxlength = "4", @readonly = "readonly", @style = "background-color:#ddd;" })
    • +
+
이메일 +
    +
  • @Html.TextBoxFor(x => x.User.email1, new { @maxlength = "100" })
    • +
  • ＠
    • +
  • @Html.TextBoxFor(x => x.User.email2, new { @maxlength = "30" })
    • +
+
주소 +
    +
  • + @Html.TextBoxFor(x => x.User.post, new { @class = "postno", @style = "background-color:#ddd;", @readonly = true }) +
    • +
  • + @Html.TextBoxFor(x => x.User.address1, new { @class = "postadr", @style = "background-color:#ddd;", @readonly = true, @placeholder = "주소입력" }) +
    • +
  • + @Html.TextBoxFor(x => x.User.address2, new { @class = "postadrsub", @placeholder = "나머지 주소입력", @maxlength = "200" }) +
    • +
  • + 우편번호검색 +
    • +
+
채용형태 +
    +
  • + @Html.RadioButtonFor(model => model.User.isassignuser, "1", new { @name = "recruit", @checked = "checked" })정규직 +
    • +
  • + @Html.RadioButtonFor(model => model.User.isassignuser, "0", new { @name = "recruit" })비정규직 +
    • +
+
직위 + @Html.TextBoxFor(x => x.User.uduty, new { @class = "apylpt", @maxlength = "20" }) +
학력 +
    +
  • + @Html.RadioButtonFor(model => model.User.slevel, "0", new { @name = "eduGrade", @checked = "checked" })기타 +
    • +
  • + @Html.RadioButtonFor(model => model.User.slevel, "1", new { @name = "eduGrade" })고졸 +
    • +
  • + @Html.RadioButtonFor(model => model.User.slevel, "2", new { @name = "eduGrade" })학사 +
    • +
  • + @Html.RadioButtonFor(model => model.User.slevel, "3", new { @name = "eduGrade" })석사 +
    • +
  • + @Html.RadioButtonFor(model => model.User.slevel, "4", new { @name = "eduGrade" })박사 +
    • +
+
- + - + @Html.Partial("./Partial/BoxAssign", null, new ViewDataDictionary { { "bindmethod", "bindassign" } }) @section styles{