This commit is contained in:
parent
4d8fb43a3d
commit
27572075cf
|
|
@ -1522,24 +1522,30 @@
|
||||||
select a.*
|
select a.*
|
||||||
from (
|
from (
|
||||||
select
|
select
|
||||||
l.lectno,l.iscomplete,l.completetime,l.completeno,l.sdate,l.edate,l.cdt,l.cno,pp.udt,l.uno,l.uip
|
l.lectno,l.iscomplete,l.completetime,l.completeno
|
||||||
,cm.cgno,cm.studytime,cm.cshape,cm.cname,cm.studyplace
|
,case when cm.cshape = 1 then l.sdate
|
||||||
,t.tyear
|
else p.payoktime end sdate
|
||||||
,cg.cgname,cg.pcgno
|
,case when cm.cshape = 1 then l.edate
|
||||||
,pcg.cgname as pcgname
|
else cmi.estart end edate
|
||||||
,u.userno,u.userid,u.username,u.uduty,u.slevel
|
,l.cdt,l.cno,pp.udt,l.uno,l.uip
|
||||||
,CAST(AES_DECRYPT(UNHEX(u.userpno), <include refid="sql.digest"></include>) AS char) as userpno
|
,cm.cgno,cm.studytime,cm.cshape,cm.cname,cm.studyplace
|
||||||
,CAST(AES_DECRYPT(UNHEX(u.mobile), <include refid="sql.digest"></include>) AS char) as mobile
|
,t.tyear
|
||||||
,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) as email
|
,cg.cgname,cg.pcgno
|
||||||
,pi.tbankuser as rbankuser,pi.rbank,pi.pino,pi.rbankamt
|
,pcg.cgname as pcgname
|
||||||
,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) as rbankaccnum
|
,u.userno,u.userid,u.username,u.uduty,u.slevel
|
||||||
,p.payamt
|
,CAST(AES_DECRYPT(UNHEX(u.userpno), <include refid="sql.digest"></include>) AS char) as userpno
|
||||||
,pp.pplno,pp.typeman,pp.typeedu,pp.typegrade,pp.typejob
|
,CAST(AES_DECRYPT(UNHEX(u.mobile), <include refid="sql.digest"></include>) AS char) as mobile
|
||||||
,pp.asname,pp.post,pp.address1,pp.address2,pp.brno,pp.eino,pp.btype,pp.bkind,pp.ceoname,pp.mname,pp.association
|
,CAST(AES_DECRYPT(UNHEX(u.email), <include refid="sql.digest"></include>) AS char) as email
|
||||||
,CAST(AES_DECRYPT(UNHEX(pp.mphone), <include refid="sql.digest"></include>) AS char) as mphone
|
,pi.tbankuser as rbankuser,pi.rbank,pi.pino,pi.rbankamt
|
||||||
,CAST(AES_DECRYPT(UNHEX(pp.taxemail), <include refid="sql.digest"></include>) AS char) as taxemail
|
,CAST(AES_DECRYPT(UNHEX(pi.rbankaccnum), <include refid="sql.digest"></include>) AS char) as rbankaccnum
|
||||||
,row_number() over(order by l.lectno desc) rno
|
,p.payamt
|
||||||
,count(l.lectno) over() pagetotalcount
|
,pp.pplno,pp.typeman,pp.typeedu,pp.typegrade,pp.typejob
|
||||||
|
,pp.asname,pp.post,pp.address1,pp.address2,pp.brno,pp.eino,pp.btype,pp.bkind,pp.ceoname,pp.mname,pp.association
|
||||||
|
,CAST(AES_DECRYPT(UNHEX(pp.mphone), <include refid="sql.digest"></include>) AS char) as mphone
|
||||||
|
,CAST(AES_DECRYPT(UNHEX(pp.taxemail), <include refid="sql.digest"></include>) AS char) as taxemail
|
||||||
|
,case when p.ispg = 1 then p.payno else 0 end
|
||||||
|
,row_number() over(order by l.lectno desc) rno
|
||||||
|
,count(l.lectno) over() pagetotalcount
|
||||||
from lect l
|
from lect l
|
||||||
left outer join cm cm on cm.cmno = l.cmno
|
left outer join cm cm on cm.cmno = l.cmno
|
||||||
left outer join term t on t.tmno=cm.tmno
|
left outer join term t on t.tmno=cm.tmno
|
||||||
|
|
@ -1549,6 +1555,7 @@
|
||||||
left outer join pay p on p.payno = l.payno
|
left outer join pay p on p.payno = l.payno
|
||||||
left outer join payitem pi on pi.payno = p.payno
|
left outer join payitem pi on pi.payno = p.payno
|
||||||
left outer join pplog pp on pp.pplno = p.pplno
|
left outer join pplog pp on pp.pplno = p.pplno
|
||||||
|
left outer join cminningscd cmi on cmi.cmisno = pp.cmisno
|
||||||
where l.iscomplete = 1
|
where l.iscomplete = 1
|
||||||
<isNotNull property="lectno" prepend="and">l.lectno = #lectno#</isNotNull>
|
<isNotNull property="lectno" prepend="and">l.lectno = #lectno#</isNotNull>
|
||||||
<isNotNull property="scompletetime" prepend="and">l.completetime >= #scompletetime#</isNotNull>
|
<isNotNull property="scompletetime" prepend="and">l.completetime >= #scompletetime#</isNotNull>
|
||||||
|
|
|
||||||
|
|
@ -3828,5 +3828,13 @@ namespace NP.Model
|
||||||
/// pplog.pplno
|
/// pplog.pplno
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Int64 pplno { get; set; }
|
public Int64 pplno { get; set; }
|
||||||
|
public Int64 payno { get; set; }
|
||||||
|
public String paynostr
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return payno > 0 ? "pr" + payno : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -213,6 +213,8 @@ namespace NP.Model
|
||||||
public int? pagenum { get; set; }
|
public int? pagenum { get; set; }
|
||||||
public int pageviewcount { get; set; }
|
public int pageviewcount { get; set; }
|
||||||
public int pagerowcount { get; set; }
|
public int pagerowcount { get; set; }
|
||||||
|
public String userid { get; set; }
|
||||||
|
public String paynostr { get; set; }
|
||||||
}
|
}
|
||||||
public class textvalue
|
public class textvalue
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue