From 0ee5d3636c034eaef636491db7875f9b343a432b Mon Sep 17 00:00:00 2001 From: ksjihd163 Date: Wed, 31 Aug 2022 01:50:23 +0000 Subject: [PATCH] =?UTF-8?q?pms:6551=20pms:6538(ppt=20:=201,2=EB=B2=88=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0)=206551=EB=B2=88=20PPT=20=EC=82=AC=ED=95=AD?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Base/Controller/FCommon.cs | 2 +- Dao/MyBatis/Maps/Lect.xml | 17 +++++----- FO/Views/Course/ApplyAgree.cshtml | 31 +++++++++++------- FO/Views/Course/ApplyComplete.cshtml | 20 ++++++++---- FO/Views/Course/ApplyEdu.cshtml | 34 +++++++++++++------- FO/Views/Course/ApplyPay.cshtml | 24 +++++++++----- FO/Views/Course/SmartSearch.cshtml | 2 +- FO/Views/Home/Index.cshtml | 4 +-- FO/Views/My/LectureOn.cshtml | 48 +++++++++++++++++----------- FO/Views/My/PayInfo.cshtml | 2 +- FO/css/mypage.css | 4 +-- FO/css/style.css | 2 +- 12 files changed, 118 insertions(+), 72 deletions(-) diff --git a/Base/Controller/FCommon.cs b/Base/Controller/FCommon.cs index 1072602..ffb6e81 100644 --- a/Base/Controller/FCommon.cs +++ b/Base/Controller/FCommon.cs @@ -295,7 +295,7 @@ namespace NP.Base.Controllers #endregion #region 소속선택 - var isCompany = !string.IsNullOrEmpty(Request["isCompany"]) ? Convert.ToInt32(Request["isCompany"]) : (int?)null; + var isCompany = !string.IsNullOrEmpty(Request["isCompany1"]) ? Convert.ToInt32(Request["isCompany1"]) : (int?)null; if (isCompany == 0) //개인 { pplog.asno = null; diff --git a/Dao/MyBatis/Maps/Lect.xml b/Dao/MyBatis/Maps/Lect.xml index a354016..87cad3b 100644 --- a/Dao/MyBatis/Maps/Lect.xml +++ b/Dao/MyBatis/Maps/Lect.xml @@ -482,7 +482,7 @@ ,null etime,null studyplace,null days ,CAST(AES_DECRYPT(UNHEX(d.email), ) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), ) AS char) mobile from scdlect a - inner join cm b on b.ismaster=0 and b.cshape in (0,2) and b.isuse=1 and b.isdel=0 + inner join cm b on b.ismaster=0 and b.cshape in (0,1,2) and b.isuse=1 and b.isdel=0 inner join lect c on c.cmno=b.cmno and c.attrate < 80 and c.status=1 and c.ischanged=0 and date_format(c.edate,'%Y%m%d')=date_format(date_add(now(), interval a.dday day), '%Y%m%d') inner join users d on d.userno=c.userno and d.status=1 where a.scdno < 3 and a.isuse=1 and a.dtime=#dtime# @@ -493,7 +493,7 @@ ,null etime,null studyplace,null days ,CAST(AES_DECRYPT(UNHEX(d.email), ) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), ) AS char) mobile from scdlect a - inner join cm b on b.ismaster=0 and b.cshape in (0,2) and b.isuse=1 and b.isdel=0 + inner join cm b on b.ismaster=0 and b.cshape in (0,1,2) and b.isuse=1 and b.isdel=0 inner join lect c on c.cmno=b.cmno and c.status=1 and c.ischanged=0 and date_format(c.edate,'%Y%m%d')=date_format(date_add(now(), interval a.dday day), '%Y%m%d') inner join users d on d.userno=c.userno and d.status=1 inner join cmex e on e.cmno=c.cmno and e.extype=case when a.scdno=3 then 0 else 1 end and e.isdel=0 @@ -506,7 +506,7 @@ ,null etime,null studyplace,null days ,CAST(AES_DECRYPT(UNHEX(d.email), ) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), ) AS char) mobile from scdlect a - inner join cm b on b.ismaster=0 and b.cshape in (0,2) and b.isuse=1 and b.isdel=0 + inner join cm b on b.ismaster=0 and b.cshape in (0,1,2) and b.isuse=1 and b.isdel=0 inner join lect c on c.cmno=b.cmno and c.status=1 and c.ischanged=0 and date_format(c.edate,'%Y%m%d')=date_format(date_add(now(), interval a.dday day), '%Y%m%d') inner join users d on d.userno=c.userno and d.status=1 inner join cmsd e on e.cmno=c.cmno and e.sdtype=0 and e.isdel=0 @@ -519,7 +519,7 @@ ,null etime,null studyplace,null days ,CAST(AES_DECRYPT(UNHEX(d.email), ) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), ) AS char) mobile from scdlect a - inner join cm b on b.ismaster=0 and b.cshape in (0,2) and b.isuse=1 and b.isdel=0 + inner join cm b on b.ismaster=0 and b.cshape in (0,1,2) and b.isuse=1 and b.isdel=0 inner join lect c on c.cmno=b.cmno and c.status=1 and c.ischanged=0 and date_format(c.edate,'%Y%m%d')=date_format(date_add(now(), interval a.dday day), '%Y%m%d') inner join users d on d.userno=c.userno and d.status=1 inner join cmsd e on e.cmno=c.cmno and e.sdtype=1 and e.isdel=0 @@ -532,7 +532,7 @@ ,null etime,null studyplace,null days ,CAST(AES_DECRYPT(UNHEX(d.email), ) AS char) email,CAST(AES_DECRYPT(UNHEX(d.mobile), ) AS char) mobile from scdlect a - inner join cm b on b.ismaster=0 and b.cshape in (0,2) and b.isuse=1 and b.isdel=0 + inner join cm b on b.ismaster=0 and b.cshape in (0,1,2) and b.isuse=1 and b.isdel=0 inner join lect c on c.cmno=b.cmno and c.status=1 and c.ischanged=0 and date_format(c.edate,'%Y%m%d')=date_format(date_add(now(), interval a.dday day), '%Y%m%d') inner join users d on d.userno=c.userno and d.status=1 inner join cmrs e on e.cmno=c.cmno and e.rstype=0 and e.isdel=0 @@ -1398,7 +1398,8 @@ ,l.iscomplete ,c.studytime, cc.cname studyplacename, - cmis.studyplace + cmis.studyplace, + l.cdt 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 > @@ -1410,7 +1411,7 @@ LEFT OUTER JOIN comcode cc ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace' where a.ptype in (0,1,4) and a.userno=#userno# and a.pstatus in (21,22,51,55) and a.rstatus=0 and 1 = case when c.retime = '2099-12-31 23:59:59' and l.stime is not null then 0 else 1 end - order by sortpstatus, c.retime desc, b.payno,a.pino + order by sortpstatus,l.cdt desc, c.retime desc, b.payno,a.pino ) a union all select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9 @@ -1460,7 +1461,7 @@ LEFT OUTER JOIN comcode cc ON cc.ccode = cmis.studyplace and cc.cgroup ='studyplace' where a.userno=#userno# and a.status=1 and a.ischanged=0 and (case when a.sdate is null then b.sstime else a.sdate end) < - order by case when time2 > now() then 1 else 0 end desc ,sortedate desc, time2 desc + order by case when time2 > now() then 1 else 0 end asc ,sortedate asc, time2 asc ) a union all select a.dtype,a.intval,a.intval2,a.intval3,a.intval4,a.intval5,a.intval6,a.intval7,a.intval8,0 intval9 diff --git a/FO/Views/Course/ApplyAgree.cshtml b/FO/Views/Course/ApplyAgree.cshtml index 082c495..cc78582 100644 --- a/FO/Views/Course/ApplyAgree.cshtml +++ b/FO/Views/Course/ApplyAgree.cshtml @@ -16,6 +16,8 @@ @*업체/개인 선택*@ + +

