From 8c58f304f8345e046b7d71481dae7ad4eebee27e Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 11:48:15 +0800
Subject: [PATCH] 增加永久文件接口
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 735a232..e08632a 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -42,7 +42,7 @@
</where>
</select>
- <select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.pojo.SalesLedger">
+ <select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.vo.SalesLedgerVo">
SELECT T1.id,
T1.sales_contract_no,
T1.customer_contract_no,
@@ -56,34 +56,21 @@
T1.attachment_materials,
T1.tenant_id,
T1.contract_amount,
- T1.contract_amount as noInvoiceAmountTotal,
+ T1.contract_amount AS noInvoiceAmountTotal,
T1.execution_date,
T2.nick_name AS entry_person_name,
T1.payment_method,
T1.delivery_date,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
- CASE
- WHEN shipping_status_counts.total_count = 0 THEN false
- WHEN shipping_status_counts.unshipped_count = 0 THEN true
- ELSE false
- END AS is_fh,
- CASE
- WHEN EXISTS (
- SELECT 1
- FROM product_order po2
- INNER JOIN product_work_order wo2 ON wo2.product_order_id = po2.id
- INNER JOIN production_product_main pm2 ON pm2.work_order_id = wo2.id
- WHERE po2.sales_ledger_id = T1.id
- LIMIT 1
- ) THEN true
- ELSE false
- END AS has_production_record
+ IFNULL(shipping_status_counts.is_all_shipped, FALSE) AS is_fh
FROM sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
LEFT JOIN (
SELECT sales_ledger_id,
- COUNT(*) as total_count,
- SUM(CASE WHEN status != '宸插彂璐�' THEN 1 ELSE 0 END) as unshipped_count
+ CASE
+ WHEN SUM(CASE WHEN status != '宸插彂璐�' THEN 1 ELSE 0 END) = 0 THEN TRUE
+ ELSE FALSE
+ END AS is_all_shipped
FROM shipping_info
GROUP BY sales_ledger_id
) shipping_status_counts ON T1.id = shipping_status_counts.sales_ledger_id
@@ -135,4 +122,4 @@
order by sl.execution_date desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3