Commit 0ce3dd7c by guojx

流失数据接口

parent ae1ae5c5
...@@ -16,9 +16,7 @@ import com.gic.haoban.manage.web.qo.wechatwork.*; ...@@ -16,9 +16,7 @@ import com.gic.haoban.manage.web.qo.wechatwork.*;
import com.gic.haoban.manage.web.utils.data.ConcurrencyUtils; import com.gic.haoban.manage.web.utils.data.ConcurrencyUtils;
import com.gic.haoban.manage.web.utils.data.MapThreadHandlerRequest; import com.gic.haoban.manage.web.utils.data.MapThreadHandlerRequest;
import com.gic.haoban.manage.web.utils.data.StoreAuthUtils; import com.gic.haoban.manage.web.utils.data.StoreAuthUtils;
import com.gic.haoban.manage.web.vo.wechatwork.DataPageVO; import com.gic.haoban.manage.web.vo.wechatwork.*;
import com.gic.haoban.manage.web.vo.wechatwork.WechatWorkLostDetailVO;
import com.gic.haoban.manage.web.vo.wechatwork.WechatWorkLostVO;
import com.gic.qcloud.BucketNameEnum; import com.gic.qcloud.BucketNameEnum;
import com.gic.web.common.controller.NewBaseController; import com.gic.web.common.controller.NewBaseController;
import com.gic.web.common.download.DownloadTask; import com.gic.web.common.download.DownloadTask;
...@@ -131,13 +129,16 @@ public class WechatWorkController extends NewBaseController { ...@@ -131,13 +129,16 @@ public class WechatWorkController extends NewBaseController {
* @return * @return
*/ */
@RequestMapping(value = "lost-store-group") @RequestMapping(value = "lost-store-group")
public RestResponse<DataPageVO> lostStoreGroup(@RequestBody WechatWorkLostStoreGroupQO qo) { public RestResponse<DataPageVO<WechatWorkLostStoreGroupVO>> lostStoreGroup(@RequestBody WechatWorkLostStoreGroupQO qo) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
qo.dealWithParam(jsonObject); qo.dealWithParam(jsonObject);
storeAuthUtils.setStoreGroupJsonParam(jsonObject, qo); storeAuthUtils.setStoreGroupJsonParam(jsonObject, qo);
jsonObject.put("apolloKey", "data_mbr_scale_haoban_background_loss_statisti"); jsonObject.put("apolloKey", "data_mbr_scale_haoban_background_loss_statisti");
jsonObject.put("groupType", 1); jsonObject.put("groupType", 1);
DataPageVO vo = storeAuthUtils.getDataCommon(jsonObject.toJSONString(), qo.getPageNum(), "data_mbr_scale_haoban_background_loss_statisti", qo.getPageSize(), true); DataPageVO vo = storeAuthUtils.getDataCommon(jsonObject.toJSONString(), qo.getPageNum(), "data_mbr_scale_haoban_background_loss_statisti", qo.getPageSize(), true);
if (CollectionUtils.isNotEmpty(vo.getRows())) {
vo.setRows(JSONArray.parseArray(JSON.toJSONString(vo.getRows()), WechatWorkLostStoreGroupVO.class));
}
return RestResponse.successResult(vo); return RestResponse.successResult(vo);
} }
...@@ -205,7 +206,7 @@ public class WechatWorkController extends NewBaseController { ...@@ -205,7 +206,7 @@ public class WechatWorkController extends NewBaseController {
* @return * @return
*/ */
@RequestMapping(value = "lost-clerk") @RequestMapping(value = "lost-clerk")
public RestResponse<DataPageVO> lostClerk(@RequestBody WechatWorkLostClerkQO qo) { public RestResponse<DataPageVO<WechatWorkLostClerkVO>> lostClerk(@RequestBody WechatWorkLostClerkQO qo) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
qo.dealWithParam(jsonObject); qo.dealWithParam(jsonObject);
storeAuthUtils.setCommonParam(jsonObject, new StoreGroupCommonQO()); storeAuthUtils.setCommonParam(jsonObject, new StoreGroupCommonQO());
...@@ -227,10 +228,14 @@ public class WechatWorkController extends NewBaseController { ...@@ -227,10 +228,14 @@ public class WechatWorkController extends NewBaseController {
list = new ArrayList<>(); list = new ArrayList<>();
} }
if (total != null) { if (total != null) {
total.put("clerkName", "合计(" + list.size() + ")");
storeAuthUtils.setChannelGroupList(total); storeAuthUtils.setChannelGroupList(total);
list.add(0, total); list.add(0, total);
} }
vo.setRows(list); vo.setRows(list);
if (CollectionUtils.isNotEmpty(vo.getRows())) {
vo.setRows(JSONArray.parseArray(JSON.toJSONString(vo.getRows()), WechatWorkLostClerkVO.class));
}
return RestResponse.successResult(vo); return RestResponse.successResult(vo);
} }
......
...@@ -44,6 +44,7 @@ public class WechatWorkLostClerkHandle extends DownloadHandlerAbstract<WechatWor ...@@ -44,6 +44,7 @@ public class WechatWorkLostClerkHandle extends DownloadHandlerAbstract<WechatWor
list = new ArrayList<>(); list = new ArrayList<>();
} }
if (total != null) { if (total != null) {
total.put("clerkName", "合计(" + list.size() + ")");
storeAuthUtils.setChannelGroupList(total); storeAuthUtils.setChannelGroupList(total);
list.add(0, total); list.add(0, total);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment