Merge branch 'LeoN'

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashScheduleTaskListController.java

@@ -10,14 +10,12 @@ import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.service.pangu.FosterwxCashScheduleTaskListService;
+import com.mokamrp.privates.service.pangu.FosterwxCashWorkwxTaskListService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Arrays;
@@ -42,6 +40,9 @@ public class FosterwxCashScheduleTaskListController extends BaseController<Foste
     @Autowired
     public FosterwxCashScheduleTaskListService fosterwxCashScheduleTaskListService;
 
+    @Autowired
+    public FosterwxCashWorkwxTaskListService fosterwxCashWorkwxTaskListService;
+
     /*
      * @fast
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
@@ -55,6 +56,11 @@ public class FosterwxCashScheduleTaskListController extends BaseController<Foste
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
         ResHandle<List<FosterwxCashScheduleTaskList>> res = fosterwxCashScheduleTaskListService.getList(handle);
+
+        res.getList().forEach(fosterwxCashScheduleTaskList -> {
+            FosterwxCashScheduleTaskList detail = fosterwxCashScheduleTaskListService.getById(fosterwxCashScheduleTaskList.getId());
+            fosterwxCashScheduleTaskList.setFosterwxCashWorkwxTaskList(fosterwxCashWorkwxTaskListService.getById(detail.getChildTaskId()));
+        });
         return AjaxResult.success(res);
     }
 
@@ -65,14 +71,37 @@ public class FosterwxCashScheduleTaskListController extends BaseController<Foste
             Arrays.asList(handle.getIds().split(REGEX)).forEach(id -> fosterwxCashScheduleTaskListService.cancelTask(Integer.valueOf(id), user.getId()));
         } else {
             Arrays.asList(handle.getIds().split(REGEX)).forEach(id -> {
-                FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList = fosterwxCashScheduleTaskListService.getById(id);
-                List<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListList = fosterwxCashScheduleTaskListService.list(new LambdaQueryWrapper<FosterwxCashScheduleTaskList>().eq(FosterwxCashScheduleTaskList::getTaskId, fosterwxCashScheduleTaskList.getTaskId()));
+                // 企微任务列表 页面的取消任务是全部取消 预览页面的取消任务是精准取消
+                if (handle.getIsAllDel() == 1) {
+                    FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList = fosterwxCashScheduleTaskListService.getById(id);
+                    List<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListList = fosterwxCashScheduleTaskListService.list(new LambdaQueryWrapper<FosterwxCashScheduleTaskList>().eq(FosterwxCashScheduleTaskList::getTaskId, fosterwxCashScheduleTaskList.getTaskId()));
 
-                fosterwxCashScheduleTaskListList.forEach(detail -> fosterwxCashScheduleTaskListService.cancelTask(detail.getId(), user.getId()));
+                    fosterwxCashScheduleTaskListList.forEach(detail -> fosterwxCashScheduleTaskListService.cancelTask(detail.getId(), user.getId()));
+                } else {
+                    fosterwxCashScheduleTaskListService.cancelTask(Integer.valueOf(id), user.getId());
+                }
             });
         }
 
         return AjaxResult.success("取消任务成功");
     }
+
+
+    @GetMapping("/preview")
+    @ApiOperation(value = "给企微任务列表使用的预览接口 页面展示的是聚合的数据 需要单独提供查看同一个任务的所有子任务")
+    public Object preview(String id) {
+        // 获取详细信息
+        FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList = fosterwxCashScheduleTaskListService.getById(id);
+
+        List<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskLists = fosterwxCashScheduleTaskListService.list(new LambdaQueryWrapper<FosterwxCashScheduleTaskList>().
+                eq(FosterwxCashScheduleTaskList::getTemplateId, fosterwxCashScheduleTaskList.getTemplateId()).
+                eq(FosterwxCashScheduleTaskList::getTaskId, fosterwxCashScheduleTaskList.getTaskId()));
+
+        fosterwxCashScheduleTaskLists.forEach(detail -> {
+            detail.setFosterwxCashWorkwxTaskList(fosterwxCashWorkwxTaskListService.getById(detail.getChildTaskId()));
+        });
+
+        return AjaxResult.success(fosterwxCashScheduleTaskLists);
+    }
 }
 

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxCashWorkClientController.java

@@ -91,11 +91,12 @@ public class FosterwxCashWorkClientController {
 
         List<FosterwxCashBoxClientInfo> fosterwxCashBoxClientInfoList = new ArrayList<>();
         fosterwxCashScheduleTaskListList.forEach(fosterwxCashScheduleTaskList -> {
-            fosterwxCashScheduleTaskListService.updateById(new FosterwxCashScheduleTaskList() {{
-                setId(fosterwxCashScheduleTaskList.getId());
-                setStatus(5);
-                setUpdateAt(LocalDateTime.now());
-            }});
+            // TODO 注释掉更改状态的代码 方便爬虫测试
+            // fosterwxCashScheduleTaskListService.updateById(new FosterwxCashScheduleTaskList() {{
+            //     setId(fosterwxCashScheduleTaskList.getId());
+            //     setStatus(5);
+            //     setUpdateAt(LocalDateTime.now());
+            // }});
 
             // 获取任务详情
             FosterwxCashWorkwxTaskList fosterwxCashWorkwxTaskList = fosterwxCashWorkwxTaskListService.getOne(new LambdaQueryWrapper<FosterwxCashWorkwxTaskList>().
@@ -104,24 +105,27 @@ public class FosterwxCashWorkClientController {
                     eq(FosterwxCashWorkwxTaskList::getId, fosterwxCashScheduleTaskList.getChildTaskId()).
                     last("LIMIT 1"));
             FosterwxCashBoxClientInfo fosterwxCashBoxClientInfo = new FosterwxCashBoxClientInfo();
+            fosterwxCashBoxClientInfo.setTaskType(fosterwxCashScheduleTaskList.getTaskType());
             if (1 == fosterwxCashScheduleTaskList.getTaskType() || 3 == fosterwxCashScheduleTaskList.getTaskType()) {
                 FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().like(FosterwxCashWorkBoxClientInfo::getGhid, fosterwxCashScheduleTaskList.getBoxGhid()));
-                FosterwxCashBoxClientInfo.BoxInfo boxInfo = fosterwxCashBoxClientInfo.new BoxInfo();
-                boxInfo.setGhid(fosterwxCashWorkBoxClientInfo.getGhid());
-                boxInfo.setWxid(fosterwxCashWorkBoxClientInfo.getWxid());
-                boxInfo.setName(fosterwxCashWorkBoxClientInfo.getName());
-                boxInfo.setTitle(fosterwxCashWorkwxTaskList.getTitle());
-                boxInfo.setEnterpoint(fosterwxCashScheduleTaskList.getBoxUrl());
-                boxInfo.setHeadimg(fosterwxCashWorkBoxClientInfo.getHeadimg());
-                boxInfo.setImage_key1(fosterwxCashWorkBoxClientInfo.getImageKey1());
-                boxInfo.setImage_key2(fosterwxCashWorkBoxClientInfo.getImageKey2());
-                boxInfo.setImage_key3(fosterwxCashWorkBoxClientInfo.getImageKey3());
-                boxInfo.setImageSize(fosterwxCashWorkBoxClientInfo.getImageSize());
-                boxInfo.setAppType(fosterwxCashWorkBoxClientInfo.getAppType());
-                boxInfo.setDesc(fosterwxCashWorkBoxClientInfo.getDesc());
-
-                fosterwxCashBoxClientInfo.setBoxInfo(boxInfo);
-            } else if (2 == fosterwxCashScheduleTaskList.getTaskType()) {
+                if (null != fosterwxCashWorkBoxClientInfo) {
+                    FosterwxCashBoxClientInfo.BoxInfo boxInfo = fosterwxCashBoxClientInfo.new BoxInfo();
+                    boxInfo.setGhid(fosterwxCashWorkBoxClientInfo.getGhid());
+                    boxInfo.setWxid(fosterwxCashWorkBoxClientInfo.getWxid());
+                    boxInfo.setName(fosterwxCashWorkBoxClientInfo.getName());
+                    boxInfo.setTitle(fosterwxCashWorkwxTaskList.getTitle());
+                    boxInfo.setEnterpoint(fosterwxCashScheduleTaskList.getBoxUrl());
+                    boxInfo.setHeadimg(fosterwxCashWorkBoxClientInfo.getHeadimg());
+                    boxInfo.setImage_key1(fosterwxCashWorkBoxClientInfo.getImageKey1());
+                    boxInfo.setImage_key2(fosterwxCashWorkBoxClientInfo.getImageKey2());
+                    boxInfo.setImage_key3(fosterwxCashWorkBoxClientInfo.getImageKey3());
+                    boxInfo.setImageSize(fosterwxCashWorkBoxClientInfo.getImageSize());
+                    boxInfo.setAppType(fosterwxCashWorkBoxClientInfo.getAppType());
+                    boxInfo.setDesc(fosterwxCashWorkBoxClientInfo.getDesc());
+                    fosterwxCashBoxClientInfo.setBoxInfo(boxInfo);
+                }
+
+            } else {
                 FosterwxCashBoxClientInfo.UrlInfo urlInfo = fosterwxCashBoxClientInfo.new UrlInfo();
                 urlInfo.setTitle(fosterwxCashWorkwxTaskList.getUrlTitle());
                 urlInfo.setDesc(fosterwxCashWorkwxTaskList.getUrlDesc());
@@ -134,7 +138,7 @@ public class FosterwxCashWorkClientController {
             fosterwxCashBoxClientInfoList.add(fosterwxCashBoxClientInfo);
         });
 
-        return AjaxResult.success(fosterwxCashScheduleTaskListList);
+        return AjaxResult.success(fosterwxCashBoxClientInfoList);
     }
 
     /**

src/main/java/com/mokamrp/privates/entity/pangu/FosterwxCashBoxClientInfo.java

@@ -10,6 +10,8 @@ import lombok.Data;
  */
 @Data
 public class FosterwxCashBoxClientInfo {
+    private Integer taskType;
+
     private UrlInfo urlInfo;
 
     private BoxInfo boxInfo;

src/main/java/com/mokamrp/privates/entity/pangu/FosterwxCashScheduleTaskListHandle.java

@@ -27,4 +27,5 @@ public class FosterwxCashScheduleTaskListHandle {
     private LocalDateTime sendTimeTo;
     private Integer createUid;
     private String ids;
+    private Integer isAllDel = 1;
 }

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashScheduleTaskListMapper.java

@@ -1,6 +1,6 @@
 package com.mokamrp.privates.mapper.pangu;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.entity.pangu.FosterwxCashScheduleTaskListHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxCashScheduleTaskList;
@@ -19,7 +19,9 @@ import java.util.List;
  */
 @Component
 public interface FosterwxCashScheduleTaskListMapper extends BaseMapper<FosterwxCashScheduleTaskList> {
-    public List<FosterwxCashScheduleTaskList> getList(@Param("ew") LambdaQueryWrapper<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListLambdaQueryWrapper, @Param("limit") Integer page, @Param("offset") Integer offset, @Param("handle") FosterwxCashScheduleTaskListHandle handle);
+    public List<FosterwxCashScheduleTaskList> getList(@Param("ew") QueryWrapper<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListLambdaQueryWrapper, @Param("limit") Integer page, @Param("offset") Integer offset, @Param("handle") FosterwxCashScheduleTaskListHandle handle);
 
     List<FosterwxCashScheduleTaskList> getBannedGhid();
+
+    Long count(@Param("ew") QueryWrapper<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListQueryWrapper, @Param("handle") FosterwxCashScheduleTaskListHandle handle);
 }

src/main/java/com/mokamrp/privates/mapper/pangu/FosterwxCashScheduleTaskListMapper.xml

@@ -69,18 +69,29 @@
             task_list.schedule_id,
             task_list.template_id,
             task_list.task_id,
-            task_list.group_id
+            task_list.group_id,
+            task_list.type,
+            task_list.send_time,
+            task_list.create_uid,
+            task_list.create_user
             FROM
             pan_fosterwx_cash_schedule_task_list task_list
             GROUP BY
             task_list.schedule_id,
             task_list.template_id,
             task_list.task_id,
-            task_list.group_id
+            task_list.group_id,
+            task_list.type,
+            task_list.send_time,
+            task_list.create_uid,
+            task_list.create_user
             ) task_list
             LEFT JOIN pan_fosterwx_cash_task_template task_template ON task_template.id = task_list.template_id
             LEFT JOIN pan_fosterwx_cash_mobile_group mobile_group ON task_list.group_id = mobile_group.id
             LEFT JOIN pan_fosterwx_cash_workwx_task_catalog catalog ON task_list.task_id = catalog.id
