diff --git a/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskDetailController.java b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskDetailController.java index eef041f..99174bb 100644 --- a/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskDetailController.java +++ b/web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskDetailController.java @@ -33,7 +33,7 @@ public class TaskDetailController { @ApiOperation("获取任务列表") @PostMapping("/list") - public PageResponse listPage(@RequestBody TaskDetailPageQry qry) { + public PageResponse listPage(@Validated @RequestBody TaskDetailPageQry qry) { return taskListService.listPage(qry); } diff --git a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailPageQry.java b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailPageQry.java index 37d0f72..dae5592 100644 --- a/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailPageQry.java +++ b/web-client/src/main/java/com/zcloud/safetyDutyList/dto/tasklist/TaskDetailPageQry.java @@ -4,6 +4,8 @@ import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotEmpty; + /** * 任务详情分页查询参数 *

@@ -12,6 +14,7 @@ import lombok.Data; @Data public class TaskDetailPageQry extends PageQuery { @ApiModelProperty(value = "清单表主键ID") + @NotEmpty(message = "清单ID不能为空") private String taskListId; @ApiModelProperty(value = "执行内容") diff --git a/web-infrastructure/src/main/resources/mapper/tasklist/TaskDetailMapper.xml b/web-infrastructure/src/main/resources/mapper/tasklist/TaskDetailMapper.xml index 01cb933..d072920 100644 --- a/web-infrastructure/src/main/resources/mapper/tasklist/TaskDetailMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/tasklist/TaskDetailMapper.xml @@ -30,6 +30,18 @@ AND td.task_list_id = #{params.taskListId} + + AND td.execute_content LIKE CONCAT('%', #{params.taskContent}, '%') + + + AND td.feedback_cycle_type = #{params.feedbackCycleType} + + + AND td.feedback_status >= #{params.feedbackStatus} + + + AND td.task_status = #{params.taskStatus} + ORDER BY td.id ASC