This commit is contained in:
2024-04-18 16:17:28 +08:00
parent ea3eee2bc3
commit 884ee16a8e
2 changed files with 4 additions and 9 deletions

View File

@@ -1,7 +1,9 @@
package cn.lihongjie.coal.meterLog.dto;
import cn.lihongjie.coal.base.dto.OrgCommonDto;
import cn.lihongjie.coal.common.DictCode;
import cn.lihongjie.coal.meter.dto.MeterDto;
import cn.lihongjie.coal.pojoProcessor.DictTranslate;
import lombok.Data;
@@ -29,6 +31,6 @@ public class MeterLogDto extends OrgCommonDto {
@Comment("归档状态")
private String archiveStatus = "0";
@DictTranslate(dictKey = DictCode.ARCHIVESTATUS)
private String archiveStatusName;
}

View File

@@ -28,14 +28,7 @@ public class MeterLogEntity extends OrgCommonEntity {
@ColumnDefault("'0'")
private String archiveStatus = "0";
@Formula(
"(select i.name\n"
+ "from t_dictionary d,\n"
+ " t_dictionary_item i\n"
+ "where d.id = i.dictionary_id\n"
+ " and d.code = 'archiveStatus'\n"
+ " and i.code = archive_status)")
private String archiveStatusName;
@Formula("( lag(value, 1, (select tm.init_value from t_meter tm where tm.id = meter_id)) over (partition by meter_id order by time asc ) )")