Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

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

@@ -71,7 +71,7 @@ public class FosterwxTaskListController extends BaseController<FosterwxTaskList>
         return AjaxResult.success(res);
     }
 
-    @GetMapping("/getMaxTaskName")
+    @PostMapping("/getMaxTaskName")
     public Object getMaxTaskName(String templateId) {
         LambdaQueryWrapper<FosterwxTaskList> taskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
         taskListLambdaQueryWrapper.eq(FosterwxTaskList::getTemplateId, templateId);

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.time.LocalDateTime;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -60,6 +61,7 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
         return AjaxResult.success(res);
     }
 
+
     @PutMapping("/edit")
     @Transactional(rollbackFor = Exception.class)
     public Object edit(@Valid @RequestBody EditHandle<FosterwxTaskSchedule> editHandle, BindingResult bindingResult, @AuthUser User authUser) {
@@ -89,8 +91,22 @@ public class FosterwxTaskScheduleController extends BaseController<FosterwxTaskS
         return AjaxResult.success("更新成功！");
     }
 
-    @GetMapping("/getinfo")
-    public Object getinfo(@RequestParam String stationId,
+    @PostMapping("/getTaskList")
+    public Object getTaskList(@RequestParam Integer stationId, @RequestParam String year, @RequestParam String month) {
+        PostBasePageHandle postBasePageHandle = new PostBasePageHandle();
+        postBasePageHandle.setPage(1);
+        postBasePageHandle.setPagesize(100000);
+
+        Calendar c = Calendar.getInstance();
+        // c.set(year, month, 0);
+
+
+        Map<String, Object> res = fosterwxTaskScheduleService.getList(postBasePageHandle, null, stationId, null);
+        return AjaxResult.success(res);
+    }
+
+    @PostMapping("/getInfo")
+    public Object getInfo(@RequestParam String stationId,
                           @RequestParam String taskId) {
         LambdaQueryWrapper<FosterwxTaskSchedule> fosterwxTaskScheduleLambdaQueryWrapper = new LambdaQueryWrapper<>();
         fosterwxTaskScheduleLambdaQueryWrapper.eq(FosterwxTaskSchedule::getStationId, stationId);