+            <where>
+                ${ew.sqlSegment}
+            </where>
             ORDER BY
             task_list.id DESC
             limit #{limit} offset #{offset}
@@ -108,4 +119,26 @@
         WHERE box.fobidden_status = 2
           AND task_list.`status` = 4
     </select>
+    <select id="count" resultType="java.lang.Long">
+        <if test="handle.type == 2">
+            SELECT
+                count(*)
+            FROM
+            ( SELECT task_list.schedule_id, task_list.template_id, task_list.task_id, task_list.group_id, task_list.type, task_list.send_time, task_list.create_uid, task_list.create_user FROM pan_fosterwx_cash_schedule_task_list task_list GROUP BY task_list.schedule_id, task_list.template_id, task_list.task_id, task_list.group_id, task_list.type, task_list.send_time, task_list.create_uid, task_list.create_user ) task_list
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+        <if test="handle.type == 1">
+            SELECT
+                count(1)
+            FROM
+            pan_fosterwx_cash_schedule_task_list task_list
+            LEFT JOIN pan_fosterwx_cash_task_template task_template ON task_template.id = task_list.template_id
+            LEFT JOIN pan_fosterwx_cash_mobile_group mobile_group ON task_list.group_id = mobile_group.id
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashScheduleTaskList.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.models.auth.In;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -146,6 +147,21 @@ public class FosterwxCashScheduleTaskList extends Model<FosterwxCashScheduleTask
     @TableField(exist = false)
     private Object boxInfo;
 
