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

<기능개선> 

1. PMS NO : 고도화 관련
2. (주요)작업내용 
(1) 수강신청 조건관련 수정
This commit is contained in:
jity7777 2022-03-17 06:03:08 +00:00
parent b0eb1c5963
commit b624af6e01
2 changed files with 69 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1761,42 +1761,42 @@
where a.lectno = #lectno# and a.userno = #userno#
</select>
<select id="lect.lecture.document" parameterClass="hashtable" resultClass="lect">
select a.*
from (
select a.lectno,a.userno,a.iscomplete,a.sdate,a.edate,a.status
,b.cmno,b.cname,b.cshape
,b.rstime,b.retime
,b.sstime,b.setime
,c.tyear,c.tseq
,u.username,u.userid
,ass.asname
,e.payno,e.pstatus,e.payamt,e.ptype,e.ispg,e.pgkey,e.payoktime,e.rstatus,e.iscashrct, e.isbill
,e2.pino,e2.payamt pipayamt,e2.itemname
,f.estart,f.eend
,cc.cname studyplacename
,cc.ccode studyplace
,pt.taxno,pt.taxdate taxdate2,pt.mgtkey,pt.iscancel,pt.statecode,pt.ischeck
,a.cdt
,e.cdt paycdt
,pv.cshrpgkey
,ifnull(pi.isrebate,0) isrebate
,row_number() over(order by a.cdt desc) rno
,count(a.lectno) over() pagetotalcount
from lect a
inner join cm b on b.cmno = a.cmno
inner join term c on c.tmno = b.tmno
inner join pay e on e.payno = a.payno
inner join payitem pi on pi.payno = a.payno
left outer join(
select c.payno,c.pino,c.payamt
,case c.ptype when 0 then c0.cname when 2 then c2.bkname when 4 then c0.cname when 3 then c3.exname else '-' end itemname
from lect a
inner join pay b on b.payno = a.payno
left outer join payitem c on c.payno = b.payno
left outer join cm c0 on c.ptype in (0,1,4) and c0.cmno=c.itemno
left outer join book c2 on c.ptype=2 and c2.bkno=c.itemno
left outer join exam c3 on c.ptype=3 and c3.exno=c.itemno
where a.status in (1,2) and a.ischanged = 0 <isNotNull property="userno">and a.userno = #userno#</isNotNull>
select a.*
from (
select a.lectno,a.userno,a.iscomplete,a.sdate,a.edate,a.status
,b.cmno,b.cname,b.cshape
,b.rstime,b.retime
,b.sstime,b.setime
,c.tyear,c.tseq
,u.username,u.userid
,e1.asname
,e.payno,e.pstatus,e.payamt,e.ptype,e.ispg,e.pgkey,e.payoktime,e.rstatus,e.iscashrct, e.isbill
,e2.pino,e2.payamt pipayamt,e2.itemname
,f.estart,f.eend
,cc.cname studyplacename
,cc.ccode studyplace
,pt.taxno,pt.taxdate taxdate2,pt.mgtkey,pt.iscancel,pt.statecode,pt.ischeck
,a.cdt
,e.cdt paycdt
,pv.cshrpgkey
,ifnull(pi.isrebate,0) isrebate
,row_number() over(order by a.cdt desc) rno
,count(a.lectno) over() pagetotalcount
from lect a
inner join cm b on b.cmno = a.cmno
inner join term c on c.tmno = b.tmno
inner join pay e on e.payno = a.payno
inner join payitem pi on pi.payno = a.payno
left outer join(
select c.payno,c.pino,c.payamt
,case c.ptype when 0 then c0.cname when 2 then c2.bkname when 4 then c0.cname when 3 then c3.exname else '-' end itemname
from lect a
inner join pay b on b.payno = a.payno
left outer join payitem c on c.payno = b.payno
left outer join cm c0 on c.ptype in (0,1,4) and c0.cmno=c.itemno
left outer join book c2 on c.ptype=2 and c2.bkno=c.itemno
left outer join exam c3 on c.ptype=3 and c3.exno=c.itemno
where a.status in (1,2) and a.ischanged = 0 <isNotNull property="userno">and a.userno = #userno#</isNotNull>
group by a.payno
) e2 on e2.payno = e.payno
left outer join pplog e1 on e1.pplno = e.pplno
@ -1927,7 +1927,7 @@
inner join cg t3 on t2.cgno= t3.cgno
inner join pay t4 on t1.payno = t4.payno
inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
where t1.status = 1 and t4.pstatus= 1
where t1.status = 1 and t4.pstatus= 1 and t5.typeman = 51
<isNotNull property="userno">and t1.userno = #userno#</isNotNull>
<isNotEmpty property="edu">
<isNotEqual property="edu" compareValue="53">and t5.typegrade in (61,62)</isNotEqual>
@ -1945,7 +1945,7 @@
inner join pay t4 on t1.payno = t4.payno
inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
where t1.status = 1 and t4.pstatus= 1 and t3.cgcode in (103,104,105) and t5.typegrade = #grade# and t5.typeedu = #edu#
and t1.userno = #userno#
and t1.userno = #userno# and t5.typeman = 51
</select>
<select id="lect.count.user3" parameterClass="hashtable" resultClass="int">
@ -1956,7 +1956,7 @@
inner join pay t4 on t1.payno = t4.payno
inner join pplog t5 on t1.cmno= t5.cmno and t1.userno = t5.userno and t4.pplno = t5.pplno
where t1.status = 1 and t4.pstatus= 1 and t3.cgcode in (103,104) and t5.typeedu = 53
and t1.userno = #userno#
and t1.userno = #userno# and t5.typeman = 51
</select>
</statements>
</sqlMap>

56
Dao/MyBatis/Maps/System.xml
View File

@ -1004,23 +1004,25 @@
order by b3.cgname,b3.cgno,b2.cgname,b2.cgno,f.cname,f.cmno
</select>
<select id="cm.data.lect.raw" parameterClass="hashtable" resultClass="cmlect">
select a.*
from (
select a.tyear,a.tseq,b3.cgno pcgno,b3.cgname pcgname,b2.cgno,b2.cgname,f.cname pcname,b.cname,b.classno,b.sstime,b.setime,b.infee,b.outfee,e.asname,e.isjoin,e2.cname asctgname,c.isrebate
,d.username,d.userid,c.cdt,d2.cname ccpositionname,c.iscomplete
,row_number() over(order by b3.cgname,b3.cgno,b2.cgname,b2.cgno,f.cname,f.cmno,b.cname,b.cmno,b.classno) rno
,count(c.lectno) over() pagetotalcount
from term a
inner join cm b on b.tmno=a.tmno
inner join lect c on c.cmno=b.cmno and c.status=1
inner join users d on d.userno=c.userno
left outer join comcode d2 on d2.ccode=d.ccposition
left outer join assign e on e.asno=d.asno
left outer join comcode e2 on e2.ccode=.e.asctg
inner join cm f on f.cmno=b.pcmno
inner join cg b2 on b2.cgno=f.cgno
inner join cg b3 on b3.cgno=b2.pcgno
<dynamic prepend="where">
select a.*
from (
select a.tyear,a.tseq,b3.cgno pcgno,b3.cgname pcgname,b2.cgno,b2.cgname,f.cname pcname,b.cname,b.classno,b.sstime,b.setime,b.infee,b.outfee,pp.asname,e.isjoin,e2.cname asctgname,c.isrebate
,d.username,d.userid,c.cdt,d2.cname ccpositionname,c.iscomplete
,row_number() over(order by b3.cgname,b3.cgno,b2.cgname,b2.cgno,f.cname,f.cmno,b.cname,b.cmno,b.classno) rno
,count(c.lectno) over() pagetotalcount
from term a
inner join cm b on b.tmno=a.tmno
inner join lect c on c.cmno=b.cmno and c.status=1
inner join pay p on p.payno = c.payno
left outer join pplog pp on p.pplno = pp.pplno
inner join users d on d.userno=c.userno
left outer join comcode d2 on d2.ccode=d.ccposition
left outer join assign e on e.asno=d.asno
left outer join comcode e2 on e2.ccode=.e.asctg
inner join cm f on f.cmno=b.pcmno
inner join cg b2 on b2.cgno=f.cgno
inner join cg b3 on b3.cgno=b2.pcgno
<dynamic prepend="where">
<isNotNull property="year" prepend="and">a.tyear=#year#</isNotNull>
<isNotNull property="tmno" prepend="and">a.tmno=#tmno#</isNotNull>
</dynamic>
@ -1029,12 +1031,12 @@
order by a.rno
</select>
<select id="cm.data.lect.byassign" parameterClass="hashtable" resultClass="cmlect">
select a.*
from (
select row_number() over(order by b3.cgname,b3.cgno,b2.cgname,b2.cgno,f.cname,f.cmno,b.cname,b.cmno,b.classno,d.username,d.userno) rno, count(c.lectno) over() pagerowcount
,a.tyear,a.tseq,b3.cgno pcgno,b3.cgname pcgname,b2.cgno,b2.cgname,f.cname pcname,b.cname,b.classno,b.sstime,b.setime,b.infee,b.outfee,e.asname,e.isjoin,e2.cname asctgname,c.isrebate
,d.username,d.userid,d.depart
,CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char) mobile
select a.*
from (
select row_number() over(order by b3.cgname,b3.cgno,b2.cgname,b2.cgno,f.cname,f.cmno,b.cname,b.cmno,b.classno,d.username,d.userno) rno, count(c.lectno) over() pagerowcount
,a.tyear,a.tseq,b3.cgno pcgno,b3.cgname pcgname,b2.cgno,b2.cgname,f.cname pcname,b.cname,b.classno,b.sstime,b.setime,b.infee,b.outfee,pp.asname,e.isjoin,e2.cname asctgname,c.isrebate
,d.username,d.userid,d.depart
,CAST(AES_DECRYPT(UNHEX(d.mobile), <include refid="sql.digest"></include>) AS char) mobile
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char) email
,c.attrate,c.cdt,c.iscomplete
,c2.payamt
@ -1042,9 +1044,11 @@
,count(a.cdt) over() pagetotalcount
from term a
inner join cm b on b.tmno=a.tmno <isNotNull property="pcmno">and b.pcmno=#pcmno#</isNotNull> <isNotNull property="cmno">and b.cmno=#cmno#</isNotNull>
inner join lect c on c.cmno=b.cmno and c.status=1
left outer join payitem c2 on c2.pino=c.pino
inner join users d on d.userno=c.userno <isNotNull property="username">and d.username like concat('%',#username#,'%')</isNotNull> <isNotNull property="asno">and d.asno=#asno#</isNotNull>
inner join lect c on c.cmno=b.cmno and c.status=1
inner join pay p on p.payno = c.payno
left outer join pplog pp on p.pplno = pp.pplno
left outer join payitem c2 on c2.pino=c.pino
inner join users d on d.userno=c.userno <isNotNull property="username">and d.username like concat('%',#username#,'%')</isNotNull> <isNotNull property="asno">and d.asno=#asno#</isNotNull>
left outer join comcode d2 on d2.ccode=d.ccposition
left outer join assign e on e.asno=d.asno
left outer join comcode e2 on e2.ccode=.e.asctg