Merge branch 'dev-lqc' into test

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

@@ -6,6 +6,7 @@ import com.mokamrp.privates.controller.BaseController;
 import com.mokamrp.privates.entity.ResHandle;
 import com.mokamrp.privates.entity.VoltaHandle;
 import com.mokamrp.privates.entity.pangu.FosterwxCashAccountScheduleHandle;
+import com.mokamrp.privates.entity.pangu.FosterwxCashScheduleTaskListHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.help.Analysis;
 import com.mokamrp.privates.interceptor.AuthUser;
@@ -125,7 +126,7 @@ public class FosterwxCashAccountScheduleController extends BaseController<Foster
 
     @PostMapping("/immediateCreate")
     @Transactional(rollbackFor = Exception.class)
-    @ApiOperation(value = "立即生成")
+    @ApiOperation(value = "生成")
     public Object immediateCreate(@RequestBody FosterwxCashAccountScheduleHandle handle) {
         Arrays.asList(handle.getIds().split(REGEX)).forEach(id -> {
             List<FosterwxCashScheduleTaskList> newsList = fosterwxCashAccountScheduleService.createTask(Integer.valueOf(id));
@@ -134,13 +135,17 @@ public class FosterwxCashAccountScheduleController extends BaseController<Foster
             fosterwxCashScheduleTaskListService.create(newsList);
         });
 
-        return AjaxResult.success("立即生成成功");
+        return AjaxResult.success("生成成功");
     }
 
     @PostMapping("/preview")
-    @ApiOperation(value = "预览按钮")
+    @ApiOperation(value = "预览按钮 只需要传任务排期的id")
     public Object priview(@RequestBody FosterwxCashAccountScheduleHandle handle) {
-        ResHandle<List<FosterwxCashTaskList>> resHandle = fosterwxCashTaskTemplateService.getTaskByTemplateId(handle.getTemplateId());
+        FosterwxCashScheduleTaskListHandle fosterwxCashScheduleTaskListHandle = new FosterwxCashScheduleTaskListHandle();
+        fosterwxCashScheduleTaskListHandle.setPage(1);
+        fosterwxCashScheduleTaskListHandle.setPageSize(100000);
+        fosterwxCashScheduleTaskListHandle.setScheduleId(handle.getId());
+        ResHandle<List<FosterwxCashScheduleTaskList>> resHandle = fosterwxCashScheduleTaskListService.getList(fosterwxCashScheduleTaskListHandle);
 
         return AjaxResult.success(resHandle);
     }