上传附件

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

@@ -7,6 +7,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 
 @AllArgsConstructor
@@ -26,6 +27,7 @@ public class Attachment extends BaseEntity {
 
     private String fileName;
 
+    @Column(columnDefinition = "TEXT")
     private String url;
 
     private String remark;

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

@@ -1,4 +1,15 @@
 package com.izouma.uwip.domain;
 
+import io.swagger.annotations.ApiModelProperty;
+
 public class InternationalPatent extends BaseEntity {
+
+    @ApiModelProperty(value = "申请人统一社会信用代码")
+    private String applicantUscc;
+
+    @ApiModelProperty(value = "第一发明人身份证")
+    private String inventorIdno;
+
+//    private boolean
+
 }

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

@@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
-import java.util.List;
 
 public interface AttachmentRepo extends JpaRepository<Attachment, Long>, JpaSpecificationExecutor<Attachment> {
     @Query("update Attachment t set t.del = true where t.id = ?1")
@@ -17,6 +16,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 patent_id = ?2 and attachment_name like '%'+ ?1 + '%'")
+            "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(), patentId))
+                    .version(attachmentRepo.findVersion("%" + dto.getAttachmentName() + "%", patentId))
                     .build();
             attachmentRepo.save(build);
         });

src/main/java/com/izouma/uwip/web/LogoPatentController.java

@@ -34,6 +34,7 @@ public class LogoPatentController extends BaseController {
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
     public Page<LogoPatent> all(@RequestBody PageQuery pageQuery) {
+        pageQuery.setSort("createdAt,desc");
         return logoPatentService.all(pageQuery);
     }
 

src/test/java/com/izouma/uwip/repo/AttachmentRepoTest.java

@@ -0,0 +1,17 @@
+package com.izouma.uwip.repo;
+
+import com.izouma.uwip.ApplicationTests;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+public class AttachmentRepoTest extends ApplicationTests {
+
+    @Autowired
+    private AttachmentRepo attachmentRepo;
+
+    @Test
+    public void findVersion() {
+        System.out.println(attachmentRepo.findVersion("%商标查询报告书%", 106L));
+    }
+}