From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 25 六月 2025 11:51:38 +0800 Subject: [PATCH] Merge branch 'mdc_hyjs_master' --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 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..b3a2f9a --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml @@ -0,0 +1,56 @@ +<?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, + me.equipment_image equipmentImage, + CASE + + WHEN repair.count > 0 THEN + '5' ELSE a.Oporation + END AS equipmentStatus, + mew.coordinate_left coordinateLeft, + mew.coordinate_top coordinateTop, + mew.vw vw, + mew.vh vh, + me.id equId + 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 } + LEFT JOIN ( + SELECT + e1.equipment_code, + COUNT(1) COUNT + FROM + eam_report_repair r1 + INNER JOIN eam_equipment e1 ON e1.id = r1.equipment_id + WHERE + r1.report_status NOT IN ('COMPLETE', 'ABOLISH') + GROUP BY + e1.equipment_code) repair ON repair.equipment_code = me.equipment_id + </select> + + <select id="listByUser" resultType="org.jeecg.modules.mdc.entity.MdcWorkshopInfo"> + SELECT + DISTINCT t1.* + FROM + mdc_workshop_info t1 + LEFT JOIN sys_permission t2 ON t1.perms = t2.perms + LEFT JOIN sys_role_permission t3 ON t2.id = t3.permission_id + LEFT JOIN sys_role t4 ON t4.id = t3.role_id + LEFT JOIN sys_user_role t5 ON t5.role_id = t4.id + WHERE + t5.user_id = #{ userId } + </select> +</mapper> \ No newline at end of file -- Gitblit v1.9.3