From fe371739b664c4e87914bcc7f3f550fec7e93121 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Aug 2022 11:42:27 +0800
Subject: [PATCH] 保留农资退回记录，修复当农资库存为1时出库再退回，农资库存数据有误
---
src/main/java/org/springblade/modules/task/controller/TaskController.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskController.java b/src/main/java/org/springblade/modules/task/controller/TaskController.java
index 5e30ef2..14efacc 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskController.java
@@ -21,6 +21,7 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
import javax.validation.Valid;
import org.springblade.core.mp.support.Condition;
@@ -35,8 +36,11 @@
import org.springblade.modules.task.service.ITaskService;
import org.springblade.core.boot.ctrl.BladeController;
+import java.util.HashMap;
+import java.util.Map;
+
/**
- * 控制器
+ * 控制器
*
* @author BladeX
* @since 2022-06-10
@@ -89,7 +93,7 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入task")
public R save(@Valid @RequestBody Task task) {
- task.setStatus(1);
+ task.setStatus(2);
return R.status(taskService.save(task));
}
@@ -100,6 +104,17 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入task")
public R update(@Valid @RequestBody Task task) {
+ return R.status(taskService.updateById(task));
+ }
+
+ /**
+ * 任务处理
+ */
+ @PostMapping("/updatechuli")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入task")
+ public R updatechuli(@Valid @RequestBody Task task) {
+ task.setStatus(0);
return R.status(taskService.updateById(task));
}
@@ -124,5 +139,25 @@
return R.status(taskService.deleteLogic(Func.toLongList(ids)));
}
+ /**
+ * 统计待处理任务数量
+ *
+ * @param task
+ * @return
+ */
+ @GetMapping("/selectCount")
+ public R selectCount(Task task) {
+ int i = taskService.selectCount(task.getTaskUser());
+ Map map = new HashMap();
+ map.put("num",i);
+ return R.data(map);
+ }
+ /**
+ * 统计任务总数
+ */
+ @GetMapping("/countTaskNum")
+ public R countTaskNum(TaskVO task) {
+ return R.data(taskService.countTaskNum(task));
+ }
}
--
Gitblit v1.9.3