KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

<기능개선> 

1. PMS NO : 
2. (주요)작업내용 : 수강신청시 교육일정 시작 종료의 값으로 lect에 넣기, 교육일정변경 팝업
	/Base/Controller/FCommonPay.cs
	/Dao/MyBatis/Maps/Lect.xml
	/Dao/MyBatis/Maps/Pay.xml
	/FO/Controllers/CourseController.cs
	/FO/Controllers/FOBaseController.cs
	/FO/Controllers/MyController.cs
	/FO/Views/Course/ApplyPay.cshtml
	/FO/Views/Course/SmartSearch.cshtml
	/FO/Views/Course/XpayREQ.cshtml
	/FO/Views/My/LectureOn.cshtml
This commit is contained in:
shjang 2022-08-10 00:34:44 +00:00
parent 695e29c2ac
commit 0483aef5dc
10 changed files with 233 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Base/Controller/FCommonPay.cs
View File

@ -168,6 +168,7 @@ namespace NP.Base.Controllers
{ {
return JsonBack(new JsonRtn() { code = 1000, msg = "승인된 승인대기신청데이터가 아닙니다.", obj = 0 }); return JsonBack(new JsonRtn() { code = 1000, msg = "승인된 승인대기신청데이터가 아닙니다.", obj = 0 });
} }
vm.PayItems = new List<PayItem>() { }; vm.PayItems = new List<PayItem>() { };
if (vm.payno > 0) if (vm.payno > 0)
{ {
@ -250,6 +251,7 @@ namespace NP.Base.Controllers
}); });
} }
} }
if (vm.isgroup == 1) if (vm.isgroup == 1)
{ {
@ -288,6 +290,7 @@ namespace NP.Base.Controllers
} }
} }
} }
//교재확인 //교재확인
if (!vm.ispaycert && vm.PayItems.Where(w => w.ptype == 2).Count() > 0) if (!vm.ispaycert && vm.PayItems.Where(w => w.ptype == 2).Count() > 0)
{ {
@ -303,6 +306,7 @@ namespace NP.Base.Controllers
pi.orgamt = pi.payamt = b.price * (pi.pcnt < 1 ? 1 : pi.pcnt); pi.orgamt = pi.payamt = b.price * (pi.pcnt < 1 ? 1 : pi.pcnt);
} }
} }
if (vm.ispaycert) if (vm.ispaycert)
{ {
//자격증강좌 결제 시작 //자격증강좌 결제 시작
@ -438,6 +442,7 @@ namespace NP.Base.Controllers
{ {
vm.Pay.ptype = 1; vm.Pay.ptype = 1;
} }
if (Dao.PayIn(vm.Pay) > 0) if (Dao.PayIn(vm.Pay) > 0)
{ {
var pginfos = GetConfig("pginfo").Split('|'); var pginfos = GetConfig("pginfo").Split('|');

5
Dao/MyBatis/Maps/Lect.xml
View File

@ -1603,10 +1603,11 @@
left outer join cminningscd scd on scd.cmisno = a.cmisno left outer join cminningscd scd on scd.cmisno = a.cmisno
left outer join cminning ci on ci.cmino = scd.cmino left outer join cminning ci on ci.cmino = scd.cmino
left outer join comcode cc on cc.ccode = b.studyplace left outer join comcode cc on cc.ccode = b.studyplace
where a.userno=#userno# and a.status=1 and a.ischanged=0 and a.sdate &lt; <include refid="sql.now"></include> where a.userno=#userno# and a.status=1 and a.ischanged=0 <!-- 20220810 and a.sdate &lt; <include refid="sql.now"></include>-->
<!--20220810 where a.userno=#userno# and a.status=1 and a.ischanged=0 and a.sdate &lt; <include refid="sql.now"></include>-->
<isNotNull property="cshape">and b.cshape=#cshape#</isNotNull> <isNotNull property="cshape">and b.cshape=#cshape#</isNotNull>
<isNotNull property="issubtable"> <isNotNull property="issubtable">
and (ifnull(a.iscomplete,0) = 0 and b.cshape = 2 and scd.estart &gt; '1900-01-01' and scd.eend &gt; '1900-01-01' and (ifnull(a.iscomplete,0) = 0 <!-- 20220810 and b.cshape = 2 --> and scd.estart &gt; '1900-01-01' and scd.eend &gt; '1900-01-01'
<!--and scd.estart &gt; now()--> <!--and scd.estart &gt; now()-->
<!--and (date_add(scd.eend,interval +5 day) &gt; date_format(now(),'%Y-%m-%d 23:59:59'))--> <!--and (date_add(scd.eend,interval +5 day) &gt; date_format(now(),'%Y-%m-%d 23:59:59'))-->
and date_add(a.cdt, interval +1 year) &gt;= date_format(now(),'%Y-%m-%d 23:59:59')) and date_add(a.cdt, interval +1 year) &gt;= date_format(now(),'%Y-%m-%d 23:59:59'))

120
Dao/MyBatis/Maps/Pay.xml
View File

@ -46,10 +46,16 @@
<update id="pay.lect.sedate.save" parameterClass="pay"> <update id="pay.lect.sedate.save" parameterClass="pay">
update lect a update lect a
inner join cm b on a.cmno = b.cmno inner join cm b on a.cmno = b.cmno
inner join pay c on a.payno = c.payno <!--20220809 inner join pay c on a.payno = c.payno-->
left outer join cminningscd d on d.cmisno = a.cmisno left outer join cminningscd d on d.cmisno = a.cmisno
set set
a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') a.sdate =
case
when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
else date_format(a.cdt,'%Y-%m-%d 00:00:00')
end
, a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
<!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00')
else else
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
else b.sstime end else b.sstime end
@ -64,9 +70,10 @@
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
else b.setime else b.setime
end end
end end-->
,a.udt=now(),a.uno=#uno#,a.uip=#uip# ,a.udt=now(),a.uno=#uno#,a.uip=#uip#
where a.payno = #payno# and c.pstatus = 1 where a.payno = #payno#;
<!--20220809 and c.pstatus = 1-->
</update> </update>
<select id="pay.paydvrs" parameterClass="hashtable" resultClass="paydvr"> <select id="pay.paydvrs" parameterClass="hashtable" resultClass="paydvr">
select a.* select a.*
@ -302,10 +309,16 @@
<!--수강시작일 / 종료일 추가 2021-01-21--> <!--수강시작일 / 종료일 추가 2021-01-21-->
update lect a update lect a
inner join cm b on a.cmno = b.cmno inner join cm b on a.cmno = b.cmno
inner join pay c on a.payno = c.payno <!--20220809 inner join pay c on a.payno = c.payno-->
left outer join cminningscd d on a.cmisno = d.cmisno left outer join cminningscd d on a.cmisno = d.cmisno
set set
a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') a.sdate =
case
when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
else date_format(a.cdt,'%Y-%m-%d 00:00:00')
end
, a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
<!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00')
else else
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
else b.sstime end else b.sstime end
@ -320,8 +333,9 @@
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
else b.setime else b.setime
end end
end end-->
where a.payno = #payno# and c.pstatus = 1 where a.payno = #payno#;
<!--20220809 and c.pstatus = 1-->
</update> </update>
<update id="pay.paydvr.save" parameterClass="hashtable"> <update id="pay.paydvr.save" parameterClass="hashtable">
update paydvr set <include refid="sql.up"></include> update paydvr set <include refid="sql.up"></include>
@ -353,10 +367,16 @@
update lect a update lect a
inner join cm b on a.cmno = b.cmno inner join cm b on a.cmno = b.cmno
inner join pay c on a.payno = c.payno <!--20220809 inner join pay c on a.payno = c.payno-->
left outer join cminningscd d on d.cmisno = a.cmisno left outer join cminningscd d on d.cmisno = a.cmisno
set set
a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') a.sdate =
case
when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
else date_format(a.cdt,'%Y-%m-%d 00:00:00')
end
, a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
<!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00')
else else
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
else b.sstime end else b.sstime end
@ -371,8 +391,9 @@
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
else b.setime else b.setime
end end
end end-->
where a.payno = #payno# and c.pstatus = 1 and c.payoktime is not null; where a.payno = #payno#;
<!--20220809 and c.pstatus = 1 and c.payoktime is not null;-->
</update> </update>
<select id="pay.pay" parameterClass="hashtable" resultClass="pay"> <select id="pay.pay" parameterClass="hashtable" resultClass="pay">
select a.payno,a.ptype,a.isgroup,a.isexam,a.userno,a.pstatus,a.payamt,a.rstatus,a.refundamt,a.ispg,a.paylimit select a.payno,a.ptype,a.isgroup,a.isexam,a.userno,a.pstatus,a.payamt,a.rstatus,a.refundamt,a.ispg,a.paylimit
@ -432,10 +453,16 @@
<!--수강시작일 / 종료일 추가 2021-01-21--> <!--수강시작일 / 종료일 추가 2021-01-21-->
update lect a update lect a
inner join cm b on a.cmno = b.cmno inner join cm b on a.cmno = b.cmno
inner join pay c on a.payno = c.payno <!--20220809 inner join pay c on a.payno = c.payno-->
left outer join cminningscd d on d.cmisno = a.cmisno left outer join cminningscd d on d.cmisno = a.cmisno
set set
a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') a.sdate =
case
when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
else date_format(a.cdt,'%Y-%m-%d 00:00:00')
end
, a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
<!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00')
else else
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
else b.sstime end else b.sstime end
@ -450,8 +477,9 @@
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
else b.setime else b.setime
end end
end end-->
where a.payno = #payno# and c.pstatus = 1 where a.payno = #payno#;
<!--20220809 and c.pstatus = 1;-->
<!--update examuser a <!--update examuser a
inner join pay b on b.isexam=1 and b.payno=#payno# and b.pstatus in (22,1) inner join pay b on b.isexam=1 and b.payno=#payno# and b.pstatus in (22,1)
@ -495,10 +523,16 @@
update lect a update lect a
inner join cm b on a.cmno = b.cmno inner join cm b on a.cmno = b.cmno
inner join pay c on a.payno = c.payno <!--20220809 inner join pay c on a.payno = c.payno-->
left outer join cminningscd d on d.cmisno = a.cmisno left outer join cminningscd d on d.cmisno = a.cmisno
set set
a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') a.sdate =
case
when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
else date_format(a.cdt,'%Y-%m-%d 00:00:00')
end
, a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
<!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00')
else else
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
else b.sstime end else b.sstime end
@ -513,8 +547,9 @@
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
else b.setime else b.setime
end end
end end-->
where a.payno = #payno# and c.pstatus = 1; where a.payno = #payno#;
<!--20220809 and c.pstatus = 1;-->
<!--update examuser a <!--update examuser a
inner join pay b on b.isexam=1 and b.payno=a.payno and b.pstatus=1 --><!--and b.pgkey=#pgkey#--><!-- inner join pay b on b.isexam=1 and b.payno=a.payno and b.pstatus=1 --><!--and b.pgkey=#pgkey#--><!--
@ -979,10 +1014,16 @@
update lect a update lect a
inner join cm b on a.cmno = b.cmno inner join cm b on a.cmno = b.cmno
inner join pay c on a.payno = c.payno <!--20220809 inner join pay c on a.payno = c.payno-->
left outer join cminningscd d on d.cmisno = a.cmisno left outer join cminningscd d on d.cmisno = a.cmisno
set set
a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') a.sdate =
case
when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
else date_format(a.cdt,'%Y-%m-%d 00:00:00')
end
, a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
<!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00')
else else
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
else b.sstime end else b.sstime end
@ -997,8 +1038,9 @@
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
else b.setime else b.setime
end end
end end-->
where a.payno = #payno# and c.pstatus = 1; where a.payno = #payno#;
<!--20220809 and c.pstatus = 1;-->
</update> </update>
<update id="pay.abspay" parameterClass="hashtable"> <update id="pay.abspay" parameterClass="hashtable">
update examuser a update examuser a
@ -1025,10 +1067,16 @@
<!--수강시작일 / 종료일 추가 2021-01-21--> <!--수강시작일 / 종료일 추가 2021-01-21-->
update lect a update lect a
inner join cm b on a.cmno = b.cmno inner join cm b on a.cmno = b.cmno
inner join pay c on a.payno = c.payno <!--20220809 inner join pay c on a.payno = c.payno-->
left outer join cminningscd d on d.cmisno = a.cmisno left outer join cminningscd d on d.cmisno = a.cmisno
set set
a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') a.sdate =
case
when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
else date_format(a.cdt,'%Y-%m-%d 00:00:00')
end
, a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
<!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00')
else else
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
else b.sstime end else b.sstime end
@ -1043,8 +1091,9 @@
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
else b.setime else b.setime
end end
end end-->
where a.payno = #payno# and c.pstatus = 1 where a.payno = #payno#;
<!--20220809 and c.pstatus = 1;-->
</update> </update>
<update id="pay.unpaymoney" parameterClass="hashtable"> <update id="pay.unpaymoney" parameterClass="hashtable">
update pay update pay
@ -1053,10 +1102,16 @@
update lect a update lect a
inner join cm b on a.cmno = b.cmno inner join cm b on a.cmno = b.cmno
inner join pay c on a.payno = c.payno <!--20220809 inner join pay c on a.payno = c.payno-->
left outer join cminningscd d on d.cmisno = a.cmisno left outer join cminningscd d on d.cmisno = a.cmisno
set set
a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00') a.sdate =
case
when b.cshape = 1 then date_format(d.estart,'%Y-%m-%d 00:00:00')
else date_format(a.cdt,'%Y-%m-%d 00:00:00')
end
, a.edate = date_format(d.eend,'%Y-%m-%d 00:00:00')
<!--a.sdate = case when b.cshape &lt;&gt; 1 then date_format(a.cdt,'%Y-%m-%d 00:00:00')
else else
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(c.payoktime,'%Y-%m-%d 00:00:00')
else b.sstime end else b.sstime end
@ -1071,8 +1126,9 @@
case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59') case when date_format(b.retime,'%Y-%m-%d')='2099-12-31' then date_format(date_add(c.payoktime,interval b.studydays day),'%Y-%m-%d 23:59:59')
else b.setime else b.setime
end end
end end-->
where a.payno = #payno# and c.pstatus = 1; where a.payno = #payno#;
<!--20220809 and c.pstatus = 1;-->
</update> </update>
<select id="pay.pplogs" parameterClass="hashtable" resultClass="pplog"> <select id="pay.pplogs" parameterClass="hashtable" resultClass="pplog">
select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,CAST(AES_DECRYPT(UNHEX(a.rbankacc), <include refid="sql.digest"></include>) AS char) rbankacc,a.rbankowner,a.isaccommodation,a.cshape,a.isreceipt,a.taxdatereq select a.pplno,a.isready,a.cmno,a.cmisno,a.isrebate,a.rbankname,CAST(AES_DECRYPT(UNHEX(a.rbankacc), <include refid="sql.digest"></include>) AS char) rbankacc,a.rbankowner,a.isaccommodation,a.cshape,a.isreceipt,a.taxdatereq

61
FO/Controllers/CourseController.cs
View File

@ -1024,6 +1024,36 @@ namespace NP.FO.Controllers
lngTmp[0] = vm.CM.cmino; lngTmp[0] = vm.CM.cmino;
lngTmp[1] = vm.CM.cmisno; lngTmp[1] = vm.CM.cmisno;
#region 20220801 선택한 교육장 정보
Hashtable hsData = new Hashtable();
hsData.Add("cmno", vm.cmno);
var cmInningscdTmp = Dao.Get<CMinningscd>("cm.cminningscds.applyedu", hsData).Where(w => w.cmino == lngTmp[0] && w.cmisno == lngTmp[1]);
foreach (var item in cmInningscdTmp)
{
vm.SelectCMInningscd = item;
if (item.studyplace != null)
{
item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일"));
}
else
{
item.scdInfoSummary = string.Format("{0} ~ {1}", DateTime.Now.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일"));
}
if (item.eend != null)
{
item.eend2 = item.eend.ToString("yyyy년 MM월 dd일");
}
//vm.SelectCMInningscd.scdInfoSummary = string.Format("{0}", vm.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일까지"));
if (vm.SelectCMInningscd.estart < Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")))
{
vm.SelectCMInningscd.isEnd = true;
}
}
#endregion
if (vm.payno > 0) if (vm.payno > 0)
{ {
//신청대기 => 승인 => 결제진입 //신청대기 => 승인 => 결제진입
@ -1108,6 +1138,7 @@ namespace NP.FO.Controllers
return Redirect("/"); return Redirect("/");
} }
} }
vm.CM = Dao.Get<CM>("cm.cms", new System.Collections.Hashtable() { { "cmno", vm.PPLog.cmno } }).First(); 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.User = Dao.Get<Users>("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).First();
vm.viewname4 = "/Course/OnPayReturn"; vm.viewname4 = "/Course/OnPayReturn";
@ -1116,36 +1147,6 @@ namespace NP.FO.Controllers
vm.CM.cmino = lngTmp[0]; vm.CM.cmino = lngTmp[0];
vm.CM.cmisno = lngTmp[1]; vm.CM.cmisno = lngTmp[1];
#region 20220801 선택한 교육장 정보
Hashtable hsData = new Hashtable();
hsData.Add("cmno", vm.cmno);
var cmInningscdTmp = Dao.Get<CMinningscd>("cm.cminningscds.applyedu", hsData).Where(w => w.cmino == lngTmp[0] && w.cmisno == lngTmp[1]);
foreach (var item in cmInningscdTmp)
{
vm.SelectCMInningscd = item;
if (item.studyplace != null)
{
item.scdInfoSummary = string.Format("{0} ~ {1}", item.estart.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일"));
}
else
{
item.scdInfoSummary = string.Format("{0} ~ {1}", DateTime.Now.ToString("yyyy년 MM월 dd일"), item.eend.ToString("MM월 dd일"));
}
if (item.eend != null)
{
item.eend2 = item.eend.ToString("yyyy년 MM월 dd일");
}
//vm.SelectCMInningscd.scdInfoSummary = string.Format("{0}", vm.SelectCMInningscd.estart.ToString("yyyy년 MM월 dd일까지"));
if (vm.SelectCMInningscd.estart < Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00")))
{
vm.SelectCMInningscd.isEnd = true;
}
}
#endregion
return View(vm); return View(vm);
} }
[NP.Base.Auth.CFilter] [NP.Base.Auth.CFilter]

1
FO/Controllers/FOBaseController.cs
View File

@ -631,6 +631,7 @@ namespace NP.FO.Controllers
vm.Pay.cardprtccode = xpay.Response("LGD_PCANCELFLAG", 0); vm.Pay.cardprtccode = xpay.Response("LGD_PCANCELFLAG", 0);
vm.Pay.checkflag = xpay.Response("LGD_CARDGUBUN2", 0); vm.Pay.checkflag = xpay.Response("LGD_CARDGUBUN2", 0);
} }
vm.Pay.payresult = xpay.Response("LGD_RESPCODE", 0); vm.Pay.payresult = xpay.Response("LGD_RESPCODE", 0);
vm.Pay.payresultmsg = xpay.Response("LGD_RESPMSG", 0); vm.Pay.payresultmsg = xpay.Response("LGD_RESPMSG", 0);
vm.Pay.pgkey = xpay.Response("LGD_TID", 0); vm.Pay.pgkey = xpay.Response("LGD_TID", 0);

15
FO/Controllers/MyController.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Web; using System.Web;
using System.Web.Mvc; using System.Web.Mvc;
using System.Collections;
using NP.Model; using NP.Model;
using NP.Base; using NP.Base;
using System.Web.Routing; using System.Web.Routing;
@ -158,12 +158,21 @@ namespace NP.FO.Controllers
public ActionResult Lecture(VMMy vm) public ActionResult Lecture(VMMy vm)
{ {
ViewBag.reporturl = GetConfig("reporturl"); ViewBag.reporturl = GetConfig("reporturl");
vm.Lects = Dao.Get<Lect>("lect.mylectures", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "cgcode", vm.intval > 0 ? TestCode3 : null }, { "cshape", vm.stringval } }); Hashtable hsData = new Hashtable();
hsData.Add("userno", SUserInfo.UserNo);
hsData.Add("cgcode", vm.intval > 0 ? TestCode3 : null);
hsData.Add("cshape", vm.stringval);
vm.Lects = Dao.Get<Lect>("lect.mylectures", hsData);
return View(vm); return View(vm);
} }
public ActionResult LectureOn(VMMy vm) public ActionResult LectureOn(VMMy vm)
{ {
vm.Lects = Dao.Get<Lect>("lect.mylectures", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo }, { "cgcode", vm.intval > 0 ? TestCode3 : null }, { "cshape", 2 },{"issubtable" ,1} }); Hashtable hsData = new Hashtable();
hsData.Add("userno", SUserInfo.UserNo);
hsData.Add("cgcode", vm.intval > 0 ? TestCode3 : null);
//hsData.Add("cshape", 2);
hsData.Add("issubtable", 1);
vm.Lects = Dao.Get<Lect>("lect.mylectures", hsData);
return View(vm); return View(vm);
} }
public ActionResult CertPrint(VMMy vm) public ActionResult CertPrint(VMMy vm)

