diff --git a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml index d01e8fd2..981fe7d5 100644 --- a/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml +++ b/service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml @@ -212,7 +212,73 @@ LEFT JOIN formmain_0094 ON formson_0223.FORMMAIN_ID = formmain_0094.id LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0094.id left join CTP_ENUM_ITEM item on item.id =formson_0223.field0048 - + UNION ALL + SELECT + formmain_0093.id as oaId, -- 主表id + formson_0222.formsonId, + formson_0222.sort, + 'formson_0222' as tableName, -- 表名 + COL_SUMMARY.SUBJECT as title, -- 单据标题 + formmain_0093.field0006 as payCompany, -- 付款公司 + formmain_0093.field0087 as billName, + 'field0069' as payResultField, -- 支付结果字段 + 'field0070' as payDateField, -- 打款日期字段 + 'field0086' AS applyCodeField,-- cbs支付申请单号 + '' as receiptFiled,-- 电子回单字段 + COL_SUMMARY.id as summaryId, + formmain_0093.field0001||'-'||formson_0222.sort as referenceNum, -- 单据编号 + formmain_0093.START_DATE as startDate, -- 单据日期 + formmain_0093.FINISHEDFLAG as finishedflag, -- 流程状态 + formson_0222.field0070 as payDate, -- 打款日期 + formson_0222.field0069 as payResult, -- 支付结果 + formson_0222.field0086 AS applyCode,-- 支付申请单号 + REGEXP_REPLACE(formmain_0093.field0019, '[[:space:]]', '') as payAccount, -- 付款账户 + REGEXP_REPLACE(formmain_0093.field0018, '[[:space:]]', '') as payBankName, -- 付款开户行 + formmain_0093.field0071 as amount, -- 金额 + formmain_0093.field0022 as purpose, -- 用途 + formmain_0093.field0022 as cbsAbstract, -- 摘要 + REGEXP_REPLACE(formson_0222.field0067, '[[:space:]]', '') as revAccount, -- 收款账户 + formson_0222.field0066 as revBankName, -- 收款开户行 + formson_0222.field0082 as revAccountName, -- 收款人 + REGEXP_REPLACE(formson_0222.field0068, '[[:space:]]', '') as cnapsCode, -- 收款联行号 + item.enumvalue as personalFlag,-- 公私标记 + formson_0222.field0085 as revBankType, + '10' as currency, + '202' as busType, + '' as receipt -- 电子回单 + from + ( + SELECT + wm_concat(id) AS formsonId, + formmain_id, + sum(field0057) AS field0041,-- 金额 + min(sort) AS sort, + field0066,-- 收方开户行 + field0067,-- 收方账户 + field0068,-- 收方联行号 + field0085,-- 收方银行类型 + field0082,-- 收方名称 + field0065,-- 公私标记 + field0069,-- 支付结果 + field0070,-- 支付时间 + field0086-- 支付申请单号 + FROM formson_0222 + GROUP BY + formmain_id, + field0066, + field0067, + field0068, + field0085, + field0082, + field0065, + field0069, + field0070, + field0086 + ORDER BY formmain_id,sort + )formson_0222 + LEFT JOIN formmain_0093 ON formson_0222.FORMMAIN_ID = formmain_0093.id + LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0093.id + left join CTP_ENUM_ITEM item on item.id =formson_0222.field0065 </sql> <!-- 采用==查询 --> <select id="entity_list_base" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">