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

完善

Browse Source
This commit is contained in:
lihongjie0209
2023-09-16 21:58:38 +08:00
parent b1afcae0e2
commit 80021a8813
4 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/cn/lihongjie/coal/coalBlend/dto/CoalBlendDto.java
View File

@@ -1,9 +1,6 @@
package cn.lihongjie.coal.coalBlend.dto;
import cn.lihongjie.coal.coalBlend.entity.CoalBlendType;
import cn.lihongjie.coal.coalBlend.entity.CoalBlendCoalInfoEntity;
import cn.lihongjie.coal.coalBlend.entity.CoalBlendConstrainVo;
import cn.lihongjie.coal.coalBlend.entity.CoalParameterDefVo;
import cn.lihongjie.coal.coalBlend.entity.*;
import cn.lihongjie.coal.base.dto.OrgCommonDto;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
@@ -30,7 +27,7 @@ public class CoalBlendDto extends OrgCommonDto {
@NotNull(message = "约束条件不能为空")
private CoalBlendConstrainVo constrains;
private List<CoalBlendCoalInfoEntity> results;
private List<CoalBlendResultInfoEntity> results;
@Enumerated(value = EnumType.STRING)
@NotNull()

7
src/main/java/cn/lihongjie/coal/coalBlend/dto/CreateCoalBlendDto.java
View File

@@ -1,10 +1,7 @@
package cn.lihongjie.coal.coalBlend.dto;
import cn.lihongjie.coal.base.dto.OrgCommonDto;
import cn.lihongjie.coal.coalBlend.entity.CoalBlendType;
import cn.lihongjie.coal.coalBlend.entity.CoalBlendCoalInfoEntity;
import cn.lihongjie.coal.coalBlend.entity.CoalBlendConstrainVo;
import cn.lihongjie.coal.coalBlend.entity.CoalParameterDefVo;
import cn.lihongjie.coal.coalBlend.entity.*;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.validation.constraints.NotEmpty;
@@ -30,7 +27,7 @@ public class CreateCoalBlendDto extends OrgCommonDto {
@NotNull(message = "约束条件不能为空")
private CoalBlendConstrainVo constrains;
private List<CoalBlendCoalInfoEntity> results;
private List<CoalBlendResultInfoEntity> results;
@Enumerated(value = EnumType.STRING)
@NotNull()

7
src/main/java/cn/lihongjie/coal/coalBlend/dto/UpdateCoalBlendDto.java
View File

@@ -1,10 +1,7 @@
package cn.lihongjie.coal.coalBlend.dto;
import cn.lihongjie.coal.base.dto.OrgCommonDto;
import cn.lihongjie.coal.coalBlend.entity.CoalBlendType;
import cn.lihongjie.coal.coalBlend.entity.CoalBlendCoalInfoEntity;
import cn.lihongjie.coal.coalBlend.entity.CoalBlendConstrainVo;
import cn.lihongjie.coal.coalBlend.entity.CoalParameterDefVo;
import cn.lihongjie.coal.coalBlend.entity.*;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.validation.constraints.NotEmpty;
@@ -30,7 +27,7 @@ public class UpdateCoalBlendDto extends OrgCommonDto {
@NotNull(message = "约束条件不能为空")
private CoalBlendConstrainVo constrains;
private List<CoalBlendCoalInfoEntity> results;
private List<CoalBlendResultInfoEntity> results;
@Enumerated(value = EnumType.STRING)
@NotNull()

3
src/main/java/cn/lihongjie/coal/coalBlend/entity/CoalParameterDefVo.java
View File

@@ -17,6 +17,9 @@ public class CoalParameterDefVo {
@Comment("备注")
private String remarks;
@Comment("备注")
private String parentName;
@Comment("排序键")