From 4f52dfe47a6e5f825f98e537b5cd90b006bde4bb Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期二, 24 十月 2023 10:52:30 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
new file mode 100644
index 0000000..1a0ecf1
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.mdc.mapper.MdcWorkshopInfoMapper">
+
+
+    <select id="getBigScreenInfo" resultType="org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto">
+        SELECT
+            mew.id id,
+            a.EquipmentID equipmentId,
+            me.equipment_name equipmentName,
+            me.equipment_type equipmentType,
+            met.equipment_type_pictures equipmentImage,
+            a.Oporation equipmentStatus,
+            mew.coordinate_left coordinateLeft,
+            mew.coordinate_top coordinateTop,
+            mew.vw vw,
+            mew.vh vh
+        FROM
+            EquipmentLog a
+            INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) 'maxgdtime' FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID
+            INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID
+            INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID
+            INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name
+            AND a.CollectTime= b.maxgdtime
+            AND mew.workshop_id = #{ workshopId }
+    </select>
+</mapper>
\ No newline at end of file

--
Gitblit v1.9.3