1
FO/Views/Course/ApplyPay.cshtml
View File

@ -230,7 +230,6 @@
else { else {
if (capResult.obj.ptype == 6 || capResult.obj.ptype == 7) { if (capResult.obj.ptype == 6 || capResult.obj.ptype == 7) {
location.href = "@Model.viewname4?payno=" + capResult.obj.payno + "&absptype=" + capResult.obj.ptype; location.href = "@Model.viewname4?payno=" + capResult.obj.payno + "&absptype=" + capResult.obj.ptype;
alert(location.href);
return; return;
} }
else { else {

36
FO/Views/Course/SmartSearch.cshtml
View File

@ -333,7 +333,7 @@
} }
//20220726 교육장, 교육일정 조회 //20220726 교육장, 교육일정 조회
function getCmInning(cshape, cmno, place) { function getCmInning(cshape, cmno) {
var btnSelect = $("#btnSelect" + cmno) var btnSelect = $("#btnSelect" + cmno)
var divInfo = $("#divInfo_" + cmno); var divInfo = $("#divInfo_" + cmno);
var divPlace = $("#divPlace_" + cmno); var divPlace = $("#divPlace_" + cmno);
@ -355,7 +355,8 @@
} }
//20220729 교육장 또는 교육장별 교육일정 정보 생성 //20220729 교육장 또는 교육장별 교육일정 정보 생성
function renderScdInning(job, cshape, cmno, studyPlace) { // job (1=교육장정보+교육일정 활성화, 0=교육일정만 활성화)
function renderScdInning(job, cshape, cmno) {
let strTmp = ""; let strTmp = "";
let strStudyPlaceTag = ""; let strStudyPlaceTag = "";
var divPlace = $("#divPlace_" + cmno); var divPlace = $("#divPlace_" + cmno);
@ -448,9 +449,10 @@
var aApplyClass = $("<a />", { "onclick": "javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ");" }); var aApplyClass = $("<a />", { "onclick": "javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ");" });
/*var spanApplyClass = $("<span />", { "class": "smtlChkBtn smtlChk03", "style": "font-size:18px" });*/ /*var spanApplyClass = $("<span />", { "class": "smtlChkBtn smtlChk03", "style": "font-size:18px" });*/
var spanApplyClass = $("<span />", { "style": "font-size:18px" }); var spanApplyClass = $("<span />", { "style": "font-size:18px" });
var radioEduDay = "<input type='radio' style='display:none' name='rdoScds' value='" + d.cmisno + /*"' onclick='javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ")*/ + "' "; var radioEduDay = "<input type='radio' style='display:none' name='rdoScds' value='" + d.cmisno + "' ";
/*var radioEduDay = "<input type='radio' style='display:none' name='rdoScds' value='" + d.cmisno + "' onclick='javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ") + "' ";*/
var strStudyPlacename = ""; var strStudyPlacename = "";
if (d.studyplace != null && d.studyplace !='' && d.studyplacename != '') { if (d.studyplace != null && d.studyplace != '' && d.studyplacename != null && d.studyplacename != '') {
strStudyPlacename = '[' + d.studyplacename + '교육장]'; strStudyPlacename = '[' + d.studyplacename + '교육장]';
} }
@ -467,6 +469,7 @@
spanApplyClass.text("수강신청"); spanApplyClass.text("수강신청");
aApplyClass.append(spanApplyClass); aApplyClass.append(spanApplyClass);
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + " checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>"); pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + " checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
pData.append(aApplyClass);
} }
else { else {
spanApplyClass.text("수강신청"); spanApplyClass.text("수강신청");
@ -474,12 +477,6 @@
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label> " + "</label>"); pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label> " + "</label>");
pData.append(aApplyClass); pData.append(aApplyClass);
} }
//if (seq == 0) {
// li.append("<label>" + radioEduDay + " checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
//}
//else {
// li.append("<label>" + radioEduDay + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
//}
} }
} }
else { else {
@ -489,29 +486,12 @@
else { else {
pData.html("<label>" + strStudyPlacename + " " + radioEduDay + "'> " + d.scdInfoSummary + "</label></label>"); pData.html("<label>" + strStudyPlacename + " " + radioEduDay + "'> " + d.scdInfoSummary + "</label></label>");
} }
//if (seq == 0) {
// li.append("<label>" + radioEduDay + " checked> " + d.scdInfoSummary + "</label>");
//}
//else {
// li.append("<label>" + radioEduDay + "'> " + d.scdInfoSummary + "</label>");
//}
} }
} }
//aApplyClass.append(spanApplyClass);
//pData.append(aApplyClass);
li.append(pData); li.append(pData);
//li.append(aApplyClass);
ulScd.append(li); ulScd.append(li);
//ulScd.append(li2);
}); });
//20220726
//alert("model.cmisno" + model.cmisno);
//if (model.cmisno != null) {
// $("input:radio[name='rdoScds'][value='" + model.cmisno + "']").click();
//}
} }
//20220729 교육장별 교육일정 정보 조회 //20220729 교육장별 교육일정 정보 조회
@ -530,7 +510,7 @@
//else { //else {
// $("#divPlace_" + cmno).hide(); // $("#divPlace_" + cmno).hide();
//} //}
capp("/focommon/GetScdForMixEdu", { cmno: cmno, studyPlace: studyPlace}, "renderScdInning(0, " + cshape + "," + cmno + "," + studyPlace + ")"); capp("/focommon/GetScdForMixEdu", { cmno: cmno, studyPlace: studyPlace}, "renderScdInning(0, " + cshape + "," + cmno + ")");
} }
} }

