From f2109d6192e9e50ee5a6cc177b0b45fdb85a3003 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 04 六月 2025 17:19:32 +0800
Subject: [PATCH] 删除计算结束时间
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index 14d4ca6..f4e7413 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -325,6 +325,12 @@
<if test="lineId != null and lineId != ''">
and t1.line_id = #{lineId}
</if>
+ <if test="userWorkCenterIds != null and userWorkCenterIds.size > 0">
+ and t1.work_center_id in
+ <foreach collection="userWorkCenterIds" open="(" separator="," close=")" item="workCenterId">
+ #{workCenterId}
+ </foreach>
+ </if>
order by t1.create_time desc
</select>
@@ -344,8 +350,8 @@
t1.constructor_id constructorId,
t1.supplier_id supplierId,
t1.factory_number factoryNumber,
- t1.leave_factory_date leaveFactoryDate,
- t1.acceptance_check_date acceptanceCheckDate,
+ CONVERT(VARCHAR(10), t1.leave_factory_date, 120) leaveFactoryDate,
+ CONVERT(VARCHAR(10), t1.acceptance_check_date, 120) acceptanceCheckDate,
t1.affiliation_id affiliationId,
t1.manage_id manageId,
t1.manager manager,
--
Gitblit v1.9.3