Merge branch 'dev-lqc' into test

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

@@ -83,6 +83,7 @@ public class FosterwxCashScheduleTaskListController extends BaseController<Foste
 
 
     @GetMapping("/preview")
+    @ApiOperation(value = "给企微任务列表使用的预览接口 页面展示的是聚合的数据 需要单独提供查看同一个任务的所有子任务")
     public Object preview(String id) {
         // 获取详细信息
         FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList = fosterwxCashScheduleTaskListService.getById(id);

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

@@ -70,7 +70,8 @@
             task_list.template_id,
             task_list.task_id,
             task_list.group_id,
-            task_list.type
+            task_list.type,
+            task_list.send_time
             FROM
             pan_fosterwx_cash_schedule_task_list task_list
             GROUP BY
@@ -78,7 +79,8 @@
             task_list.template_id,
             task_list.task_id,
             task_list.group_id,
-            task_list.type
+            task_list.type,
+            task_list.send_time
             ) 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
@@ -118,7 +120,7 @@
             SELECT
                 count(*)
             FROM
-            ( SELECT type 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
+            ( SELECT type 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
             <where>
                 ${ew.sqlSegment}
             </where>