数据库

src/main/java/com/izouma/uwip/domain/CountryPatent.java

@@ -1,6 +1,7 @@
 package com.izouma.uwip.domain;
 
 import com.izouma.uwip.enums.ApplyRoute;
+import com.izouma.uwip.enums.CountryWorkflow;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -20,6 +21,9 @@ import java.time.LocalDate;
 @ApiModel(value = "国家申请")
 public class CountryPatent extends BaseEntity {
 
+    @ApiModelProperty(value = "流程")
+    private CountryWorkflow workflow;
+
     private String country;
 
     @Enumerated(EnumType.STRING)

src/main/java/com/izouma/uwip/domain/DomesticPatent.java

@@ -1,5 +1,6 @@
 package com.izouma.uwip.domain;
 
+import com.izouma.uwip.enums.DomesticWorkflow;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -7,13 +8,22 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import java.math.BigDecimal;
 import java.time.LocalDate;
+
 @AllArgsConstructor
 @Data
 @Builder
 @NoArgsConstructor
 @ApiModel(value = "国内申请")
 public class DomesticPatent extends BaseEntity {
+
+    @Enumerated(EnumType.STRING)
+    @ApiModelProperty(value = "流程")
+    private DomesticWorkflow workflow;
+
     @ApiModelProperty(value = "申请人统一社会信用代码")
     private String applicantUscc;
 
@@ -50,4 +60,22 @@ public class DomesticPatent extends BaseEntity {
 
     @ApiModelProperty(value = "办登通知日")
     private LocalDate registerNotice;
+
+    @ApiModelProperty(value = "办登截止日")
+    private LocalDate registerEndDate;
+
+    @ApiModelProperty(value = "费用备注")
+    private String feeRemark;
+
+    @ApiModelProperty(value = "是否已缴费")
+    private Boolean payment;
+
+    @ApiModelProperty(value = "年费")
+    private BigDecimal AnnualFee;
+
+    @ApiModelProperty(value = "年费支付期限")
+    private LocalDate feePaymentPeriod;
+
+    @ApiModelProperty(value = "账单")
+    private String bill;
 }

src/main/java/com/izouma/uwip/domain/InternationalPatent.java

@@ -1,15 +1,37 @@
 package com.izouma.uwip.domain;
 
+import com.izouma.uwip.enums.InternationalWorkflow;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
-//@AllArgsConstructor
+import java.math.BigDecimal;
+
+@AllArgsConstructor
 @Data
 @Builder
-//@NoArgsConstructor
+@NoArgsConstructor
 @ApiModel(value = "国际申请")
 public class InternationalPatent extends BaseEntity {
+    @ApiModelProperty(value = "流程")
+    private InternationalWorkflow workflow;
+
+    @ApiModelProperty(value = "pct申请号")
+    private String pctApplyNo;
+
+    @ApiModelProperty(value = "pct申请日")
+    private String pctApplyDate;
+
+    @ApiModelProperty(value = "官费实际金额")
+    private BigDecimal actualOfficialAmount;
+
+    @ApiModelProperty(value = "答复意见状态")
+    private String replyStatus;
 
+    @ApiModelProperty(value = "是否继续官文流转")
+    private Boolean officialCirculation;
 
 }

src/main/java/com/izouma/uwip/domain/Patent.java

@@ -19,7 +19,7 @@ import java.time.LocalDate;
 @NoArgsConstructor
 @ApiModel(value = "专利申请")
 public class Patent extends BaseEntity {
-    private String workflow;
+//    private String workflow;
 
     @ApiModelProperty(value = "专利名称")
     private String name;
@@ -75,7 +75,7 @@ public class Patent extends BaseEntity {
     @ApiModelProperty(value = "优先权国别")
     private String priorityCountry;
 
-    @ApiModelProperty(value = "提交期限")
+    @ApiModelProperty(value = "提交期限/内部期限")
     private LocalDate submitPeriod;
 
     /*