+    @TableField(exist = false)
+    private String templateName;
+
+    @TableField(exist = false)
+    private String groupName;
+
+    @TableField(exist = false)
+    private String catalogName;
+
+    @TableField(exist = false)
+    private Integer totalCount;
+
+    @TableField(exist = false)
+    private Integer createdCount;
+
     public Integer getId() {
         return id;
     }
@@ -347,6 +363,46 @@ public class FosterwxCashScheduleTaskList extends Model<FosterwxCashScheduleTask
         this.boxUrl = boxUrl;
     }
 
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getCatalogName() {
+        return catalogName;
+    }
+
+    public void setCatalogName(String catalogName) {
+        this.catalogName = catalogName;
+    }
+
+    public Integer getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(Integer totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public Integer getCreatedCount() {
+        return createdCount;
+    }
+
+    public void setCreatedCount(Integer createdCount) {
+        this.createdCount = createdCount;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxCashWorkwxTaskList.java

@@ -47,7 +47,7 @@ public class FosterwxCashWorkwxTaskList extends Model<FosterwxCashWorkwxTaskList
     private LocalTime sendAt;
 
     /**
-     * 任务类型(1.小程序2.链接-发文小程序卡片3.链接-发文图文4.链接)
+     * 任务类型(1.链接-发文小程序卡片2.链接-发文图文 3.小程序 4.链接)
      */
     private Integer taskType;
 

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashAccountScheduleServiceImpl.java

@@ -156,7 +156,7 @@ public class FosterwxCashAccountScheduleServiceImpl extends ServiceImpl<Fosterwx
             fosterwxCashScheduleTaskList.setTaskContent("");
             fosterwxCashScheduleTaskList.setGhId("");
             // 任务类型为链接是直接赋值
-            if (4 == fosterwxCashWorkwxTaskList.getTaskType()) {
+            if (4 == fosterwxCashWorkwxTaskList.getTaskType() || 3 == fosterwxCashWorkwxTaskList.getTaskType()) {
                 fosterwxCashScheduleTaskList.setSendUrl(fosterwxCashWorkwxTaskList.getUrl());
                 fosterwxCashScheduleTaskList.setStatus(4);
                 fosterwxCashScheduleTaskList.setErrInfo("");

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxCashScheduleTaskListServiceImpl.java

@@ -2,6 +2,7 @@ package com.mokamrp.privates.service.pangu.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.entity.pangu.FosterwxCashScheduleTaskListHandle;
@@ -62,33 +63,33 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
     public ResHandle<List<FosterwxCashScheduleTaskList>> getList(FosterwxCashScheduleTaskListHandle handle) {
         Integer pagesize = handle.getPageSize();
         Integer page = handle.getPage();
-        LambdaQueryWrapper<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getType, handle.getType());
+        QueryWrapper<FosterwxCashScheduleTaskList> fosterwxCashScheduleTaskListQueryWrapper = new QueryWrapper<>();
+        fosterwxCashScheduleTaskListQueryWrapper.eq("task_list.type", handle.getType());
 
         // 任务模板名称
         if (null != handle.getTemplateId())
-            fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getTemplateId, handle.getTemplateId());
+            fosterwxCashScheduleTaskListQueryWrapper.eq("task_list.template_id", handle.getTemplateId());
         // 创建人
         if (null != handle.getCreateUid())
-            fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getCreateUid, handle.getCreateUid());
+            fosterwxCashScheduleTaskListQueryWrapper.eq("task_list.create_uid", handle.getCreateUid());
         // 状态
         if (null != handle.getStatus())
-            fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getStatus, handle.getStatus());
+            fosterwxCashScheduleTaskListQueryWrapper.eq("task_list.status", handle.getStatus());
         // 发送日期
         if (null != handle.getSendTimeFrom() && null != handle.getSendTimeTo())
-            fosterwxCashScheduleTaskListLambdaQueryWrapper.between(FosterwxCashScheduleTaskList::getSendTime, handle.getSendTimeFrom(), handle.getSendTimeTo());
+            fosterwxCashScheduleTaskListQueryWrapper.between("task_list.send_time", handle.getSendTimeFrom(), handle.getSendTimeTo());
         // 账号分组
         if (null != handle.getGroupId())
-            fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getGroupId, handle.getGroupId());
+            fosterwxCashScheduleTaskListQueryWrapper.eq("task_list.group_id", handle.getGroupId());
         // 排期id
         if (null != handle.getScheduleId())
