From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml b/src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml
index c3d6b00..4ad55d4 100644
--- a/src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml
+++ b/src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml
@@ -20,13 +20,17 @@
</resultMap>
<select id="listPageAccountSalesCollection"
resultType="com.ruoyi.account.bean.vo.sales.AccountSalesCollectionVo">
- select * from (select ascc.*,
+ select
+ A.* ,
+ if(asd.receipt_number is not null, true, false) as isAccountStatemen
+ from (select ascc.*,
c.customer_name,
GROUP_CONCAT(sour.outbound_batches SEPARATOR ',') AS outboundBatches
from account_sales_collection ascc
left join customer c on ascc.customer_id = c.id
left join stock_out_record sour on FIND_IN_SET(sour.id, ascc.stock_out_record_ids) > 0
GROUP BY ascc.id)A
+ left join account_statement_details asd on A.collection_number = asd.receipt_number
<where>
<if test="req.customerId != null">
AND A.customer_id = #{req.customerId}
--
Gitblit v1.9.3