신청강좌

@@ -147,7 +157,7 @@ ※수료증 소속부분에 기재될 내용으로 소속업체가 없으면 개인을 선택해 주세요.

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

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

@@ -160,7 +170,7 @@ 계좌번호 - + 예금주 @@ -168,7 +178,7 @@ 고용보험관리번호 - + @@ -177,7 +187,7 @@ } - @if (Model.Assign != null) + @if (Model.CM.isrefund == 1) {

회사정보 확인

diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml index 3bd5c75..7bc57c0 100644 --- a/FO/Views/Course/ApplyPay.cshtml +++ b/FO/Views/Course/ApplyPay.cshtml @@ -16,7 +16,8 @@ @*업체/개인 선택*@ - + +
@Html.HiddenFor(m => m.payno) @*강좌번호*@ @@ -48,28 +49,35 @@ string strEduInfo = ""; if (Model.SelectCMInningscd.studyplace != null) { - strStudyPlaceTmp = string.Format("[{0}교육장]", Model.SelectCMInningscd.studyplacename); - strStudyPlaceTmp2 = string.Format("{0}", Model.CM.cname); + strStudyPlaceTmp = Model.SelectCMInningscd.studyplacename + "교육장"; + strStudyPlaceTmp2 = Model.CM.cname; } else { - strStudyPlaceTmp = string.Format("{0}", Model.CM.cname); + strStudyPlaceTmp = Model.CM.cname; } if (Model.CM.cshape == 1) { strEduInfo = string.Format("교육기간 {0} | {2}시간과정 | {3}과정
교육비 : {4}원", Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0")); - } else { //Model.SelectCMInningscd.eend2 교육종료일 strEduInfo = string.Format("교육기간 {0} | 교육종료일 {1} | {2}시간과정 | {3}과정
교육비 : {4}원", - Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0")); + Model.SelectCMInningscd.scdInfoSummary, Model.SelectCMInningscd.eend2, Model.CM.studytime, (Model.CM.isrefund == 1 ? "환급" : "비환급"), Model.CM.infee.ToString("#,0")); } } -
+ + @if (Model.SelectCMInningscd.studyplace == null) + { +
+ } + else if (Model.SelectCMInningscd.studyplace != null) + { +
+ }

