diff --git a/src/main/java/com/chinaweal/youfool/devops/base/controller/DictController.java b/src/main/java/com/chinaweal/youfool/devops/base/controller/DictController.java
index 683f68b..a43e503 100644
--- a/src/main/java/com/chinaweal/youfool/devops/base/controller/DictController.java
+++ b/src/main/java/com/chinaweal/youfool/devops/base/controller/DictController.java
@@ -10,7 +10,13 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
diff --git a/src/main/java/com/chinaweal/youfool/devops/base/controller/ErrorLogController.java b/src/main/java/com/chinaweal/youfool/devops/base/controller/ErrorLogController.java
index 9fb8dac..e284c38 100644
--- a/src/main/java/com/chinaweal/youfool/devops/base/controller/ErrorLogController.java
+++ b/src/main/java/com/chinaweal/youfool/devops/base/controller/ErrorLogController.java
@@ -7,7 +7,11 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import java.io.File;
import java.io.IOException;
diff --git a/src/main/java/com/chinaweal/youfool/devops/base/controller/TaskFileController.java b/src/main/java/com/chinaweal/youfool/devops/base/controller/TaskFileController.java
index 8214767..dd4bd37 100644
--- a/src/main/java/com/chinaweal/youfool/devops/base/controller/TaskFileController.java
+++ b/src/main/java/com/chinaweal/youfool/devops/base/controller/TaskFileController.java
@@ -5,7 +5,11 @@ import com.chinaweal.youfool.framework.springboot.rest.RestResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
diff --git a/src/main/java/com/chinaweal/youfool/devops/base/controller/TaskHandleController.java b/src/main/java/com/chinaweal/youfool/devops/base/controller/TaskHandleController.java
index 279d3f4..ca718f1 100644
--- a/src/main/java/com/chinaweal/youfool/devops/base/controller/TaskHandleController.java
+++ b/src/main/java/com/chinaweal/youfool/devops/base/controller/TaskHandleController.java
@@ -1,15 +1,8 @@
package com.chinaweal.youfool.devops.base.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.chinaweal.youfool.devops.base.entity.TaskHandle;
-import com.chinaweal.youfool.devops.base.service.ITaskHandleService;
-import com.chinaweal.youfool.framework.springboot.base.query.BaseQuery;
-import com.chinaweal.youfool.framework.springboot.rest.RestResult;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.io.Serializable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
*
@@ -23,5 +16,5 @@ import java.io.Serializable;
@RestController
@RequestMapping("/base/taskHandle")
public class TaskHandleController {
-
+ // TODO: 实现任务处理流程相关的REST接口
}
diff --git a/src/main/java/com/chinaweal/youfool/devops/leaderassign/controller/AssignController.java b/src/main/java/com/chinaweal/youfool/devops/leaderassign/controller/AssignController.java
index 4fca574..170252c 100644
--- a/src/main/java/com/chinaweal/youfool/devops/leaderassign/controller/AssignController.java
+++ b/src/main/java/com/chinaweal/youfool/devops/leaderassign/controller/AssignController.java
@@ -3,6 +3,7 @@ package com.chinaweal.youfool.devops.leaderassign.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.chinaweal.youfool.devops.leaderassign.controller.dto.AssignHandleQuery;
import com.chinaweal.youfool.devops.leaderassign.controller.dto.TaskAssignVo;
+import com.chinaweal.youfool.devops.leaderassign.controller.dto.TaskListQuery;
import com.chinaweal.youfool.devops.leaderassign.entity.Assign;
import com.chinaweal.youfool.devops.leaderassign.service.IAssignService;
import com.chinaweal.youfool.framework.springboot.rest.RestResult;
@@ -12,11 +13,15 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
-import java.util.Map;
/**
*
@@ -45,8 +50,8 @@ public class AssignController {
@Operation(summary = "2.分页查询领导交办列表")
@PostMapping("/listTask")
- public RestResult> listTask(@RequestBody Map map) {
- IPage data = iAssignService.listTask(map);
+ public RestResult> listTask(@RequestBody TaskListQuery query) {
+ IPage data = iAssignService.listTask(query);
return RestResult.ok(data);
}
diff --git a/src/main/java/com/chinaweal/youfool/devops/leaderassign/controller/dto/TaskListQuery.java b/src/main/java/com/chinaweal/youfool/devops/leaderassign/controller/dto/TaskListQuery.java
new file mode 100644
index 0000000..c95bcfb
--- /dev/null
+++ b/src/main/java/com/chinaweal/youfool/devops/leaderassign/controller/dto/TaskListQuery.java
@@ -0,0 +1,90 @@
+package com.chinaweal.youfool.devops.leaderassign.controller.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+/**
+ * 任务列表查询参数
+ *
+ * @author chinaweal
+ * @since 2025-08-13
+ */
+@Schema(description = "任务列表查询参数")
+public class TaskListQuery {
+
+ @Schema(description = "当前页")
+ private Integer current;
+
+ @Schema(description = "每页大小")
+ private Integer size;
+
+ @Schema(description = "任务标题")
+ private String title;
+
+ @Schema(description = "状态")
+ private String status;
+
+ @Schema(description = "处理人ID")
+ private String handlerId;
+
+ @Schema(description = "创建开始时间")
+ private String createTimeStart;
+
+ @Schema(description = "创建结束时间")
+ private String createTimeEnd;
+
+ public Integer getCurrent() {
+ return current;
+ }
+
+ public void setCurrent(Integer current) {
+ this.current = current;
+ }
+
+ public Integer getSize() {
+ return size;
+ }
+
+ public void setSize(Integer size) {
+ this.size = size;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getHandlerId() {
+ return handlerId;
+ }
+
+ public void setHandlerId(String handlerId) {
+ this.handlerId = handlerId;
+ }
+
+ public String getCreateTimeStart() {
+ return createTimeStart;
+ }
+
+ public void setCreateTimeStart(String createTimeStart) {
+ this.createTimeStart = createTimeStart;
+ }
+
+ public String getCreateTimeEnd() {
+ return createTimeEnd;
+ }
+
+ public void setCreateTimeEnd(String createTimeEnd) {
+ this.createTimeEnd = createTimeEnd;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/chinaweal/youfool/devops/leaderassign/mapper/AssignMapper.java b/src/main/java/com/chinaweal/youfool/devops/leaderassign/mapper/AssignMapper.java
index 5cc6c4b..c27220e 100644
--- a/src/main/java/com/chinaweal/youfool/devops/leaderassign/mapper/AssignMapper.java
+++ b/src/main/java/com/chinaweal/youfool/devops/leaderassign/mapper/AssignMapper.java
@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.chinaweal.youfool.devops.leaderassign.controller.dto.TaskAssignVo;
+import com.chinaweal.youfool.devops.leaderassign.controller.dto.TaskListQuery;
import com.chinaweal.youfool.devops.leaderassign.entity.Assign;
import org.apache.ibatis.annotations.Param;
-import java.util.Map;
/**
*
@@ -19,5 +19,5 @@ import java.util.Map;
*/
public interface AssignMapper extends BaseMapper {
- IPage listTask(Page page, @Param("map") Map map);
+ IPage listTask(Page page, @Param("query") TaskListQuery query);
}
diff --git a/src/main/java/com/chinaweal/youfool/devops/leaderassign/service/IAssignService.java b/src/main/java/com/chinaweal/youfool/devops/leaderassign/service/IAssignService.java
index 63b6a01..33027eb 100644
--- a/src/main/java/com/chinaweal/youfool/devops/leaderassign/service/IAssignService.java
+++ b/src/main/java/com/chinaweal/youfool/devops/leaderassign/service/IAssignService.java
@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.chinaweal.youfool.devops.leaderassign.controller.dto.AssignHandleQuery;
import com.chinaweal.youfool.devops.leaderassign.controller.dto.TaskAssignVo;
+import com.chinaweal.youfool.devops.leaderassign.controller.dto.TaskListQuery;
import com.chinaweal.youfool.devops.leaderassign.entity.Assign;
-import java.util.Map;
/**
*
@@ -32,7 +32,7 @@ public interface IAssignService extends IService {
/**
* 获取领导交办待办
*/
- IPage listTask(Map map);
+ IPage listTask(TaskListQuery query);
Assign getAssign(String bizId);
diff --git a/src/main/java/com/chinaweal/youfool/devops/leaderassign/service/impl/AssignServiceImpl.java b/src/main/java/com/chinaweal/youfool/devops/leaderassign/service/impl/AssignServiceImpl.java
index 53a622b..60f62f8 100644
--- a/src/main/java/com/chinaweal/youfool/devops/leaderassign/service/impl/AssignServiceImpl.java
+++ b/src/main/java/com/chinaweal/youfool/devops/leaderassign/service/impl/AssignServiceImpl.java
@@ -15,6 +15,7 @@ import com.chinaweal.youfool.devops.base.service.ITaskHandleService;
import com.chinaweal.youfool.devops.base.service.ITaskListService;
import com.chinaweal.youfool.devops.leaderassign.controller.dto.AssignHandleQuery;
import com.chinaweal.youfool.devops.leaderassign.controller.dto.TaskAssignVo;
+import com.chinaweal.youfool.devops.leaderassign.controller.dto.TaskListQuery;
import com.chinaweal.youfool.devops.leaderassign.entity.Assign;
import com.chinaweal.youfool.devops.leaderassign.mapper.AssignMapper;
import com.chinaweal.youfool.devops.leaderassign.service.IAssignService;
@@ -35,7 +36,6 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
-import java.util.Map;
import java.util.UUID;
/**
@@ -131,13 +131,12 @@ public class AssignServiceImpl extends ServiceImpl impleme
}
@Override
- public IPage listTask(Map map) {
-
- Integer current = (Integer) map.getOrDefault("current", 1);
- Integer size = (Integer) map.getOrDefault("size", 10);
+ public IPage listTask(TaskListQuery query) {
+ Integer current = query.getCurrent() != null ? query.getCurrent() : 1;
+ Integer size = query.getSize() != null ? query.getSize() : 10;
Page page = new Page<>(current, size);
- return baseMapper.listTask(page, map);
+ return baseMapper.listTask(page, query);
}
@Override
diff --git a/src/main/java/com/chinaweal/youfool/devops/org/controller/EngineerController.java b/src/main/java/com/chinaweal/youfool/devops/org/controller/EngineerController.java
index c22dcf2..e90360e 100644
--- a/src/main/java/com/chinaweal/youfool/devops/org/controller/EngineerController.java
+++ b/src/main/java/com/chinaweal/youfool/devops/org/controller/EngineerController.java
@@ -14,7 +14,13 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
diff --git a/src/main/java/com/chinaweal/youfool/devops/org/controller/UserController.java b/src/main/java/com/chinaweal/youfool/devops/org/controller/UserController.java
index 7e54ced..f37cd39 100644
--- a/src/main/java/com/chinaweal/youfool/devops/org/controller/UserController.java
+++ b/src/main/java/com/chinaweal/youfool/devops/org/controller/UserController.java
@@ -18,7 +18,6 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.ExampleObject;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/java/com/chinaweal/youfool/devops/repair/controller/RepairController.java b/src/main/java/com/chinaweal/youfool/devops/repair/controller/RepairController.java
index c3df6dc..8770458 100644
--- a/src/main/java/com/chinaweal/youfool/devops/repair/controller/RepairController.java
+++ b/src/main/java/com/chinaweal/youfool/devops/repair/controller/RepairController.java
@@ -18,7 +18,12 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.lang3.StringUtils;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
diff --git a/src/main/java/com/chinaweal/youfool/devops/repair/controller/RepairTodoController.java b/src/main/java/com/chinaweal/youfool/devops/repair/controller/RepairTodoController.java
index 4072d56..dda2c63 100644
--- a/src/main/java/com/chinaweal/youfool/devops/repair/controller/RepairTodoController.java
+++ b/src/main/java/com/chinaweal/youfool/devops/repair/controller/RepairTodoController.java
@@ -14,7 +14,12 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.time.LocalDateTime;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 7f7ba81..113f2ea 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -7,11 +7,11 @@ logging:
spring:
datasource:
youfool:
- url: jdbc:postgresql://172.22.80.157:5432/devops_gd?currentSchema=public
+ url: jdbc:postgresql://172.22.80.157:5432/devops_gd?currentSchema=dev
username: devops_gd
password: ChinaWeal@2024
devops:
- url: jdbc:postgresql://172.22.80.157:5432/devops_gd?currentSchema=public
+ url: jdbc:postgresql://172.22.80.157:5432/devops_gd?currentSchema=dev
username: devops_gd
password: ChinaWeal@2024
main:
diff --git a/src/main/resources/mybatis/mapper/leaderassign/AssignMapper.xml b/src/main/resources/mybatis/mapper/leaderassign/AssignMapper.xml
index bb24431..7ae350e 100644
--- a/src/main/resources/mybatis/mapper/leaderassign/AssignMapper.xml
+++ b/src/main/resources/mybatis/mapper/leaderassign/AssignMapper.xml
@@ -7,87 +7,23 @@
from task_list t
left join assign a on t.task_id = a.task_id
-
- t.send_id = #{map.sendId}
+
+ t.sign_id = #{query.handlerId}
-
- and t.sign_id = #{map.signId}
+
+ and t.title like concat(concat('%',#{query.title}),'%')
-
- and t.biz_id like concat(concat('%',#{map.bizId}),'%')
+
+ and t.step = #{query.status}
-
- and t.title like concat(concat('%',#{map.title}),'%')
+
+ and t.launch_time >= to_date(#{query.createTimeStart},'yyyy-mm-dd,hh24:mi:ss')
-
- and t.sign_name like concat(concat('%',#{map.signName}),'%')
-
-
- and t.urgency = #{map.urgency}
-
-
- and t.urgency = #{map.urgency}
-
-
- and t.step = #{map.step}
-
-
- and t.send_username = #{map.sendUsername}
-
-
- and t.org like concat(#{map.org},'%')
-
-
- and t.launch_time >= to_date(#{map.launchTimeStart},'yyyy-mm-dd,hh24:mi:ss')
-
-
- and t.launch_time <= to_date(#{map.launchTimeEnd},'yyyy-mm-dd,hh24:mi:ss')
-
-
- and a.assign_time >= to_date(#{map.assignTimeStart},'yyyy-mm-dd,hh24:mi:ss')
-
-
- and a.assign_time <= to_date(#{map.assignTimeEnd},'yyyy-mm-dd,hh24:mi:ss')
-
-
- and a.handle_time >= to_date(#{map.handleTimeStart},'yyyy-mm-dd,hh24:mi:ss')
-
-
- and a.handle_time <= to_date(#{map.handleTimeEnd},'yyyy-mm-dd,hh24:mi:ss')
-
-
- and t.step in
-
- #{item}
-
+
+ and t.launch_time <= to_date(#{query.createTimeEnd},'yyyy-mm-dd,hh24:mi:ss')
and t.deleted = '0'
-
- order by
-
-
- t.launch_time
-
-
- t.urgency
-
-
- t.step
-
-
- t.sign_name
-
-
-
-
- desc
-
-
- ase
-
-
-
+ order by t.launch_time desc