画布待完成会员列表

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/CanvasDataController.java

@@ -56,10 +56,16 @@ public class CanvasDataController {
      * @return
      */
     @RequestMapping("get-canvas-to-do-complete-member")
-    public RestResponse<Page<CanvasToDoCompleteMemberVO>> getCanvasToDoCompleteMember(@RequestBody CanvasConversionDataQO qo) {
+    public RestResponse<Page<CanvasToDoCompleteMemberVO>> getCanvasToDoCompleteMember(@RequestBody CanvasToDoCompleteMemberQO qo) {
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(qo);
+        setPageParam(jsonObject, qo.getPageNum(), qo.getPageSize());
+        Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), "data_mkt_canvas_haoban_mbr");
 
-        //todo
-        return RestResponse.successResult(new Page<>());
+        Page<CanvasToDoCompleteMemberVO> page = DataApiUtils.getPageData(res, CanvasToDoCompleteMemberVO.class);
+        List<CanvasToDoCompleteMemberVO> list = page.getResult();
+        esMemberInfoUtils.setMemberInfo(qo.getEnterpriseId(), list, Stream.of("memberName","memberNick","photoUrl","clerkCode", "clerkName")
+                .collect(Collectors.toSet()));
+        return RestResponse.successResult(page);
     }
 
     /**

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/canvas/CanvasToDoCompleteMemberQO.java

+package com.gic.haoban.manage.web.qo.canvas;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.gic.commons.web.qo.PageQo;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CanvasToDoCompleteMemberQO extends PageQo implements Serializable {
+
+    private Long canvasId;
+
+    private String enterpriseId;
+
+    /**
+     * mass:群发任务 tel_task：话务任务
+     */
+    private String subType;
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/canvas/CanvasToDoCompleteMemberVO.java

@@ -7,6 +7,8 @@ import java.io.Serializable;
 @Data
 public class CanvasToDoCompleteMemberVO implements Serializable {
 
+    private String mbrId;
+
     private String memberId;
 
     private String clerkId;
@@ -33,5 +35,9 @@ public class CanvasToDoCompleteMemberVO implements Serializable {
     /**
      * 逾期天数
      */
-    private Integer overdueDays;
+    private Integer invalidDays;
+
+    public String getMemberId() {
+        return mbrId;
+    }
 }