-            fosterwxCashScheduleTaskListLambdaQueryWrapper.eq(FosterwxCashScheduleTaskList::getScheduleId, handle.getScheduleId());
+            fosterwxCashScheduleTaskListQueryWrapper.eq("task_list.schedule_id", handle.getScheduleId());
 
-        List<FosterwxCashScheduleTaskList> list = fosterwxCashScheduleTaskListMapper.getList(fosterwxCashScheduleTaskListLambdaQueryWrapper, pagesize, (page - 1) * pagesize, handle);
+        List<FosterwxCashScheduleTaskList> list = fosterwxCashScheduleTaskListMapper.getList(fosterwxCashScheduleTaskListQueryWrapper, pagesize, (page - 1) * pagesize, handle);
 
         ResHandle<List<FosterwxCashScheduleTaskList>> res = new ResHandle<>();
         res.setList(list);
-        res.setTotal(Long.valueOf(fosterwxCashScheduleTaskListMapper.selectCount(fosterwxCashScheduleTaskListLambdaQueryWrapper)));
+        res.setTotal(fosterwxCashScheduleTaskListMapper.count(fosterwxCashScheduleTaskListQueryWrapper, handle));
         return res;
     }
 
@@ -256,9 +257,8 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
         // 分配的公众号
         if (3 == fosterwxCashWorkwxTaskList.getTaskType()) {
             fosterwxCashScheduleTaskList.setGhId(fosterwxCashOasBox.getGhId());
-        } else if (1 == fosterwxCashWorkwxTaskList.getTaskType()) {
-            fosterwxCashScheduleTaskList.setBoxGhid(fosterwxCashOasBox.getGhId());
         }
+        fosterwxCashScheduleTaskList.setBoxGhid(fosterwxCashOasBox.getGhId());
 
         // 小程序链接
         String sendUrl = "";