设计数据库

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

@@ -13,6 +13,12 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @ApiModel(value = "附件")
 public class Attachment extends BaseEntity {
+    @ApiModelProperty(value = "专利id")
+    private Long patentId;
+
+    /*
+    上传的海外账单等
+     */
     private String attachmentName;
 
     private String fileName;
@@ -26,7 +32,4 @@ public class Attachment extends BaseEntity {
 
     @ApiModelProperty(value = "版本")
     private int version;
-
-    private Long patentId;
-
 }

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

@@ -0,0 +1,48 @@
+package com.izouma.uwip.domain;
+
+import com.izouma.uwip.enums.ApplyRoute;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import java.time.LocalDate;
+
+@AllArgsConstructor
+@Data
+@Builder
+@NoArgsConstructor
+@ApiModel(value = "国家申请")
+public class CountryPatent extends BaseEntity {
+
+    private String country;
+
+    @Enumerated(EnumType.STRING)
+    @ApiModelProperty(value = "申请途径")
+    private ApplyRoute applyRoute;
+
+    /*
+    选择pct时必填
+    */
+    @ApiModelProperty(value = "pct申请号")
+    private String pctApplyNo;
+
+    @ApiModelProperty(value = "pct申请日")
+    private String pctApplyDate;
+
+    @ApiModelProperty(value = "pct公开号")
+    private String pctPublicNo;
+
+    @ApiModelProperty(value = "pct公开日")
+    private String pctPublicDate;
+
+    @ApiModelProperty(value = "授权号")
+    private String grantNo;
+
+    @ApiModelProperty(value = "授权日")
+    private LocalDate grantDate;
+}

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

@@ -0,0 +1,4 @@
+package com.izouma.uwip.domain;
+
+public class DomesticPatent extends BaseEntity {
+}

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

@@ -1,20 +1,55 @@
 package com.izouma.uwip.domain;
 
-import com.izouma.uwip.enums.FeeType;
 import com.izouma.uwip.enums.PayStatus;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
 @AllArgsConstructor
 @Data
 @Builder
 @NoArgsConstructor
 @ApiModel(value = "费用")
 public class Fee extends BaseEntity {
-    private FeeType type;
+    @ApiModelProperty(value = "专利id")
+    private Long patentId;
+
+    @ApiModelProperty(value = "官费类型名称id")
+    private Long typeMaintenanceId;
 
     private PayStatus status;
+
+    /*
+    客户列表
+     */
+    @ApiModelProperty(value = "专利权人")
+    private Long patentPartnerId;
+
+    /*
+    供应商列表
+     */
+    @ApiModelProperty(value = "支付对象")
+    private Long payPartnerId;
+
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "币种")
+    private Long currencyMaintenanceId;
+
+    @ApiModelProperty(value = "支付期限")
+    private LocalDate paymentDeadline;
+
+    @ApiModelProperty(value = "支付日期")
+    private LocalDate paymentDate;
+
+    private String remark;
+
+    @ApiModelProperty(value = "是否发票回传")
+    private Boolean invoiceReturn;
 }

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

@@ -0,0 +1,4 @@
+package com.izouma.uwip.domain;
+
+public class InternationalPatent extends BaseEntity {
+}

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

@@ -0,0 +1,24 @@
+package com.izouma.uwip.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@Data
+@Builder
+@NoArgsConstructor
+@ApiModel(value = "维护信息")
+public class Maintenance extends BaseEntity {
+
+    private String name;
+
+    private String description;
+
+//    private String type;
+
+    private Long parent;
+
+}

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

@@ -1,5 +1,6 @@
 package com.izouma.uwip.domain;
 
+import com.izouma.uwip.enums.ApplyStatus;
 import com.izouma.uwip.enums.PatentType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,21 +11,83 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import java.time.LocalDate;
 
 @AllArgsConstructor
 @Data
 @Builder
 @NoArgsConstructor
 @ApiModel(value = "专利申请")
-public class Patent extends BaseEntity{
+public class Patent extends BaseEntity {
+    private String workflow;
+
+    @ApiModelProperty(value = "专利名称")
     private String name;
 
+    private ApplyStatus status;
+
     @ApiModelProperty(value = "专利类型")
     @Enumerated(EnumType.STRING)
     private PatentType type;
 
+    /*
+    客户编码（由客户经理填写）+年份+案件类型+连接符+案件阶段[+国家]+序列号
+     */
+    @ApiModelProperty(value = "寰球案号")
+    private String uwNo;
+
     @ApiModelProperty(value = "客户id")
-    private Long partnerId;
+    private Long clientPartnerId;
+
+    @ApiModelProperty(value = "供应商")
+    private Long supplierPartnerId;
+
+    @ApiModelProperty(value = "供应商案号")
+    private String supplierNo;
+
+    @ApiModelProperty(value = "供应商提交期限")
+    private LocalDate supplierSubmitPeriod;
+
+    @ApiModelProperty(value = "申请人名称")
+    private String applicantName;
+
+    @ApiModelProperty(value = "申请人英文名称")
+    private String applicantEnName;
+
+    @ApiModelProperty(value = "申请人地址")
+    private String applicantAddress;
+
+    @ApiModelProperty(value = "申请人英文地址")
+    private String applicantEnAddress;
+
+    @ApiModelProperty(value = "发明人名称")
+    private String inventorName;
+
+    @ApiModelProperty(value = "发明人英文名称")
+    private String inventorEnName;
+
+    @ApiModelProperty(value = "优先权号")
+    private String priorityNo;
+
+    @ApiModelProperty(value = "优先权日")
+    private LocalDate priorityDate;
+
+    @ApiModelProperty(value = "优先权国别")
+    private String priorityCountry;
+
+    @ApiModelProperty(value = "提交期限")
+    private LocalDate submitPeriod;
+
+    /*
+    =优先权日+30个月
+     */
+    @ApiModelProperty(value = "官方期限")
+    private LocalDate officialPeriod;
+
+    @ApiModelProperty(value = "申请号")
+    private String applyNo;
 
+    @ApiModelProperty(value = "申请日")
+    private LocalDate applyDate;
 
 }

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

@@ -0,0 +1,4 @@
+package com.izouma.uwip.domain;
+
+public class Translate {
+}

src/main/java/com/izouma/uwip/enums/ApplyRoute.java

@@ -0,0 +1,12 @@
+package com.izouma.uwip.enums;
+
+public enum ApplyRoute {
+    /*
+    pct
+     */
+    PCT,
+    /*
+    单一国申请
+     */
+    SINGLE
+}

src/main/java/com/izouma/uwip/enums/ApplyStatus.java

@@ -0,0 +1,19 @@
+package com.izouma.uwip.enums;
+
+public enum ApplyStatus {
+    APPLY_STAGE("申请阶段"),
+    REVIEW_STAGE("审查阶段"),
+    GRANT_STAGE("授权阶段"),
+    COMPLETED("已完成")
+    ;
+
+    private final String description;
+
+    public String getDescription() {
+        return description;
+    }
+
+    ApplyStatus(String description) {
+        this.description = description;
+    }
+}

src/main/java/com/izouma/uwip/enums/FeeType.java

@@ -1,15 +0,0 @@
-package com.izouma.uwip.enums;
-
-public enum FeeType {
-    /*
-    官费
-     */
-
-    /*
-    代理费
-     */
-
-    /*
-    其他
-     */
-}

src/main/java/com/izouma/uwip/enums/PayStatus.java

@@ -4,8 +4,9 @@ public enum PayStatus {
     /*
     已支付
      */
-
+    PAID,
     /*
     未支付
      */
+    UNPAID
 }