From 3bf6f972604761c9ac59a2cb9ea01eeacaec2189 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 15:43:51 +0800
Subject: [PATCH] 更新为正式部署许可证
---
src/main/java/com/zy/asrs/controller/TaskController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskController.java b/src/main/java/com/zy/asrs/controller/TaskController.java
index b453629..979dabf 100644
--- a/src/main/java/com/zy/asrs/controller/TaskController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskController.java
@@ -6,7 +6,9 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
+import com.zy.asrs.entity.CanFin;
import com.zy.asrs.entity.Task;
+import com.zy.asrs.mapper.CanFinMapper;
import com.zy.asrs.service.TaskService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -23,6 +25,8 @@
@Autowired
private TaskService taskService;
+ @Autowired
+ private CanFinMapper canFinMapper;
@RequestMapping(value = "/task/{id}/auth")
@ManagerAuth
@@ -99,6 +103,29 @@
taskService.completeWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
} else if (type == 2) {
+ Task task = taskService.selectOne(new EntityWrapper<Task>()
+ .eq("wrk_no", workNo));
+ if (task != null){
+ CanFin deleteCanFin = new CanFin();
+ deleteCanFin.setInNo(task.getTaskNo());
+ List<CanFin> canFinList = canFinMapper.selectList(new EntityWrapper<CanFin>()
+ .orderBy("apply_time", true)
+ .isNotNull("in_no"));
+ if (!canFinList.isEmpty()){
+ for (CanFin canFin : canFinList){
+ if (canFin.getInNo().equals(deleteCanFin.getInNo())){
+ canFinMapper.deleteById(canFin.getId());
+ }
+ }
+ }
+ List<CanFin> newCanFinList = canFinMapper.selectList(new EntityWrapper<CanFin>()
+ .orderBy("apply_time", true));
+ if (!newCanFinList.isEmpty()){
+ CanFin firstCanFin = newCanFinList.get(0);
+ firstCanFin.setTaskStatus("canout");
+ canFinMapper.updateById(firstCanFin);
+ }
+ }
taskService.cancelWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
} else if (type == 3) {
--
Gitblit v1.9.1