From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml b/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml
index 7a0a384..c026425 100644
--- a/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml
+++ b/src/main/resources/mapper/equipmentenergyconsumption/EnergyPeriodMapper.xml
@@ -7,15 +7,24 @@
<select id="listPage" resultType="com.ruoyi.equipmentenergyconsumption.pojo.EnergyPeriod">
select * from energy_period
<where>
- <if test="energyPeriod.startTime != null">
- start_time = #{energyPeriod.startTime}
- </if>
- <if test="energyPeriod.endTime != null">
- and end_time = #{energyPeriod.endTime}
+ <if test="energyPeriod.date != null">
+ date = #{energyPeriod.date}
</if>
<if test="energyPeriod.price != null">
and price = #{energyPeriod.price}
</if>
+ <if test="energyPeriod.peak != null">
+ and peak = #{energyPeriod.peak}
+ </if>
+ <if test="energyPeriod.valley != null">
+ and valley = #{energyPeriod.valley}
+ </if>
+ <if test="energyPeriod.flat != null">
+ and flat = #{energyPeriod.flat}
+ </if>
+ <if test="energyPeriod.sharp != null">
+ and sharp = #{energyPeriod.sharp}
+ </if>
</where>
</select>
</mapper>
--
Gitblit v1.9.3