Merge branch 'feature/1004461' into 'master'

feat: [1004461] RAYS编辑端小优化（二维码码配置与图书标签搜索）

See merge request rays/pcloud-book!1250

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

@@ -178,7 +178,14 @@ public interface BookFacade {
                                               @RequestParam(value = "thirdTempletId", required = false) Long thirdTempletId,
                                               @RequestParam(value = "hasQrcode",required = false) Integer hasQrcode,
                                               @RequestParam(value = "isPrint", required = false) Boolean isPrint,
-                                              @RequestParam(value = "minimumSupport", required = false) Integer minimumSupport)
+                                              @RequestParam(value = "minimumSupport", required = false) Integer minimumSupport,
+                                              @RequestParam(value = "proLabelId", required = false) Integer proLabelId,
+                                              @RequestParam(value = "depLabelId", required = false) Integer depLabelId,
+                                              @RequestParam(value = "purLabelId", required = false) Integer purLabelId,
+                                              @RequestParam(value = "areaLabelId", required = false) Integer areaLabelId,
+                                              @RequestParam(value = "graLabelId", required = false) Integer graLabelId,
+                                              @RequestParam(value = "subLabelId", required = false) Integer subLabelId,
+                                              @RequestParam(value = "verLabelId", required = false) Integer verLabelId)
             throws BizException, PermissionException;
 
     @ApiOperation(value = "首页获取正在做的图书", httpMethod = "GET")

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

@@ -276,7 +276,14 @@ public class BookFacadeImpl implements BookFacade {
                                                       @RequestParam(value = "thirdTempletId", required = false) Long thirdTempletId,
                                                       @RequestParam(value = "hasQrcode", required = false) Integer hasQrcode,
                                                       @RequestParam(value = "isPrint", required = false) Boolean isPrint,
-                                                      @RequestParam(value = "minimumSupport", required = false) Integer minimumSupport)
+                                                      @RequestParam(value = "minimumSupport", required = false) Integer minimumSupport,
+                                                      @RequestParam(value = "proLabelId", required = false) Integer proLabelId,
+                                                      @RequestParam(value = "depLabelId", required = false) Integer depLabelId,
+                                                      @RequestParam(value = "purLabelId", required = false) Integer purLabelId,
+                                                      @RequestParam(value = "areaLabelId", required = false) Integer areaLabelId,
+                                                      @RequestParam(value = "graLabelId", required = false) Integer graLabelId,
+                                                      @RequestParam(value = "subLabelId", required = false) Integer subLabelId,
+                                                      @RequestParam(value = "verLabelId", required = false) Integer verLabelId)
             throws BizException, PermissionException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
         if (currentPage == null || numPerPage == null || currentPage < 0 || numPerPage < 0) {
@@ -304,6 +311,13 @@ public class BookFacadeImpl implements BookFacade {
         paramMap.put("thirdTempletIds", Optional.ofNullable(paramMap.get("thirdTempletId")).map(Lists::newArrayList).orElse(Lists.newArrayList()));
         paramMap.put("isPrint", isPrint);
         paramMap.put("minimumSupport", minimumSupport);
+        paramMap.put("proLabelId", proLabelId);
+        paramMap.put("depLabelId", depLabelId);
+        paramMap.put("purLabelId", purLabelId);
+        paramMap.put("areaLabelId", areaLabelId);
+        paramMap.put("graLabelId", graLabelId);
+        paramMap.put("subLabelId", subLabelId);
+        paramMap.put("verLabelId", verLabelId);
         PageBean pageBean = bookBiz.getListPage4Adviser(paramMap, new PageParam(currentPage, numPerPage), adviserId, hasQrcode);
         return new ResponseDto<>(pageBean);
     }

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

@@ -625,6 +625,27 @@
 				</if>
 			</foreach>
 		</if>
+		<if test="proLabelId != null">
+			AND A.pro_label_id = #{proLabelId}
+		</if>
+		<if test="depLabelId != null">
+			AND A.dep_label_id = #{depLabelId}
+		</if>
+		<if test="purLabelId != null">
+			AND A.pur_label_id = #{purLabelId}
+		</if>
+		<if test="areaLabelId != null">
+			AND A.AREA_LABEL_ID = #{areaLabelId}
+		</if>
+		<if test="graLabelId != null">
+			AND A.gra_label_id = #{graLabelId}
+		</if>
+		<if test="subLabelId != null">
+			AND A.sub_label_id = #{subLabelId}
+		</if>
+		<if test="verLabelId != null">
+			AND A.ver_label_id = #{verLabelId}
+		</if>
 		GROUP BY A.BOOK_ID, A.CHANNEL_ID
 		ORDER BY
 			LAST_MODIFIED_DATE DESC