加按照进群类型搜索条件

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/BookGroupFacade.java

@@ -127,6 +127,7 @@ public interface BookGroupFacade {
             @RequestParam(value = "isMainEditor", required = false) Integer isMainEditor,
             @RequestParam(value = "isFundSupport", required = false) Integer isFundSupport,
             @RequestParam(value = "bookId", required = false) Integer bookId,
+            @RequestParam(value = "joinGroupType", required = false) Integer joinGroupType,
             @RequestParam(value = "startDate", required = false) String startDate,
             @RequestParam(value = "endDate", required = false) String endDate)
             throws BizException, PermissionException;

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

@@ -160,6 +160,7 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
             @RequestParam(value = "isMainEditor", required = false) Integer isMainEditor,
             @RequestParam(value = "isFundSupport", required = false) Integer isFundSupport,
             @RequestParam(value = "bookId", required = false) Integer bookId,
+            @RequestParam(value = "joinGroupType", required = false) Integer joinGroupType,
             @RequestParam(value = "startDate", required = false) String startDate,
             @RequestParam(value = "endDate", required = false) String endDate)
             throws BizException, PermissionException {
@@ -177,6 +178,7 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
         paramMap.put("bookName", bookName != null && "".equals(bookName.trim()) ? null : bookName);
         paramMap.put("typeCode", typeCode != null && "".equals(typeCode.trim()) ? null : typeCode);
         paramMap.put("bookId", bookId);
+        paramMap.put("joinGroupType", joinGroupType);
         if (!StringUtil.isEmpty(startDate) && !StringUtil.isEmpty(endDate)) {
             paramMap.put("startDate", startDate + " 00:00:00");
             paramMap.put("endDate", endDate + " 23:59:59");

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

@@ -611,6 +611,9 @@
         <if test="startDate != null and endDate != null">
             AND G.create_time BETWEEN #{startDate} AND #{endDate}
         </if>
+		<if test="joinGroupType !=null">
+			AND G.join_group_type=#{joinGroupType}
+		</if>
 		GROUP BY G.id
 		ORDER BY
             G.UPDATE_TIME DESC