licailing 3 år sedan
förälder
incheckning
3f9a5d49d2

+ 2 - 1
src/main/java/com/izouma/nineth/repo/CollectionRepo.java

@@ -169,5 +169,6 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
     @Query("select c from Collection c join c.tags t on t.id = ?1 ")
     Page<Collection> byTag(Long tagId, Pageable pageable);
 
-    int countAllBySourceAndNameLike(CollectionSource source, String name);
+    @Query("select count(id) from Collection where source = 'TRANSFER' and name like ?1")
+    int countAllByNameLike(String name);
 }

+ 3 - 2
src/main/java/com/izouma/nineth/service/ShowroomService.java

@@ -341,8 +341,9 @@ public class ShowroomService {
                                     } else {
                                         String name = StringUtils.isEmpty(collection.getPrefixName()) ?
                                                 collection.getName() : collection.getPrefixName();
-                                        showroom.setNum(collectionRepo
-                                                .countAllBySourceAndNameLike(CollectionSource.TRANSFER, '%' + name + '%'));
+
+                                        int num = collectionRepo.countAllByNameLike("%" + name + "%");
+                                        showroom.setNum(num);
                                     }
                                 }
                             });

+ 5 - 1
src/test/java/com/izouma/nineth/repo/CollectionRepoTest.java

@@ -8,7 +8,6 @@ import com.izouma.nineth.service.AssetService;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;
 
 import javax.persistence.criteria.*;
@@ -79,4 +78,9 @@ public class CollectionRepoTest extends ApplicationTests {
             }
         });
     }
+
+    @Test
+    public void test() {
+        System.out.println(collectionRepo.countAllByNameLike('%' + "123%"));
+    }
 }

+ 13 - 0
src/test/java/com/izouma/nineth/service/ShowroomServiceTest.java

@@ -3,11 +3,13 @@ package com.izouma.nineth.service;
 import com.izouma.nineth.ApplicationTests;
 import com.izouma.nineth.domain.ShowCollection;
 import com.izouma.nineth.domain.Showroom;
+import com.izouma.nineth.dto.PageQuery;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 public class ShowroomServiceTest extends ApplicationTests {
@@ -170,4 +172,15 @@ public class ShowroomServiceTest extends ApplicationTests {
         showroomService.update(9972L, showroom);
 
     }
+
+    @Test
+    public void test() {
+        PageQuery pageQuery = new PageQuery();
+        Map<String, Object> query = pageQuery.getQuery();
+        query.put("status", "SUCCESS");
+        query.put("type", "COMPANY,COMPANY_BOX");
+        query.put("publish", true);
+        query.put("del", false);
+        showroomService.show(pageQuery);
+    }
 }