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

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

@ -1769,7 +1769,7 @@
,b.sstime,b.setime ,b.sstime,b.setime
,c.tyear,c.tseq ,c.tyear,c.tseq
,u.username,u.userid ,u.username,u.userid
,ass.asname ,e1.asname
,e.payno,e.pstatus,e.payamt,e.ptype,e.ispg,e.pgkey,e.payoktime,e.rstatus,e.iscashrct, e.isbill ,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 ,e2.pino,e2.payamt pipayamt,e2.itemname
,f.estart,f.eend ,f.estart,f.eend
@ -1927,7 +1927,7 @@
inner join cg t3 on t2.cgno= t3.cgno inner join cg t3 on t2.cgno= t3.cgno
inner join pay t4 on t1.payno = t4.payno 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 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> <isNotNull property="userno">and t1.userno = #userno#</isNotNull>
<isNotEmpty property="edu"> <isNotEmpty property="edu">
<isNotEqual property="edu" compareValue="53">and t5.typegrade in (61,62)</isNotEqual> <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 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 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# 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>
<select id="lect.count.user3" parameterClass="hashtable" resultClass="int"> <select id="lect.count.user3" parameterClass="hashtable" resultClass="int">
@ -1956,7 +1956,7 @@
inner join pay t4 on t1.payno = t4.payno 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 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 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> </select>
</statements> </statements>
</sqlMap> </sqlMap>

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

@ -1006,13 +1006,15 @@
<select id="cm.data.lect.raw" parameterClass="hashtable" resultClass="cmlect"> <select id="cm.data.lect.raw" parameterClass="hashtable" resultClass="cmlect">
select a.* select a.*
from ( 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 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 ,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 ,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 ,count(c.lectno) over() pagetotalcount
from term a from term a
inner join cm b on b.tmno=a.tmno inner join cm b on b.tmno=a.tmno
inner join lect c on c.cmno=b.cmno and c.status=1 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 inner join users d on d.userno=c.userno
left outer join comcode d2 on d2.ccode=d.ccposition left outer join comcode d2 on d2.ccode=d.ccposition
left outer join assign e on e.asno=d.asno left outer join assign e on e.asno=d.asno
@ -1032,7 +1034,7 @@
select a.* select a.*
from ( 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 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 ,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 ,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.mobile), <include refid="sql.digest"></include>) AS char) mobile
,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char) email ,CAST(AES_DECRYPT(UNHEX(d.email), <include refid="sql.digest"></include>) AS char) email
@ -1043,6 +1045,8 @@
from term a 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 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 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 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 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 comcode d2 on d2.ccode=d.ccposition