Merge branch 'feat-1002061' into 'master'

1002061【紧急】平台端-资源管理-书刊管理-编辑添加书刊，增加出版社搜索条件

See merge request rays/pcloud-book!259

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookFacade.java

@@ -481,6 +481,7 @@ public interface BookFacade {
                                            @RequestParam(value = "startDate", required = false) String startDate,
                                            @RequestParam(value = "endDate", required = false) String endDate,
                                            @RequestParam(value = "bookName", required = false) String bookName,
+                                           @RequestParam(value = "publish", required = false) String publish,
                                            @RequestParam(value = "currentPage") Integer currentPage,
                                            @RequestParam(value = "numPerPage") Integer numPerPage,
                                            @RequestParam(value = "secondTempletId", required = false) Long secondTempletId)

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java

@@ -632,6 +632,7 @@ public class BookFacadeImpl implements BookFacade {
                                                   @RequestParam(value = "startDate", required = false) String startDate,
                                                   @RequestParam(value = "endDate", required = false) String endDate,
                                                   @RequestParam(value = "bookName", required = false) String bookName,
+                                                  @RequestParam(value = "publish", required = false) String publish,
                                                   @RequestParam(value = "currentPage") Integer currentPage,
                                                   @RequestParam(value = "numPerPage") Integer numPerPage,
                                                   @RequestParam(value = "secondTempletId", required = false) Long secondTempletId)
@@ -646,6 +647,7 @@ public class BookFacadeImpl implements BookFacade {
         paramMap.put("startDate", startDate);
         paramMap.put("endDate", endDate);
         paramMap.put("bookName", bookName);
+        paramMap.put("publish", publish);
         paramMap.put("secondTempletId", secondTempletId);
         paramMap.put("secondTempletIds",Optional.ofNullable(paramMap.get("secondTempletId")).map(Lists::newArrayList).orElse(Lists.newArrayList()));
         if(!StringUtil.isEmpty(bookName)){

pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml

@@ -1327,6 +1327,9 @@
 				)
 			)
 	    </if>
+		<if test="publish!=null">
+			AND b.PUBLISH LIKE CONCAT('%', #{publish},'%')
+		</if>
 	</select>
 
 	<select id="listBookClassifyCount" resultType="Long" parameterType="map">
@@ -1334,7 +1337,6 @@
 		   count(1)
 		FROM
 		   BOOK_ADVISER ba
-		<if test="typeCode!=null or bookName!=null">
 		 JOIN
 			BOOK b
 		 ON
@@ -1343,7 +1345,6 @@
 			BOOK_TYPE bt
 			ON
 			b.TYPE_CODE = bt.TYPE_CODE
-		</if>
 		WHERE
 		ba.IS_DELETE = 0
 		<if test="typeCode!=null">
@@ -1373,6 +1374,9 @@
 				)
 			)
 	    </if>
+		<if test="publish!=null">
+			AND b.PUBLISH LIKE CONCAT('%', #{publish},'%')
+		</if>
 	</select>