feat(energy-record): 新增能源消耗记录的时间范围查询和设备信息关联功能
- 在 EmsEnergyRecordBo 中添加 recordStartDate、recordEndDate 用于时间范围筛选 - 添加 meterCode、energyName、model、manufacturer、meterStatus 等模糊查询字段 - 集成 DateTimeFormat 注解支持日期格式化 - 在 EmsEnergyRecordMapper 中新增 selectVoPagePlus 方法实现关联查询 - 通过 XML 配置实现能源记录与计量表、能源类型的左连接查询 - 在 EmsEnergyRecordServiceImpl 中重构查询逻辑支持多表关联和时间段筛选 - 在 EmsEnergyRecordVo 中扩展表计和能源相关展示字段
This commit is contained in:
@@ -18,6 +18,28 @@
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="remark" column="remark"/>
|
||||
</resultMap>
|
||||
<select id="selectVoPagePlus" resultType="com.klp.ems.domain.vo.EmsEnergyRecordVo">
|
||||
SELECT
|
||||
er.energy_record_id,
|
||||
er.meter_id,
|
||||
er.energy_id,
|
||||
er.consumption,
|
||||
er.record_date,
|
||||
er.recorded_by,
|
||||
er.remark,
|
||||
m.meter_code AS meterCode,
|
||||
m.model AS meterModel,
|
||||
m.manufacturer AS meterManufacturer,
|
||||
m.status AS meterStatus,
|
||||
et.name AS energyName,
|
||||
et.unit AS energyUnit,
|
||||
et.code AS energyCode,
|
||||
et.description AS energyDescription
|
||||
FROM ems_energy_record er
|
||||
LEFT JOIN ems_meter m ON er.meter_id = m.meter_id AND m.del_flag = '0'
|
||||
LEFT JOIN ems_energy_type et ON er.energy_id = et.energy_type_id AND et.del_flag = '0'
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user