From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/data/TaskController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/TaskController.java b/src/main/java/com/lf/server/controller/data/TaskController.java
index 9b1053d..6c08bda 100644
--- a/src/main/java/com/lf/server/controller/data/TaskController.java
+++ b/src/main/java/com/lf/server/controller/data/TaskController.java
@@ -43,22 +43,23 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "浠诲姟鍚嶇О", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "status", value = "浠诲姟鐘舵��", dataType = "Integer", paramType = "query", example = "1"),
+ @ApiImplicitParam(name = "type", value = "浠诲姟绫诲埆", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<TaskEntity>> selectByPageAndCount(String name, Integer status, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<TaskEntity>> selectByPageAndCount(String name, Integer status, String type, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = taskService.selectCount(name, status);
+ int count = taskService.selectCount(name, status, type);
if (count == 0) {
return success(0, null);
}
- List<TaskEntity> rs = taskService.selectByPage(name, status, pageSize, pageSize * (pageIndex - 1));
+ List<TaskEntity> rs = taskService.selectByPage(name, status, type, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -171,8 +172,8 @@
public ResponseMsg<Object> deleteTask(int id, HttpServletRequest req) {
try {
TaskEntity task = taskService.selectById(id);
- if (null == task) {
- return fail("浠诲姟涓嶅瓨鍦�", -1);
+ if (null == task || 1 != task.getStatus()) {
+ return fail("浠诲姟涓嶅瓨鍦ㄦ垨鏃犻渶缁撴潫", -1);
}
List<Integer> ids = new ArrayList<>();
@@ -181,7 +182,12 @@
PubEntity entity = new PubEntity();
entity.setIds(ids);
entity.setDircode("00");
- entity.setToken(WebHelper.getToken(req));
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setUserId(ue.getId());
+ entity.setToken(WebHelper.getToken(req));
+ }
long rows = publishService.postForPub(entity, "/Convert/DeleteTask");
--
Gitblit v1.9.3