lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 15:55:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

洗煤报表添加原煤明细信息

Browse Source
This commit is contained in:
lihongjie0209
2024-05-01 20:25:41 +08:00
parent efe3338743
commit 66f5076ed4
5 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CoalWashingDailyAnalysisDto.java
View File

@@ -4,6 +4,7 @@ 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 cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisYmDetailVo;
import cn.lihongjie.coal.common.DictCode;
import cn.lihongjie.coal.pojoProcessor.DictTranslate;
@@ -37,6 +38,7 @@ public class CoalWashingDailyAnalysisDto extends OrgCommonDto {
@ElementCollection
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
private List<CoalWashingDailyAnalysisItemVo> inputItems;
private List<CoalWashingDailyAnalysisYmDetailVo> ymDetails;
@ElementCollection
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))

2
src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/CreateCoalWashingDailyAnalysisDto.java
View File

@@ -4,6 +4,7 @@ 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 cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisYmDetailVo;
import jakarta.persistence.CollectionTable;
import jakarta.persistence.ConstraintMode;
@@ -38,6 +39,7 @@ public class CreateCoalWashingDailyAnalysisDto extends OrgCommonDto {
@ElementCollection
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
private List<CoalWashingDailyAnalysisItemVo> inputItems;
private List<CoalWashingDailyAnalysisYmDetailVo> ymDetails;
@ElementCollection
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))

2
src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/dto/UpdateCoalWashingDailyAnalysisDto.java
View File

@@ -4,6 +4,7 @@ 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 cn.lihongjie.coal.coalWashingDailyAnalysis.entity.CoalWashingDailyAnalysisYmDetailVo;
import jakarta.persistence.CollectionTable;
import jakarta.persistence.ConstraintMode;
@@ -38,6 +39,7 @@ public class UpdateCoalWashingDailyAnalysisDto extends OrgCommonDto {
@ElementCollection
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
private List<CoalWashingDailyAnalysisItemVo> inputItems;
private List<CoalWashingDailyAnalysisYmDetailVo> ymDetails;
@ElementCollection
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))

6
src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisEntity.java
View File

@@ -51,6 +51,12 @@ public class CoalWashingDailyAnalysisEntity extends OrgCommonEntity {
@Fetch(FetchMode.SUBSELECT)
private List<CoalWashingDailyAnalysisItemVo> inputItems;
@ElementCollection()
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
@Fetch(FetchMode.SUBSELECT)
private List<CoalWashingDailyAnalysisYmDetailVo> ymDetails;
@ElementCollection()
@CollectionTable(foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
@Fetch(FetchMode.SUBSELECT)

20
src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/entity/CoalWashingDailyAnalysisYmDetailVo.java Normal file
View File

@@ -0,0 +1,20 @@
package cn.lihongjie.coal.coalWashingDailyAnalysis.entity;
import jakarta.persistence.Embeddable;
import lombok.Data;
import java.util.*;
@Embeddable
@Data
public class CoalWashingDailyAnalysisYmDetailVo {
private String id;
private String code;
private String name;
private Double percent;
private Double amount;
}