This commit is contained in:
2023-10-16 11:25:27 +08:00
parent 007faf1f41
commit 7620b607f4
2 changed files with 8 additions and 0 deletions

View File

@@ -23,6 +23,7 @@ public class BaseEntity {
private String id;
@Comment("创建用户ID")
@Column(updatable = false)
private String createUserId;
@Formula("(select tu.name from t_user tu where tu.id = create_user_id)")
@@ -30,6 +31,7 @@ public class BaseEntity {
@Comment("创建时间")
@CreationTimestamp(source = SourceType.VM)
@Column(updatable = false)
private LocalDateTime createTime;
@Comment("更新用户ID")

View File

@@ -2,6 +2,7 @@ package cn.lihongjie.coal.coalWashingDailyAnalysis.dto;
import cn.lihongjie.coal.base.dto.OrgCommonDto;
import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisItemVo;
import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisKFItemVo;
import cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisParamVo;
import jakarta.persistence.CollectionTable;
@@ -29,6 +30,11 @@ public class CoalWashingDailyAnalysisDto extends OrgCommonDto {
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
private List<CoalWashingDailyAnalysisItemVo> inputItems;
@ElementCollection
@Comment("用户手动录入的快浮记录")
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
private List<CoalWashingDailyAnalysisKFItemVo> kfItems;
// @ElementCollection
// @Comment("连续平均值")
// @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))