From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人，维护时间默认当前 2.销售报价审核非必填，产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间，修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了，增加生产订单当前工序 3.库存导入模板规格改成图纸编号，产品名称可以为空，加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量（只统计二级）
---
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