From 8850f6cf5dd53c63ffb8352f59fc186a1a84f570 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 2 Dec 2024 14:41:21 +0800
Subject: [PATCH] bug http://192.168.0.14:1888/bug-view-4099.html
---
.../material/lease/LeaseApplyDetailsMapper.xml | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
index 456f6198..264fd0cc 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
@@ -30,7 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
- lad.id, lad.parent_id, mt.type_id, mt.type_name, mt2.type_name as ma_type_name, mt.storage_num,
+ lad.id, lad.parent_id, mt.type_id, mt.type_name, mt2.type_name as ma_type_name,
+ CASE mt.manage_type
+ WHEN 0 THEN
+ IFNULL(subquery0.num, 0)
+ ELSE
+ IFNULL(mt.storage_num, 0)
+ END as storage_num,
mt.manage_type as manageType,
(lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,
IFNULL(lad.pre_num,0) as pre_num,
@@ -44,6 +50,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ma_type mt on lad.type_id = mt.type_id and mt.`level` = '4' and mt.del_flag = '0'
left join
ma_type mt2 on mt2.type_id = mt.parent_id and mt2.`level` = '3' and mt2.del_flag = '0'
+ left join (SELECT mt.type_id,
+ mt2.type_name AS typeName,
+ mt.type_name AS typeModelName,
+ count(mm.ma_id) num
+ FROM ma_machine mm
+ LEFT JOIN ma_type mt ON mt.type_id = mm.type_id
+ LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
+ WHERE mm.ma_code is not null and mm.ma_status in (1)
+ GROUP BY mt.type_id) AS subquery0 ON subquery0.type_id = mt.type_id