MrTech/ctg-app-ui
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' into sit

Browse Source
This commit is contained in:
KLYSaa
2021-11-25 13:40:15 +08:00
parent 4c889c4c12 34867e9897
commit eda950baf1
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bui/etc/cap/OBUICAP1/2040801_CTL.XML
+6 -6
View File
@@ -4,7 +4,7 @@
<DynSentence name="QRY_CAPTXNJNL_A"> <!--查询全部状态-->
<Sentence>
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
SELECT J.*,M.CUSTOMER_NAME MERC_CNM,B.DISK_DESC,B.RCV_DT,B.RCV_TM,B.END_DT,B.END_TM,M.CUSTOMER_CODE 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
@@ -27,7 +27,7 @@
<DynSentence name="QRY_CAPTXNJNL_S"> <!--查询成功状态-->
<Sentence>
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,M.CUSTOMER_CODE 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
@@ -51,7 +51,7 @@
<DynSentence name="QRY_CAPTXNJNL_F"> <!-- 查询失败状态 -->
<Sentence>
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,M.CUSTOMER_CODE 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
@@ -75,7 +75,7 @@
<DynSentence name="QRY_CAPTXNJNL_R"> <!-- 查询退票状态 -->
<Sentence>
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,M.CUSTOMER_CODE 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
@@ -99,7 +99,7 @@
<DynSentence name="QRY_CAPTXNJNL_U"> <!-- 查询预计状态 -->
<Sentence>
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,M.CUSTOMER_CODE 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
@@ -124,7 +124,7 @@
<DynSentence name="QRY_CAPTXNJNL_P"> <!-- 查询超时/处理中状态 -->
<Sentence>
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,M.CUSTOMER_CODE 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
bui/etc/cap/OBUICAP1/2040817_CTL.XML
+7 -7
View File
@@ -4,13 +4,13 @@
<DynSentence name="QRY_CAPDSKINF"> <!--代收代付接入批量信息-->
<Sentence>
select * from CAPDSKINF where
('%s' IS NULL OR DSK_NAM LIKE '%s%')
AND ('%s' IS NULL OR MERC_ID LIKE '%s%')
AND ('%s' IS NULL OR MERC_NAM LIKE '%s%')
AND ('%s' IS NULL OR TXN_MOD = '%s')
AND (ORD_DT &gt;='%s' OR '%s' IS NULL)
AND (ORD_DT &lt;='%s' OR '%s' IS NULL) order by tm_smp DESC
select A.*,C.CUSTOMER_CODE from CAPDSKINF A left join CAPCUSINF C on C.CUSTOMER_ID=A.MERC_ID where
('%s' IS NULL OR A.DSK_NAM LIKE '%s%')
AND ('%s' IS NULL OR A.MERC_ID LIKE '%s%')
AND ('%s' IS NULL OR A.MERC_NAM LIKE '%s%')
AND ('%s' IS NULL OR A.TXN_MOD = '%s')
AND (A.ORD_DT &gt;='%s' OR '%s' IS NULL)
AND (A.ORD_DT &lt;='%s' OR '%s' IS NULL) order by A.tm_smp DESC
</Sentence>
<Fields>DSK_NAM|DSK_NAM|MERC_ID|MERC_ID|MERC_NAM|MERC_NAM|TXN_MOD|TXN_MOD|BEG_DT|BEG_DT|END_DT|END_DT|</Fields>
</DynSentence>
bui/etc/cap/OBUICAP1/2040818_CTL.XML
+1 -1
View File
@@ -4,7 +4,7 @@
<DynSentence name="QRY_CAPBATINF"> <!--代收代付接出批量信息-->
<Sentence>
select A.*,B.DISK_DESC,C.CUSTOMER_NAME from CAPBATINF A
select A.*,B.DISK_DESC,C.CUSTOMER_NAME,C.CUSTOMER_CODE 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