add import field

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<ImportField> getFields() {
+        return BeanRelation.list(this, EImportDetail.Fields);
+    }
 }

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);
+    }
 }

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
 }

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
+}

modules/i3plus-pojo-aps/src/main/resources/relations/ImportDetail.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="ImportDetail">
+    <Relation field="Fields" name="ImportField" reverse="Detail" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+</Class>