Commit 894a5411 by hulei

Merge remote-tracking branch 'origin/develop' into develop

parents 45d6c1e5 d06001ed
......@@ -491,7 +491,7 @@
select
d.INR, d.OWNUSG, d.OWNUSR, d.OBJTYP, d.OBJINR, d.OBJREF, d.DAT, d.COD, d.NAM, d.FRM, d.INFDSP, d.INFTXT, d.USR, d.CRETYP,
d.CREINR, d.DONFLG, d.VER, d.DIATYP, d.SUBID, d.FLDMODBLK, d.SUBTYP, d.SUBKEY, d.ETYEXTKEY, d.BCHKEYINR, d.MEMINF,
d.BRANCHINR, d.PTYEXTKEY, d.PTYNAM, d.PRECHKDAT,d.INFTXT
d.BRANCHINR, d.PTYEXTKEY, d.PTYNAM, d.PRECHKDAT
<choose>
<when test="dia.subObjTyp != null and dia.subObjTyp != ''">
,cbb.cur paycur,cbb.amt payamt,con.matdat
......
......@@ -559,7 +559,7 @@
from pty
left join pta on pty.inr = pta.ptyinr and pta.usg='MAA'
<if test="ptabranchinr != null and ptabranchinr != ''">
and (pta.branchinr = #{ptabranchinr} || pta.bchkeyinr = #{ptabranchinr})
and (pta.branchinr = #{ptabranchinr} or pta.bchkeyinr = #{ptabranchinr})
</if>
<if test="extkey != null and extkey != ''">
and pta.ptyextkey like concat(concat('%', #{extkey}), '%')
......@@ -574,7 +574,7 @@
pty.ptytyp = 'C'
and (
(trim(pty.idtype) != '2')
||
or
(trim(pty.idtype) = '2' and pty.akkcom not in ('10000', '10100', '10101', '10102', '10200', '10201', '10202', '10203', '10300', '10301', '10302', '10303',
'10304', '10305', '10306', '10307', '10308', '10309', '10310', '10311', '10312', '10313','10399', '10400', '20100'))
)
......@@ -588,7 +588,7 @@
and pty.nam like concat(concat('%', #{ennam}), '%')
</if>
<if test="ptabranchinr != null and ptabranchinr != ''">
and (pta.branchinr = #{ptabranchinr} || pta.bchkeyinr = #{ptabranchinr})
and (pta.branchinr = #{ptabranchinr} or pta.bchkeyinr = #{ptabranchinr})
</if>
</where>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment