From cf7bc2d68e7d86e7d4b896acf1400f534d594daa Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 三月 2026 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml b/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
new file mode 100644
index 0000000..2fe5f17
--- /dev/null
+++ b/src/main/resources/mapper/energy/EnergyConsumptionDetailMapper.xml
@@ -0,0 +1,41 @@
+<?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="com.ruoyi.energy.mapper.EnergyConsumptionDetailMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.energy.pojo.EnergyConsumptionDetail">
+ <id column="id" property="id"/>
+ <result column="energy_id" property="energyId"/>
+ <result column="type" property="type"/>
+ <result column="meter_reading_location" property="meterReadingLocation"/>
+ <result column="meter_reading_date" property="meterReadingDate"/>
+ <result column="start_code" property="startCode"/>
+ <result column="stop_code" property="stopCode"/>
+ <result column="dosage" property="dosage"/>
+ <result column="remark" property="remark"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="create_user" property="createUser"/>
+ <result column="update_user" property="updateUser"/>
+ </resultMap>
+ <select id="pageEnergyConsumptionDetail"
+ resultType="com.ruoyi.energy.dto.EnergyConsumptionDetailDto">
+ select *
+ from (select ecd.*, e.energy_tyep, e.energy_name, e.unit, su.nick_name createUserName
+ from energy_consumption_detail ecd
+ left join energy e on ecd.energy_id = e.id
+ left join sys_user su on ecd.create_user = su.user_id) A
+ <where>
+ <if test="c.energyTyep != null and c.energyTyep != ''">
+ and energy_tyep like concat('%',#{c.energyTyep},'%')
+ </if>
+ <if test="c.energyName != null and c.energyName != ''">
+ and energy_name like concat('%',#{c.energyName},'%')
+ </if>
+ <if test="c.meterReadingDate != null and c.meterReadingDate != ''">
+ and meter_reading_date =#{c.meterReadingDate}
+ </if>
+ </where>
+ </select>
+
+</mapper>
--
Gitblit v1.9.3