待支付列表语句增加

service/src/main/java/com/hzya/frame/seeyon/cbs8/entity/PaymentEntity.xml

@@ -76,6 +76,7 @@
         SELECT
             formmain_0209.id as oaId, -- 主表id
             formson_0210.formsonId,
+            formson_0210.sort,
             'formson_0210' as tableName, -- 表名
             COL_SUMMARY.SUBJECT as title, -- 单据标题
             unit.name as payCompany, -- 付款公司
@@ -136,11 +137,82 @@
                     field0072,
                     field0073,
                     field0080
+                ORDER BY formmain_id,sort
             )formson_0210
                 LEFT JOIN formmain_0209 ON formson_0210.FORMMAIN_ID = formmain_0209.id
                 LEFT JOIN COL_SUMMARY ON COL_SUMMARY.FORM_RECORDID = formmain_0209.id
                 left join CTP_ENUM_ITEM item on item.id =formson_0210.field0070
                 left join ORG_UNIT unit on unit.id =formmain_0209.field0002
+        union all
+        SELECT
+            formmain_0094.id as oaId, -- 主表id
+            formson_0223.formsonId AS formsonId,-- 明细表id
+            formson_0223.sort,
+            'formson_0223' as tableName, -- 表名
+            COL_SUMMARY.SUBJECT as title, -- 单据标题
+            formmain_0094.field0006 as payCompany, -- 付款公司
+            '财务报销审批表(集团外)' as billName,
+            'field0052' as payResultField, -- 支付结果字段
+            'field0053' as payDateField, -- 打款日期字段
+            'field0060' AS applyCodeField,-- CBS支付申请单号
+            '' as receiptFiled,-- 电子回单字段
+            COL_SUMMARY.id as summaryId,
+            formmain_0094.field0001||'-'||formson_0223.sort as referenceNum, -- 单据编号
+            formmain_0094.START_DATE as startDate, -- 单据日期
+            formmain_0094.FINISHEDFLAG as finishedflag, -- 流程状态
+            formson_0223.field0053 as payDate, -- 打款日期
+            formson_0223.field0052 as payResult, -- 支付结果
+            formson_0223.field0060 AS applyCode,-- 支付申请单号
+            REGEXP_REPLACE(formmain_0094.field0024, '[[:space:]]', '') as payAccount, -- 付款账户
+            REGEXP_REPLACE(formmain_0094.field0025, '[[:space:]]', '') as payBankName, -- 付款开户行
+            formmain_0094.field0054 as amount, -- 金额
+            formmain_0094.field0007 as purpose,  -- 用途
+            formmain_0094.field0007 as cbsAbstract, -- 摘要
+            REGEXP_REPLACE(formson_0223.field0050, '[[:space:]]', '') as revAccount, -- 收款账户
+            formson_0223.field0049 as revBankName, -- 收款开户行
+            formson_0223.field0056 as revAccountName, -- 收款人
+            REGEXP_REPLACE(formson_0223.field0051, '[[:space:]]', '') as cnapsCode, -- 收款联行号
+            item.ENUMVALUE  as personalFlag,-- 公私标记
+            formson_0223.field0059 as revBankType,
+            '10' as currency,
+            '202' as busType,
+            '' as receipt -- 电子回单
+        from
+            (
+                SELECT
+                    wm_concat(id) AS formsonId,
+                    formmain_id,
+                    sum(field0041) AS field0041,-- 金额
+                    min(sort) AS sort,
+                    field0049,-- 收方开户行
+                    field0050,-- 收方账户
+                    field0051,-- 收方联行号
+                    field0059,-- 收方银行类型
+                    field0056,-- 收方名称
+                    field0048,-- 公私标记
+                    field0052,-- 支付结果
+                    field0053,-- 支付时间
+                    field0060-- 支付申请单号
+                FROM
+                    formson_0223
+                WHERE field0047 = '-5486592002512828355'-- 是否本次支付
+                GROUP BY
+                    formmain_id,
+                    field0049,
+                    field0050,
+                    field0051,
+                    field0059,
+                    field0056,
+                    field0048,
+                    field0052,
+                    field0053,
+                    field0060
+                ORDER BY formmain_id,sort
+            )formson_0223
+                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
+
     </sql>
     <!-- 采用==查询 -->
     <select id="entity_list_base" resultMap="get-PaymentEntity-result" parameterType="com.hzya.frame.seeyon.cbs8.entity.PaymentEntity">
@@ -171,8 +243,8 @@
             <if test="payBankName != null and payBankName !='' ">and v.payBankName = #{payBankName}  </if>
             <if test="payType != null and payType !='' "> and v.payType = #{payType}  </if>
             <if test="finishedflag != null and finishedflag !='' "> and v.finishedflag = #{finishedflag}  </if>
-
         </trim>
+        order by v.oaId,v.sort
     </select>
 
     <!-- 查询交易成功，且电子回单为空的，上传电子回单用 -->