diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index ecb13e1..43f4387 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -13,6 +14,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :数据导入明细 @@ -65,4 +67,9 @@ public class ImportDetail extends BaseAPS { this.projectId = project != null ? project.getId() : 0l; BeanRelation.set(this, EImportDetail.Project, project); } + + @JsonBackReference + public List getFields() { + return BeanRelation.list(this, EImportDetail.Fields); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index a8d3b36..f875d24 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -1,6 +1,10 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; +import cn.estsh.i3plus.pojo.aps.holders.EImportField; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,6 +13,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :数据导入明细 @@ -24,6 +29,10 @@ import javax.persistence.Table; @Api("数据导入字段配置") public class ImportField extends BaseAPS { + @Column(name="FIELD_NAME") + @ApiParam("字段名") + private String fieldName; + @Column(name="DEFAULT_VALUE") @ApiParam("默认值") private String defaultValue; @@ -38,4 +47,21 @@ public class ImportField extends BaseAPS { @Column(name="MAX_LENGTH") @ApiParam(value = "最大长度", example = "0") private Integer maxLength; + + @Transient + private boolean hasDeal = false; + + @Column(name="DETAIL_ID") + @ApiParam(value ="导入明细ID") + @FieldAnnotation(relation = "ImportDetail") + private Long detailId; + + public ImportDetail getDetail() { + return BeanRelation.get(this, EImportField.Detail); + } + + public void setDetail(ImportDetail detail) { + this.detailId = detail != null ? detail.getId() : 0l; + BeanRelation.set(this, EImportField.Detail, detail); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java index f78c6ac..50772bb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EImportDetail { - Project + Project, + Fields } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java new file mode 100644 index 0000000..9513b03 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EImportField { + Detail +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml new file mode 100644 index 0000000..7b677e9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file