diff --git a/bui/etc/cap/OBUICAP1/2040801_CTL.XML b/bui/etc/cap/OBUICAP1/2040801_CTL.XML index 88e07d3..52ab0af 100644 --- a/bui/etc/cap/OBUICAP1/2040801_CTL.XML +++ b/bui/etc/cap/OBUICAP1/2040801_CTL.XML @@ -4,7 +4,7 @@ - SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC FROM CAPTXNJNL J + SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC,B.RCV_DT,B.RCV_TM,B.END_DT,B.END_TM FROM CAPTXNJNL J left join CAPCUSINF M on J.MERC_ID=M.CUSTOMER_ID left join CAPDSKINF B on J.DSK_NAM=B.DSK_NAM where diff --git a/bui/etc/cap/OBUICAP1/2040818_CTL.XML b/bui/etc/cap/OBUICAP1/2040818_CTL.XML index baf9b31..a10bedc 100644 --- a/bui/etc/cap/OBUICAP1/2040818_CTL.XML +++ b/bui/etc/cap/OBUICAP1/2040818_CTL.XML @@ -4,8 +4,9 @@ - select A.*,B.DISK_DESC from CAPBATINF A + select A.*,B.DISK_DESC,C.CUSTOMER_NAME from CAPBATINF A left join CAPDSKINF B on B.DSK_NAM=A.DSK_NAM + left join CAPCUSINF C on C.CUSTOMER_ID=A.MERC_ID where ('%s' IS NULL OR A.MERC_ID LIKE '%s%') AND ('%s' IS NULL OR A.CORG_NO LIKE '%s%') diff --git a/bui/etc/cap/OBUICAP1/2040859_CTL.XML b/bui/etc/cap/OBUICAP1/2040859_CTL.XML index ad968d6..679316d 100644 --- a/bui/etc/cap/OBUICAP1/2040859_CTL.XML +++ b/bui/etc/cap/OBUICAP1/2040859_CTL.XML @@ -5,7 +5,8 @@ - select A.*,B.CORG_NM from CAPACCOUNTINF A left join CMMTORGN B on B.CORP_ORG=A.BANK_CODE + select A.*,B.CORG_NM,C.RTR_GRP from CAPACCOUNTINF A left join CMMTORGN B on B.CORP_ORG=A.BANK_CODE + left join TITRTRGRP C on C.TITLE_ID=A.TITLE_ID where ('%s' IS NULL OR A.TITLE_ID LIKE '%%s%') AND ('%s' IS NULL OR A.TITLE_NAME LIKE '%%s%') AND ('%s' IS NULL OR A.ACCT_TYPE = '%s') diff --git a/cap/etc/OCAPRPT2/204073_CTL.XML b/cap/etc/OCAPRPT2/204073_CTL.XML index 0f12d0e..de799b3 100644 --- a/cap/etc/OCAPRPT2/204073_CTL.XML +++ b/cap/etc/OCAPRPT2/204073_CTL.XML @@ -30,7 +30,7 @@ raqname=STRCAT($RPT_KND,-,$AC_DT,.xls) WORKDIR=GETENV(HWORKDIR) CR_RPT_FILE=STRCAT($WORKDIR,/app/cap/etc/OCAPRPT2/RPT_D_003.raq) - RPTNAME=STRCAT($WORKDIR,/ejbs/capbui/rptdata/,$raqname) + RPTNAME=STRCAT(/tmp/data/,$raqname) RPT_FIL_NM=STRCAT("交易失败原因统计-",FMTDATE($AC_DT,0,5),.xls) diff --git a/cap/etc/OCAPRPT2/RPT_D_001.raq b/cap/etc/OCAPRPT2/RPT_D_001.raq index f1a3d17..e2b2311 100644 Binary files a/cap/etc/OCAPRPT2/RPT_D_001.raq and b/cap/etc/OCAPRPT2/RPT_D_001.raq differ diff --git a/cap/etc/OCAPRPT2/RPT_D_002.raq b/cap/etc/OCAPRPT2/RPT_D_002.raq index e3cf847..2491342 100644 Binary files a/cap/etc/OCAPRPT2/RPT_D_002.raq and b/cap/etc/OCAPRPT2/RPT_D_002.raq differ diff --git a/cap/etc/OCAPRPT2/RPT_D_003.raq b/cap/etc/OCAPRPT2/RPT_D_003.raq index 2414221..3b4e438 100644 Binary files a/cap/etc/OCAPRPT2/RPT_D_003.raq and b/cap/etc/OCAPRPT2/RPT_D_003.raq differ diff --git a/cap/etc/OCAPRPT2/RPT_D_006.raq b/cap/etc/OCAPRPT2/RPT_D_006.raq index 12d706b..a3a88ae 100644 Binary files a/cap/etc/OCAPRPT2/RPT_D_006.raq and b/cap/etc/OCAPRPT2/RPT_D_006.raq differ