操作人

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

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 
 @AllArgsConstructor
@@ -45,4 +46,39 @@ public class CountryPatent extends BaseEntity {
 
     @ApiModelProperty(value = "授权日")
     private LocalDate grantDate;
+
+    /*
+    翻译
+     */
+    @ApiModelProperty(value = "翻译字数")
+    private long translateWord;
+
+    @ApiModelProperty(value = "翻译语种")
+    private String translationLanguage;
+
+    @ApiModelProperty(value = "单价/千字")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty(value = "总价")
+    private BigDecimal totalPrice;
+
+    @ApiModelProperty(value = "翻译交期")
+    private LocalDate translationPeriod;
+
+    @ApiModelProperty(value = "是否决定答复")
+    private Boolean decideReply;
+
+    /*
+    true 客户准备
+    false 律师准备
+     */
+    @ApiModelProperty(value = "准备答复意见")
+    private Boolean isClientReady;
+
+    @ApiModelProperty(value = "是否通过答复")
+    private Boolean replyPassed;
+
+    @ApiModelProperty(value = "办登缴费期限")
+    private LocalDate registerPeriod;
+
 }

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

@@ -2,14 +2,18 @@ package com.izouma.uwip.domain;
 
 import com.izouma.uwip.enums.LogoWorkflow;
 import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 
 @Data
 @Builder
 @ApiModel(value = "处理人")
+@AllArgsConstructor
+@NoArgsConstructor
 public class Handle {
     private Long userId;
 

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

@@ -90,4 +90,6 @@ public class Patent extends BaseEntity {
     @ApiModelProperty(value = "申请日")
     private LocalDate applyDate;
 
+
+
 }

src/main/java/com/izouma/uwip/repo/AttachmentRepo.java

@@ -17,6 +17,6 @@ public interface AttachmentRepo extends JpaRepository<Attachment, Long>, JpaSpec
 
     @Query(nativeQuery = true, value = "select ifnull(max(attachment.version + 1),1) " +
             "from  attachment " +
-            "where del = true and attachment_name like '%'+ ?1 + '%'")
-    int findVersion(String attachmentName);
+            "where del = true and patent_id = ?2 and attachment_name like '%'+ ?1 + '%'")
+    int findVersion(String attachmentName, Long patentId);
 }

src/main/java/com/izouma/uwip/service/AttachmentService.java

@@ -54,7 +54,7 @@ public class AttachmentService {
                     .url(dto.getUrl())
                     .remark(dto.getRemark())
                     .size(getSize(dto.getUrl()) + "KB")
-                    .version(attachmentRepo.findVersion(dto.getAttachmentName()))
+                    .version(attachmentRepo.findVersion(dto.getAttachmentName(), patentId))
                     .build();
             attachmentRepo.save(build);
         });

src/main/java/com/izouma/uwip/service/LogoPatentService.java

@@ -59,7 +59,7 @@ public class LogoPatentService {
                 attachmentService.batchSave(record.getAttachments(), id, record.getId());
             }
             ObjUtils.merge(orig, record);
-            orig.getHandle().add(this.saveHandle(workflow, id));
+//            orig.getHandle().add(this.saveHandle(workflow, id));
             orig.setApplyStatus(this.getApplyStatus(workflow));
             return logoPatentRepo.save(orig);
         }