From a9c57b1e2a94f6ffcfb67a1961e25dec348a5e72 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Fri, 6 Sep 2024 10:32:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/CoalWashingDailyAnalysisService.java | 9 ++++++++- .../purchaseOrder/entity/PurchaseOrderEntity.java | 4 ++-- .../coal/saleOrder/entity/SaleOrderEntity.java | 2 -- .../coal/supplier/dto/CreateSupplierDto.java | 14 ++++++++++++++ .../lihongjie/coal/supplier/dto/SupplierDto.java | 14 ++++++++++++++ .../coal/supplier/dto/UpdateSupplierDto.java | 14 ++++++++++++++ .../coal/supplier/entity/SupplierEntity.java | 15 +++++++++++++++ 7 files changed, 67 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java index bff7d0ad..cab460bb 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/service/CoalWashingDailyAnalysisService.java @@ -61,6 +61,11 @@ public class CoalWashingDailyAnalysisService CoalWashingDailyAnalysisEntity entity = mapper.toEntity(request); entity.setOrganizationId(Ctx.currentUser().getOrganizationId()); validate(entity); + + if (entity.getProduct()!=null){ + entity.setName(entity.getProduct().getName()); + } + this.repository.save(entity); return getById(entity.getId()); } @@ -102,7 +107,9 @@ public class CoalWashingDailyAnalysisService validate(entity); - + if (entity.getProduct()!=null){ + entity.setName(entity.getProduct().getName()); + } this.repository.save(entity); return getById(entity.getId()); diff --git a/src/main/java/cn/lihongjie/coal/purchaseOrder/entity/PurchaseOrderEntity.java b/src/main/java/cn/lihongjie/coal/purchaseOrder/entity/PurchaseOrderEntity.java index c032021d..15ce20c1 100644 --- a/src/main/java/cn/lihongjie/coal/purchaseOrder/entity/PurchaseOrderEntity.java +++ b/src/main/java/cn/lihongjie/coal/purchaseOrder/entity/PurchaseOrderEntity.java @@ -31,6 +31,8 @@ public class PurchaseOrderEntity extends OrgCommonEntity { + + @OneToMany(mappedBy = "purchaseOrder", fetch = FetchType.LAZY) private List weightDataList; @@ -90,12 +92,10 @@ public class PurchaseOrderEntity extends OrgCommonEntity { @Override public void prePersist() { super.prePersist(); - this.startTime = this.purchaseDate==null ? null: this.purchaseDate.atStartOfDay(); } @Override public void preUpdate() { super.preUpdate(); - this.startTime = this.purchaseDate==null ? null: this.purchaseDate.atStartOfDay(); } } diff --git a/src/main/java/cn/lihongjie/coal/saleOrder/entity/SaleOrderEntity.java b/src/main/java/cn/lihongjie/coal/saleOrder/entity/SaleOrderEntity.java index b8a3d510..0a552012 100644 --- a/src/main/java/cn/lihongjie/coal/saleOrder/entity/SaleOrderEntity.java +++ b/src/main/java/cn/lihongjie/coal/saleOrder/entity/SaleOrderEntity.java @@ -103,12 +103,10 @@ public class SaleOrderEntity extends OrgCommonEntity { @Override public void prePersist() { super.prePersist(); - this.startTime = this.saleDate==null ? null: this.saleDate.atStartOfDay(); } @Override public void preUpdate() { super.preUpdate(); - this.startTime = this.saleDate==null ? null: this.saleDate.atStartOfDay(); } } diff --git a/src/main/java/cn/lihongjie/coal/supplier/dto/CreateSupplierDto.java b/src/main/java/cn/lihongjie/coal/supplier/dto/CreateSupplierDto.java index e0fa88b4..7d5668b9 100644 --- a/src/main/java/cn/lihongjie/coal/supplier/dto/CreateSupplierDto.java +++ b/src/main/java/cn/lihongjie/coal/supplier/dto/CreateSupplierDto.java @@ -2,9 +2,16 @@ package cn.lihongjie.coal.supplier.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import io.hypersistence.utils.hibernate.type.array.ListArrayType; + +import jakarta.persistence.Column; + import lombok.Data; import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Type; + +import java.util.List; @Data public class CreateSupplierDto extends OrgCommonDto { @@ -26,4 +33,11 @@ public class CreateSupplierDto extends OrgCommonDto { @Comment("是否客户") private Boolean isCustomer; + + + + @Comment("衡器宝别名") + @Column(columnDefinition = "text[]") + @Type(ListArrayType.class) + private List weightDataAlias; } diff --git a/src/main/java/cn/lihongjie/coal/supplier/dto/SupplierDto.java b/src/main/java/cn/lihongjie/coal/supplier/dto/SupplierDto.java index 508b8db0..1b9770ed 100644 --- a/src/main/java/cn/lihongjie/coal/supplier/dto/SupplierDto.java +++ b/src/main/java/cn/lihongjie/coal/supplier/dto/SupplierDto.java @@ -2,9 +2,16 @@ package cn.lihongjie.coal.supplier.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import io.hypersistence.utils.hibernate.type.array.ListArrayType; + +import jakarta.persistence.Column; + import lombok.Data; import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Type; + +import java.util.List; @Data public class SupplierDto extends OrgCommonDto { @@ -25,4 +32,11 @@ public class SupplierDto extends OrgCommonDto { @Comment("是否客户") private Boolean isCustomer; + + + + @Comment("衡器宝别名") + @Column(columnDefinition = "text[]") + @Type(ListArrayType.class) + private List weightDataAlias; } diff --git a/src/main/java/cn/lihongjie/coal/supplier/dto/UpdateSupplierDto.java b/src/main/java/cn/lihongjie/coal/supplier/dto/UpdateSupplierDto.java index 1633f0dd..715e5f79 100644 --- a/src/main/java/cn/lihongjie/coal/supplier/dto/UpdateSupplierDto.java +++ b/src/main/java/cn/lihongjie/coal/supplier/dto/UpdateSupplierDto.java @@ -2,9 +2,16 @@ package cn.lihongjie.coal.supplier.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; +import io.hypersistence.utils.hibernate.type.array.ListArrayType; + +import jakarta.persistence.Column; + import lombok.Data; import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Type; + +import java.util.List; @Data public class UpdateSupplierDto extends OrgCommonDto { @@ -26,4 +33,11 @@ public class UpdateSupplierDto extends OrgCommonDto { @Comment("是否客户") private Boolean isCustomer; + + + + @Comment("衡器宝别名") + @Column(columnDefinition = "text[]") + @Type(ListArrayType.class) + private List weightDataAlias; } diff --git a/src/main/java/cn/lihongjie/coal/supplier/entity/SupplierEntity.java b/src/main/java/cn/lihongjie/coal/supplier/entity/SupplierEntity.java index 09cc3cf6..33ecb8ed 100644 --- a/src/main/java/cn/lihongjie/coal/supplier/entity/SupplierEntity.java +++ b/src/main/java/cn/lihongjie/coal/supplier/entity/SupplierEntity.java @@ -2,11 +2,17 @@ package cn.lihongjie.coal.supplier.entity; import cn.lihongjie.coal.base.entity.OrgCommonEntity; +import io.hypersistence.utils.hibernate.type.array.ListArrayType; + +import jakarta.persistence.Column; import jakarta.persistence.Entity; import lombok.Data; import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Type; + +import java.util.List; @Data @Entity @@ -32,4 +38,13 @@ public class SupplierEntity extends OrgCommonEntity { @Comment("是否客户") private Boolean isCustomer; + + + + + @Comment("衡器宝别名") + @Column(columnDefinition = "text[]") + @Type(ListArrayType.class) + private List weightDataAlias; + }