4
FO/Views/Course/XpayREQ.cshtml
View File

@ -19,8 +19,8 @@ else
<input type="hidden" name="@data.Key" id="@data.Key" value="@data.Value" /><br /> <input type="hidden" name="@data.Key" id="@data.Key" value="@data.Value" /><br />
@*@(data.Key + "-" + data.Value)*@ @*@(data.Key + "-" + data.Value)*@
} }
<input @*type="hidden"*@ name="CM.cmino" id="becmino" value="@Model.CM.cmino" /> <input type="hidden" name="CM.cmino" id="becmino" value="@Model.CM.cmino" />
<input @*type="hidden"*@ name="CM.cmisno" id="becmisno" value="@Model.CM.cmisno" /> <input type="hidden" name="CM.cmisno" id="becmisno" value="@Model.CM.cmisno" />
</form> </form>
<script> <script>

79
FO/Views/My/LectureOn.cshtml
View File

@ -73,7 +73,7 @@
<a href="javascript:mpgPopClose();"></a> <a href="javascript:mpgPopClose();"></a>
</div> </div>
<div class="mpgPopCont"> <div class="mpgPopCont">
<ul id="ulScd"></ul> <div id="divScd"></div>
<ul class="mpgPopBtn"> <ul class="mpgPopBtn">
<li><a href="#" class="bk" onclick="selectScd()">선택완료</a></li> <li><a href="#" class="bk" onclick="selectScd()">선택완료</a></li>
<li><a href="#" onclick="mpgPopClose()">취소</a></li> <li><a href="#" onclick="mpgPopClose()">취소</a></li>
@ -104,14 +104,89 @@
function ps() { function ps() {
window.open("/My/CertSet"); window.open("/My/CertSet");
} }
function openScd(cmno, lectno) { function openScd(cmno, lectno) {
vLectno = lectno vLectno = lectno
$(".mpgPop").show(); $(".mpgPop").show();
setScd(cmno); setScd(cmno);
} }
function setScd(cmno) { function setScd(cmno) {
capp("/focommon/GetScdForMixEdu", { cmno: cmno, lectno: vLectno }, "renderScd"); capp("/focommon/GetScdForMixEdu", { cmno: cmno, lectno: vLectno }, "renderScdInning(" + cmno + ")");
//20220809
// capp("/focommon/GetScdForMixEdu", { cmno: cmno, lectno: vLectno }, "renderScd");
} }
function renderScdInning(cmno) {
let strTmp = "";
var divScd = $("#divScd");
divScd.empty();
//강좌일정 태그 생성
strTmp = "<ul id='ulScd" + cmno + "'></ul>";
divScd.append(strTmp);
var ulScd = $("#ulScd" + cmno);
ulScd.empty();
//var seq = 0;
if (capResult.obj.length < 1) {
var li = $("<li />");
li.append("<label> - 선택 가능한 교육종료일이 없습니다.</label>");
ulScd.append(li);
}
$.each(capResult.obj, function (i, d) {
var li = $("<li />");
var pData = $("<p />");
//var aApplyClass = $("<a />", { "onclick": "javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ");" });
/*var spanApplyClass = $("<span />", { "class": "smtlChkBtn smtlChk03", "style": "font-size:18px" });*/
/*var spanApplyClass = $("<span />", { "style": "font-size:18px" });*/
var radioEduDay = "<input type='radio' name='rdoScds' value='" + d.cmisno + "' ";
/*var radioEduDay = "<input type='radio' style='display:none' name='rdoScds' value='" + d.cmisno + *//*"' onclick='javascript:applyClassEdu(" + d.cmno + ", " + d.pcmno + ", " + d.cmino + ", " + d.cmisno + ")*//* + "' ";*/
var strStudyPlacename = "";
if (d.studyplace != null && d.studyplace != '' && d.studyplacename != null && d.studyplacename != '') {
strStudyPlacename = '[' + d.studyplacename + '교육장]';
}
if (d.isEnd == true) {
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[종료] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
}
else {
if (d.quota != 0) {
if (d.remainPeople <= 0) {
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수마감] </label>" + radioEduDay + " disabled> <span style='color:gray'>" + d.scdInfoSummary + "</span></label>");
}
else {
if (d.isselected == 1) {
//spanApplyClass.text("수강신청");
//aApplyClass.append(spanApplyClass);
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + " checked> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label></label>");
}
else {
//spanApplyClass.text("수강신청");
//aApplyClass.append(spanApplyClass);
pData.html("<label>" + strStudyPlacename + " <label style='color: red'>[접수중] </label>" + radioEduDay + "'> " + d.scdInfoSummary + "<label style='color: red;display:none;'> (" + d.remainPeople + "명 남음)</label> " + "</label>");
//pData.append(aApplyClass);
}
}
}
else {
if (d.isselected == 1) {
pData.html("<label>" + strStudyPlacename + " " + radioEduDay + " checked> " + d.scdInfoSummary + "</label></label>");
}
else {
pData.html("<label>" + strStudyPlacename + " " + radioEduDay + "'> " + d.scdInfoSummary + "</label></label>");
}
}
}
li.append(pData);
ulScd.append(li);
});
}
function renderScd() { function renderScd() {
var ulScd = $("#ulScd"); var ulScd = $("#ulScd");
ulScd.empty(); ulScd.empty();