From bc8cd378fd72f43e66120c540f57f630580aa093 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 11 九月 2025 10:57:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcHomeMapper.xml | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcHomeMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcHomeMapper.xml
index b809b98..457de28 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcHomeMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcHomeMapper.xml
@@ -4,12 +4,17 @@
<select id="getProductionByPid" resultType="org.jeecg.modules.system.entity.MdcProduction">
SELECT
- t1.*
+ t1.*
FROM
- mdc_production t1
- LEFT JOIN mdc_user_production t2 ON t1.id = t2.pro_id
- WHERE
- t1.parent_id = #{ productionId } AND t2.user_id = #{ userId }
+ mdc_production t1
+ -- LEFT JOIN mdc_user_production t2 ON t1.id = t2.pro_id
+ WHERE 1=1
+ <if test="productionId != null and productionId != ''">
+ AND t1.parent_id = #{ productionId }
+ </if>
+ <!-- <if test="userId != null and userId != ''">-->
+ <!-- AND t2.user_id = #{ userId }-->
+ <!-- </if>-->
</select>
<select id="getProcessCount" resultType="java.math.BigDecimal">
@@ -126,6 +131,7 @@
<select id="getEquipmentSevenUtilizationStatistics" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalInfo">
SELECT
equipment_id,
+ the_date,
SUM ( process_long ) processLong,
SUM ( open_long ) openLong
FROM
@@ -140,7 +146,8 @@
</if>
</where>
GROUP BY
- equipment_id
+ equipment_id,
+ the_date
</select>
--
Gitblit v1.9.3