From 4749842879f3b704945b824c0d6b6c2badb4b775 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 27 八月 2024 14:16:37 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/MdcProductDayscheduleDto.java | 2 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/mapper/xml/MdcSubLargeScreenMapper.xml | 3 ++-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/MdcProductDayscheduleDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/MdcProductDayscheduleDto.java
index 61564fb..d6d5151 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/MdcProductDayscheduleDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/MdcProductDayscheduleDto.java
@@ -12,6 +12,8 @@
@Data
public class MdcProductDayscheduleDto extends MdcProductDayschedule {
+ private String equipmentName;
+
/**
* 浜у搧鍚堟牸鐜�
*/
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/mapper/xml/MdcSubLargeScreenMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/mapper/xml/MdcSubLargeScreenMapper.xml
index 4c3398d..8feb676 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/mapper/xml/MdcSubLargeScreenMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/mapper/xml/MdcSubLargeScreenMapper.xml
@@ -5,7 +5,8 @@
<!--褰撴棩鐢熶骇璁″垝-->
<select id="todayProductionProgress" resultType="org.jeecg.modules.screen.dto.MdcProductDayscheduleDto">
SELECT
- t1.*
+ t1.*,
+ t2.equipment_name equipmentName
FROM
mdcJc_ProductDayschedule t1
LEFT JOIN mdc_equipment t2 ON t1.equipmentID = t2.equipment_id
--
Gitblit v1.9.3