From 5c891d8d2c206dfd2aa6daf59579eb2b6843dcc0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 四月 2026 18:00:37 +0800
Subject: [PATCH] fix:1.采购/销售入库去掉审批 2.返工下载附件内容变更 3.生产/库存入库生产日期添加 4.仓库导入导出字段优化
---
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