From be3aa0812cb43be7484e162b4fece5344e9eb5c8 Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 14 三月 2024 11:12:43 +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/MdcOverrunAlarmMapper.xml | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml new file mode 100644 index 0000000..f812bb9 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml @@ -0,0 +1,25 @@ +<?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.MdcOverrunAlarmMapper"> + + <select id="pageList" resultType="org.jeecg.modules.mdc.entity.MdcOverrunAlarm"> + SELECT + t1.* + FROM + mdc_overrun_alarm t1 + LEFT JOIN mdc_equipment t2 ON t1.equipment_id = t2.equipment_id + <where> + <if test="mdcEquipment.equipmentId != null and mdcEquipment.equipmentId != '' "> + AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{mdcEquipment.equipmentId}),'%') + </if> + <if test="mdcEquipment.equipmentType != null and mdcEquipment.equipmentType != '' "> + AND t2.equipment_type = #{mdcEquipment.equipmentType} + </if> + <if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' "> + AND t2.drive_type = #{mdcEquipment.driveType} + </if> + </where> + ORDER BY + t1.create_time DESC + </select> +</mapper> \ No newline at end of file -- Gitblit v1.9.3