5-27 fix

web-adapter/src/main/java/com/zcloud/safetyDutyList/web/tasklist/TaskDetailController.java

@@ -33,7 +33,7 @@ public class TaskDetailController {
 
     @ApiOperation("获取任务列表")
     @PostMapping("/list")
-    public PageResponse<TaskDetailFullCO> listPage(@RequestBody TaskDetailPageQry qry) {
+    public PageResponse<TaskDetailFullCO> listPage(@Validated @RequestBody TaskDetailPageQry qry) {
         return taskListService.listPage(qry);
     }
 

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;
+
 /**
  * 任务详情分页查询参数
  * <p>
@@ -12,6 +14,7 @@ import lombok.Data;
 @Data
 public class TaskDetailPageQry extends PageQuery {
     @ApiModelProperty(value = "清单表主键ID")
+    @NotEmpty(message = "清单ID不能为空")
     private String taskListId;
 
     @ApiModelProperty(value = "执行内容")

web-infrastructure/src/main/resources/mapper/tasklist/TaskDetailMapper.xml

@@ -30,6 +30,18 @@
             <if test="params.taskListId != null and params.taskListId != ''">
                 AND td.task_list_id = #{params.taskListId}
             </if>
+            <if test="params.taskContent != null and params.taskContent != ''">
+                AND td.execute_content LIKE CONCAT('%', #{params.taskContent}, '%')
+            </if>
+            <if test="params.feedbackCycleType != null and params.feedbackCycleType != ''">
+                AND td.feedback_cycle_type = #{params.feedbackCycleType}
+            </if>
+            <if test="params.feedbackStatus != null and params.feedbackStatus != ''">
+                AND td.feedback_status >= #{params.feedbackStatus}
+            </if>
+            <if test="params.taskStatus != null and params.taskStatus != ''">
+                AND td.task_status = #{params.taskStatus}
+            </if>
         </where>
         ORDER BY td.id ASC
     </select>