From 7620b607f421aaba0510fb8c7023232cd14c21b3 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Mon, 16 Oct 2023 11:25:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/lihongjie/coal/base/entity/BaseEntity.java | 2 ++ .../dto/CoalWashingDailyAnalysisDto.java | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/cn/lihongjie/coal/base/entity/BaseEntity.java b/src/main/java/cn/lihongjie/coal/base/entity/BaseEntity.java index a95c5b25..f4cfab91 100644 --- a/src/main/java/cn/lihongjie/coal/base/entity/BaseEntity.java +++ b/src/main/java/cn/lihongjie/coal/base/entity/BaseEntity.java @@ -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") diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CoalWashingDailyAnalysisDto.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CoalWashingDailyAnalysisDto.java index 887e3bb9..a841eb22 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CoalWashingDailyAnalysisDto.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CoalWashingDailyAnalysisDto.java @@ -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 inputItems; + @ElementCollection + @Comment("用户手动录入的快浮记录") + @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private List kfItems; + // @ElementCollection // @Comment("连续平均值") // @CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))