@@ -191,7 +199,7 @@ function save() { var isCompanyInfo = true; - $.each(model.pplog, function (key, value) { + $.each(model.pplog, function (key, value) { if (!value && key != "address2") { isCompanyInfo = false; return; diff --git a/FO/Views/Course/SmartSearch.cshtml b/FO/Views/Course/SmartSearch.cshtml index 040b87e..becaadf 100644 --- a/FO/Views/Course/SmartSearch.cshtml +++ b/FO/Views/Course/SmartSearch.cshtml @@ -444,7 +444,7 @@ //var seq = 0; if (capResult.obj.length < 1) { var li = $("
  • "); - li.append(""); + li.append(""); ulScd.append(li); } diff --git a/FO/Views/Home/Index.cshtml b/FO/Views/Home/Index.cshtml index 432f942..c1367f6 100644 --- a/FO/Views/Home/Index.cshtml +++ b/FO/Views/Home/Index.cshtml @@ -357,9 +357,9 @@ msg('교육목적을 선택해주세요.'); } else if ($(this).parent().attr('id') == 'msSel5') { msg('등급을 선택해주세요.'); - } else if ($(this).parent().attr('id') == 'msSel6' ) { + } @*else if ($(this).parent().attr('id') == 'msSel6' ) { msg('전문분야를 선택해주세요.'); - } + }*@ } }); if (@Model.isalreadyreq == 1) { diff --git a/FO/Views/My/LectureOn.cshtml b/FO/Views/My/LectureOn.cshtml index 9d11bdd..ad634e0 100644 --- a/FO/Views/My/LectureOn.cshtml +++ b/FO/Views/My/LectureOn.cshtml @@ -1,5 +1,10 @@ @model NP.Model.VMMy @{ + NP.Model.Lect shapeDatapic = Model.Lects.FirstOrDefault(); + if(shapeDatapic == null) + { + shapeDatapic = new NP.Model.Lect(); + } }
    @@ -55,7 +60,7 @@
    -
    변경
    +
    변경
    } @@ -74,16 +79,9 @@
    -
    - @if (Model.cmm.cshape == 1) - { -
    교육장교육 일정변경
    - } - else if (Model.cmm.cshape == 2) - { -
    교육종료일(수료일자) 변경
    - } - +
    +
    + @* *@
    @@ -117,22 +115,34 @@ function ps() { window.open("/My/CertSet"); } - function openScd(cmno, lectno) { + function openScd(cmno, lectno, cshape) { vLectno = lectno $(".mpgPop").show(); - setScd(cmno); + setScd(cmno, cshape); } - function setScd(cmno) { - capp("/focommon/GetScdForMixEdu", { cmno: cmno, lectno: vLectno }, "renderScdInning(" + cmno + ")"); + function setScd(cmno, cshape) { + capp("/focommon/GetScdForMixEdu", { cmno: cmno, lectno: vLectno, cshape: cshape }, "renderScdInning(" + cmno + "," + cshape + ")"); //20220809 // capp("/focommon/GetScdForMixEdu", { cmno: cmno, lectno: vLectno }, "renderScd"); } - function renderScdInning(cmno) { + function renderScdInning(cmno,cshape) { let strTmp = ""; var divScd = $("#divScd"); - + var divTitle = $("#divTitle"); + divTitle.empty(); + if (cshape == 1) + { + strTmp = "
    교육장교육 일정변경 "; + } + else if (cshape == 2) + { + strTmp = "
    교육종료일(수료일자) 변경 "; + } + strTmp += ""; + @*strTmp = strTmp + "";*@ + divTitle.append(strTmp); divScd.empty(); //강좌일정 태그 생성 @@ -173,12 +183,12 @@ if (d.isselected == 1) { //spanApplyClass.text("수강신청"); //aApplyClass.append(spanApplyClass); - pData.html(""); + pData.html(""); } else { //spanApplyClass.text("수강신청"); //aApplyClass.append(spanApplyClass); - pData.html(""); + pData.html(""); //pData.append(aApplyClass); } } diff --git a/FO/Views/My/PayInfo.cshtml b/FO/Views/My/PayInfo.cshtml index 0db5723..f426f44 100644 --- a/FO/Views/My/PayInfo.cshtml +++ b/FO/Views/My/PayInfo.cshtml @@ -16,7 +16,7 @@
    강좌 @Model.PayItem.cshapename - @Html.Raw(Model.PayItem.isrebate == 1 ? "환급" : "") + @Html.Raw(Model.PayItem.isrebate == 1 ? "환급과정" : "") @Model.PayItem.itemname
    @if (Model.PayItem.sdate != null && Model.PayItem.edate != null) diff --git a/FO/css/mypage.css b/FO/css/mypage.css index d2bad56..7cb7e90 100644 --- a/FO/css/mypage.css +++ b/FO/css/mypage.css @@ -277,7 +277,7 @@ .ltaList h5 span, .ltaList h5 b {font-size:13pt; display:inline-block; vertical-align:middle; height:20px; line-height:20px; margin-right:5px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} .ltaList h5 em {color:#238dfa; font-style:normal;} -.ltaList h5 span {color:#fff; /*background:#333583; */padding:0 10px; font-size:10pt;} +.ltaList h5 span {color:#fff; /*background:#333583; */padding:0 10px; font-size:10pt;font-weight:300;} .ltaList h5 span.nav_blu {background-color:#333583;} .ltaList h5 span.nav_grn {background-color:#77b743;} .ltaList h5 span.ppl {background:#a404b2} @@ -726,7 +726,7 @@ .payTlist h5 {white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} .payTlist h5 span, .payTlist b {display:inline-block; vertical-align:middle; height:20px; line-height:20px; font-weight:400;} -.payTlist h5 span {margin-right:5px; /*width:40px;*/ text-align:center; color:#fff; font-size:10pt; padding:0 8px;} +.payTlist h5 span {margin-right:5px; /*width:40px;*/ text-align:center; color:#fff; font-size:10pt; padding:0 8px;font-weight:300;} .payTlist h5 span.blu {background:#238dfa;} /*.payTlist h5 span.ppl {background:#333583;}*/ .payTlist h5 span.nav_blu {background-color:#333583;} diff --git a/FO/css/style.css b/FO/css/style.css index 5993d4b..0b42004 100644 --- a/FO/css/style.css +++ b/FO/css/style.css @@ -11042,7 +11042,7 @@ span.org { /* 인사말 */ .subTxt { font-size: 13pt; - color: #666; + color: #000; line-height: 1.8em; }