Merge branch 'fixbug/1028234' into 'master'

bug: [1028234] 二维码筛选导出

See merge request rays/pcloud-book!1219

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

@@ -288,21 +288,27 @@ public interface BookGroupFacade {
             @ApiImplicitParam(name = "bookId", value = "书籍标识", dataType = "int", paramType = "query"),
             @ApiImplicitParam(name = "startDate", value = "开始时间", dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束时间", dataType = "string", paramType = "query"),
-            @ApiImplicitParam(name = "joinGroupType", value = "类型", dataType = "int", paramType = "query")
+            @ApiImplicitParam(name = "joinGroupType", value = "类型", dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "hasServe", value = "结束时间", dataType = "boolean", paramType = "query"),
+            @ApiImplicitParam(name = "isPrint", value = "是否已下印", dataType = "Boolean", paramType = "query"),
+            @ApiImplicitParam(name = "jumpType", value = "跳转类型", dataType = "int", paramType = "query")
     })
     @RequestMapping(value = "exportGroupQrcode4Adviser", method = RequestMethod.GET)
     ResponseDto<?> exportGroupQrcode4Adviser(@RequestHeader("token") String token,
-                                                @RequestParam(value = "name", required = false) String name,
-                                                @RequestParam(value = "bookName", required = false) String bookName,
-                                                @RequestParam(value = "isbn", required = false) String isbn,
-                                                @RequestParam(value = "channelId", required = false) Long channelId,
-                                                @RequestParam(value = "typeCode", required = false) String typeCode,
-                                                @RequestParam(value = "isMainEditor", required = false) Integer isMainEditor,
-                                                @RequestParam(value = "isFundSupport", required = false) Integer isFundSupport,
-                                                @RequestParam(value = "bookId", required = false) Integer bookId,
-                                                @RequestParam(value = "startDate", required = false) String startDate,
-                                                @RequestParam(value = "endDate", required = false) String endDate,
-                                             @RequestParam(value = "joinGroupType", required = false) Integer joinGroupType)
+                                             @RequestParam(value = "name", required = false) String name,
+                                             @RequestParam(value = "bookName", required = false) String bookName,
+                                             @RequestParam(value = "isbn", required = false) String isbn,
+                                             @RequestParam(value = "channelId", required = false) Long channelId,
+                                             @RequestParam(value = "typeCode", required = false) String typeCode,
+                                             @RequestParam(value = "isMainEditor", required = false) Integer isMainEditor,
+                                             @RequestParam(value = "isFundSupport", required = false) Integer isFundSupport,
+                                             @RequestParam(value = "bookId", required = false) Integer bookId,
+                                             @RequestParam(value = "startDate", required = false) String startDate,
+                                             @RequestParam(value = "endDate", required = false) String endDate,
+                                             @RequestParam(value = "joinGroupType", required = false) String joinGroupType,
+                                             @RequestParam(value = "hasServe", required = false) Boolean hasServe,
+                                             @RequestParam(value = "isPrint", required = false) Boolean isPrint,
+                                             @RequestParam(value = "jumpType", required = false) Integer jumpType)
             throws BizException, PermissionException;
 
     @ApiOperation("根据bookId获取社群书分类等统计")

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

@@ -443,7 +443,10 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
                                                      @RequestParam(value = "bookId", required = false) Integer bookId,
                                                      @RequestParam(value = "startDate", required = false) String startDate,
                                                      @RequestParam(value = "endDate", required = false) String endDate,
-                                                     @RequestParam(value = "joinGroupType", required = false) Integer joinGroupType )
+                                                     @RequestParam(value = "joinGroupType", required = false) String joinGroupType,
+                                                     @RequestParam(value = "hasServe", required = false) Boolean hasServe,
+                                                     @RequestParam(value = "isPrint", required = false) Boolean isPrint,
+                                                     @RequestParam(value = "jumpType", required = false) Integer jumpType)
             throws BizException, PermissionException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
         Map<String, Object> paramMap = new HashMap<>();
@@ -460,7 +463,19 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
             paramMap.put("startDate", startDate + " 00:00:00");
             paramMap.put("endDate", endDate + " 23:59:59");
         }
-        paramMap.put("joinGroupType", joinGroupType);
+        List<Integer> joinGroupTypes = new ArrayList<>();
+        if ("GROUP".equals(joinGroupType)) {
+            joinGroupTypes.add(JoinGroupTypeEnum.GROUP_QRCODE.getCode());
+        }
+        if ("ROBOT".equals(joinGroupType)) {
+            joinGroupTypes.add(JoinGroupTypeEnum.ROBOT.getCode());
+            joinGroupTypes.add(JoinGroupTypeEnum.AI_ROBOT.getCode());
+            joinGroupTypes.add(JoinGroupTypeEnum.XIAORUI.getCode());
+        }
+        paramMap.put("joinGroupTypes", joinGroupTypes);
+        paramMap.put("hasServe", hasServe);
+        paramMap.put("isPrint", isPrint);
+        paramMap.put("jumpType", jumpType);
         bookGroupBiz.exportGroupQrcode4Adviser(paramMap, adviserId);
         return new ResponseDto<>();
     }