|
@@ -9,9 +9,9 @@ import com.mokamrp.privates.entity.PostBasePageHandle;
|
|
|
import com.mokamrp.privates.help.AjaxResult;
|
|
import com.mokamrp.privates.help.AjaxResult;
|
|
|
import com.mokamrp.privates.help.Analysis;
|
|
import com.mokamrp.privates.help.Analysis;
|
|
|
import com.mokamrp.privates.interceptor.AuthUser;
|
|
import com.mokamrp.privates.interceptor.AuthUser;
|
|
|
-import com.mokamrp.privates.mapper.pangu.pojo.TaskList;
|
|
|
|
|
|
|
+import com.mokamrp.privates.mapper.pangu.pojo.FosterTaskList;
|
|
|
import com.mokamrp.privates.mapper.pojo.User;
|
|
import com.mokamrp.privates.mapper.pojo.User;
|
|
|
-import com.mokamrp.privates.service.pangu.TaskListService;
|
|
|
|
|
|
|
+import com.mokamrp.privates.service.pangu.FosterTaskListService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.validation.BindingResult;
|
|
import org.springframework.validation.BindingResult;
|
|
@@ -37,10 +37,10 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|
|
*/
|
|
*/
|
|
|
@RestController
|
|
@RestController
|
|
|
@RequestMapping("/taskList")
|
|
@RequestMapping("/taskList")
|
|
|
-public class TaskListController extends BaseController<TaskList> {
|
|
|
|
|
|
|
+public class FosterTaskListController extends BaseController<FosterTaskList> {
|
|
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
- public TaskListService taskListService;
|
|
|
|
|
|
|
+ public FosterTaskListService fosterTaskListService;
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
|
* @fast
|
|
* @fast
|
|
@@ -55,23 +55,23 @@ public class TaskListController extends BaseController<TaskList> {
|
|
|
if (bindingResult.hasErrors()) {
|
|
if (bindingResult.hasErrors()) {
|
|
|
return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
|
|
return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
|
|
|
}
|
|
}
|
|
|
- Map<String, Object> res = taskListService.getList(postBasePageHandle, taskName, taskContent);
|
|
|
|
|
|
|
+ Map<String, Object> res = fosterTaskListService.getList(postBasePageHandle, taskName, taskContent);
|
|
|
return AjaxResult.success(res);
|
|
return AjaxResult.success(res);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@GetMapping("/getMaxTaskName")
|
|
@GetMapping("/getMaxTaskName")
|
|
|
public Object getMaxTaskName(String templateId) {
|
|
public Object getMaxTaskName(String templateId) {
|
|
|
- LambdaQueryWrapper<TaskList> taskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
- taskListLambdaQueryWrapper.eq(TaskList::getTemplateId, templateId);
|
|
|
|
|
- taskListLambdaQueryWrapper.orderByDesc(TaskList::getTaskName);
|
|
|
|
|
|
|
+ LambdaQueryWrapper<FosterTaskList> taskListLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ taskListLambdaQueryWrapper.eq(FosterTaskList::getTemplateId, templateId);
|
|
|
|
|
+ taskListLambdaQueryWrapper.orderByDesc(FosterTaskList::getTaskName);
|
|
|
taskListLambdaQueryWrapper.last("Limit 1");
|
|
taskListLambdaQueryWrapper.last("Limit 1");
|
|
|
|
|
|
|
|
- TaskList taskList = taskListService.getOne(taskListLambdaQueryWrapper);
|
|
|
|
|
|
|
+ FosterTaskList fosterTaskList = fosterTaskListService.getOne(taskListLambdaQueryWrapper);
|
|
|
|
|
|
|
|
- if (null == taskList) {
|
|
|
|
|
|
|
+ if (null == fosterTaskList) {
|
|
|
return AjaxResult.success(Constants.SUCCESS, "Day1");
|
|
return AjaxResult.success(Constants.SUCCESS, "Day1");
|
|
|
} else {
|
|
} else {
|
|
|
- String taskName = taskList.getTaskName();
|
|
|
|
|
|
|
+ String taskName = fosterTaskList.getTaskName();
|
|
|
return AjaxResult.success(Constants.SUCCESS, "Day" + Integer.valueOf(taskName.replace("Day", "") + 1));
|
|
return AjaxResult.success(Constants.SUCCESS, "Day" + Integer.valueOf(taskName.replace("Day", "") + 1));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -97,17 +97,17 @@ public class TaskListController extends BaseController<TaskList> {
|
|
|
AtomicInteger i = new AtomicInteger(0);
|
|
AtomicInteger i = new AtomicInteger(0);
|
|
|
row.forEach(map -> {
|
|
row.forEach(map -> {
|
|
|
i.getAndIncrement();
|
|
i.getAndIncrement();
|
|
|
- TaskList taskList = new TaskList();
|
|
|
|
|
- taskList.setTemplateId(templateId);
|
|
|
|
|
- taskList.setTaskName("Day" + i);
|
|
|
|
|
- taskList.setTaskContent(map.get("taskContent"));
|
|
|
|
|
- taskList.setDelFlg(1);
|
|
|
|
|
- taskList.setCreateUid(authUser.getId());
|
|
|
|
|
- taskList.setUpdateUid(authUser.getId());
|
|
|
|
|
- taskList.setCreateAt(LocalDateTime.now());
|
|
|
|
|
- taskList.setUpdateAt(LocalDateTime.now());
|
|
|
|
|
-
|
|
|
|
|
- taskListService.save(taskList);
|
|
|
|
|
|
|
+ FosterTaskList fosterTaskList = new FosterTaskList();
|
|
|
|
|
+ fosterTaskList.setTemplateId(templateId);
|
|
|
|
|
+ fosterTaskList.setTaskName("Day" + i);
|
|
|
|
|
+ fosterTaskList.setTaskContent(map.get("taskContent"));
|
|
|
|
|
+ fosterTaskList.setDelFlg(1);
|
|
|
|
|
+ fosterTaskList.setCreateUid(authUser.getId());
|
|
|
|
|
+ fosterTaskList.setUpdateUid(authUser.getId());
|
|
|
|
|
+ fosterTaskList.setCreateAt(LocalDateTime.now());
|
|
|
|
|
+ fosterTaskList.setUpdateAt(LocalDateTime.now());
|
|
|
|
|
+
|
|
|
|
|
+ fosterTaskListService.save(fosterTaskList);
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
return AjaxResult.success(HttpMsg.importSuccess);
|
|
return AjaxResult.success(HttpMsg.importSuccess);
|