From dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 13 九月 2024 16:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/basicInfo/StatisticsDao.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/StatisticsDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/StatisticsDao.xml
index a4b941f..69d59d6 100644
--- a/modules/mainPart/src/main/resources/mapper/basicInfo/StatisticsDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/StatisticsDao.xml
@@ -10,13 +10,15 @@
count(distinct c.id) AS operatConNum,
count(distinct d.id) AS modelNum,
count(distinct e.id) AS simulatNum,
- count(distinct f.id) AS testData
+ count(distinct f.id) AS testData,
+ count(distinct g.id) AS assessNum
FROM product_model a
left join task b on b.product_id = a.id and b.IS_DELETE=0
left join operat_condit c on c.product_id = a.id and c.IS_DELETE=0
left join model_rbd d on d.ship_id = a.id and d.IS_DELETE=0
left join simulat_assess e on e.product_id = a.id and e.IS_DELETE=0
left join assess_item f on f.product_id = a.id and f.IS_DELETE=0
+ left join assess_result g on g.product_id = a.id and g.IS_DELETE=0
where a.product_type = 2 and a.IS_DELETE =0
group by a.id,a.name
order by a.name
--
Gitblit v1.9.1