Merge remote-tracking branch 'origin/test' into test

src/main/java/com/uas/credit/model/corpriskinfo/CorpRiskInfo.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
  * created by shicr on 2018/6/12
  **/
 @Table
-@Entity(name = "risk")
+@Entity(name = "riskinfo")
 public class CorpRiskInfo implements Serializable {
 
     /**
@@ -43,14 +43,14 @@ public class CorpRiskInfo implements Serializable {
     private Details details;
 
     @OneToOne(cascade = CascadeType.PERSIST)
-    private EnRiskInfoReport enRiskInfoReport;
+    private EnRiskCisReport enRiskCisReport;
 
-    public EnRiskInfoReport getEnRiskInfoReport() {
-        return enRiskInfoReport;
+    public EnRiskCisReport getEnRiskCisReport() {
+        return enRiskCisReport;
     }
 
-    public void setEnRiskInfoReport(EnRiskInfoReport enRiskInfoReport) {
-        this.enRiskInfoReport = enRiskInfoReport;
+    public void setEnRiskCisReport(EnRiskCisReport enRiskCisReport) {
+        this.enRiskCisReport = enRiskCisReport;
     }
 
     public Long getId() {

src/main/java/com/uas/credit/model/corpriskinfo/EnRiskCisReport.java

@@ -0,0 +1,43 @@
+package com.uas.credit.model.corpriskinfo;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * 风险子报告
+ * created by shicr on 2018/6/22
+ **/
+@Entity
+@Table(name = "risk$cisreport")
+public class EnRiskCisReport implements Serializable {
+
+    /**
+     * default serialVersionUID
+     */
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @OneToOne(cascade = CascadeType.PERSIST)
+    @JoinColumn(name = "riskinfo_id")
+    private CorpRiskInfo corpRiskInfo;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public CorpRiskInfo getCorpRiskInfo() {
+        return corpRiskInfo;
+    }
+
+    public void setCorpRiskInfo(CorpRiskInfo corpRiskInfo) {
+        this.corpRiskInfo = corpRiskInfo;
+    }
+}

src/main/java/com/uas/credit/model/corpriskinfo/EnRiskInfoReport.java

@@ -3,6 +3,7 @@ package com.uas.credit.model.corpriskinfo;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 企业风险信息报告
@@ -34,9 +35,9 @@ public class EnRiskInfoReport implements Serializable {
     @Column(name = "unitName")
     private String unitName;
 
-    @OneToOne(cascade = CascadeType.PERSIST)
+    @OneToMany(cascade = CascadeType.PERSIST)
     @JoinColumn(name = "risk_id")
-    private CorpRiskInfo corpRiskInfo;
+    private List<EnRiskCisReport> cisReport;
 
     @OneToOne(cascade = {CascadeType.PERSIST})
     private EnRiskInfoRoot enRiskInfoRoot;
@@ -73,11 +74,11 @@ public class EnRiskInfoReport implements Serializable {
         this.enRiskInfoRoot = enRiskInfoRoot;
     }
 
-    public CorpRiskInfo getCorpRiskInfo() {
-        return corpRiskInfo;
+    public List<EnRiskCisReport> getCisReport() {
+        return cisReport;
     }
 
-    public void setCorpRiskInfo(CorpRiskInfo corpRiskInfo) {
-        this.corpRiskInfo = corpRiskInfo;
+    public void setCisReport(List<EnRiskCisReport> cisReport) {
+        this.cisReport = cisReport;
     }
 }

src/main/java/com/uas/credit/model/corpriskinfo/EnRiskInfoRoot.java

@@ -24,7 +24,7 @@ public class EnRiskInfoRoot implements Serializable {
     @Column(name = "status")
     private Integer status;
 
-    @OneToOne(cascade = CascadeType.ALL)
+    @OneToOne(cascade = CascadeType.PERSIST)
     @JoinColumn(name = "eri_id")
     private EnRiskInfoReport returnValue;
 

src/main/java/com/uas/credit/model/debtinfo/EndeptinfoReport.java

@@ -1,10 +1,8 @@
 package com.uas.credit.model.debtinfo;
 
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 /**