Merge branch 'feature-2024-05-wechat-work' into 'master'

导购导出合计修复

See merge request !1830

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/handle/WechatWorkLostClerkHandle.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.web.handle;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.commons.Page;
 import com.gic.commons.util.DataApiUtils;
 import com.gic.enterprise.api.dto.security.DownloadReportDTO;
 import com.gic.haoban.manage.web.utils.data.StoreAuthUtils;
@@ -41,14 +42,23 @@ public class WechatWorkLostClerkHandle extends DownloadHandlerAbstract<WechatWor
 
         jsonObject.put("groupType", 1);
         jsonObject.put("storeGroup", 8);
-        JSONObject total = storeAuthUtils.getTotalJson(jsonObject, "data_mbr_scale_haoban_background_loss_statisti");
+
         if (list == null) {
             list = new ArrayList<>();
         }
-        if (total != null) {
-            total.put("clerkName", "合计（" + list.size() + "）");
-            list.add(0, total);
+        if (isFirst) {
+            Map<String, Object> totalRes = DataApiUtils.http(jsonObject.toJSONString(), "data_mbr_scale_haoban_background_loss_statisti");
+            Page page = DataApiUtils.getPageData(totalRes);
+            if (page != null) {
+                List<JSONObject> totalList = page.getResult();
+                if (CollectionUtils.isNotEmpty(totalList)) {
+                    JSONObject total = totalList.get(0);
+                    total.put("clerkName", "合计（" + page.getTotalCount() + "）");
+                    list.add(0, total);
+                }
+            }
         }
+
         if (CollectionUtils.isNotEmpty(list)) {
             List<WechatWorkLostClerkVO> result = JSONObject.parseArray(JSON.toJSONString(list), WechatWorkLostClerkVO.class);
             return result;