diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java index 2def810..669ec24 100644 --- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java +++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java @@ -3,17 +3,21 @@ package com.biutag.supervision.controller.mobileSupervision; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.biutag.supervision.common.UserContextHolder; +import com.biutag.supervision.constants.AppConstants; +import com.biutag.supervision.constants.enums.TaskTypeEnum; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.dto.TaskProblemDto; import com.biutag.supervision.pojo.entity.SupTaskPerson; import com.biutag.supervision.pojo.entity.SupTaskProblem; +import com.biutag.supervision.pojo.model.UserAuth; import com.biutag.supervision.pojo.param.TaskProblemQueryParam; import com.biutag.supervision.service.SupTaskProblemService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -30,6 +34,12 @@ public class TaskProblemController { @GetMapping public Result> page(TaskProblemQueryParam queryParam) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StrUtil.isNotBlank(queryParam.getTaskType()), SupTaskProblem::getTaskType, queryParam.getTaskType()) + .eq(Objects.nonNull(queryParam.getTaskId()), SupTaskProblem::getTaskType, queryParam.getTaskType()); + UserAuth user = UserContextHolder.getCurrentUser(); + if (TaskTypeEnum.problem_shooting.name().equals(queryParam.getTaskType()) && !AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) ) { + queryWrapper.eq(SupTaskProblem::getCreateUsername, user.getUserName()); + } queryWrapper.orderByDesc(SupTaskProblem::getCreateTime); Page page = taskProblemService.page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); page.getRecords().forEach(item -> { diff --git a/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java b/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java index a95bea9..5d4ef69 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java @@ -54,6 +54,8 @@ public class SupTaskProblem { @TableField("create_time") private LocalDateTime createTime; + private String createUsername; + private String distributionState; private String taskType; diff --git a/src/main/java/com/biutag/supervision/pojo/param/TaskProblemQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/TaskProblemQueryParam.java index e3d36f0..6046e73 100644 --- a/src/main/java/com/biutag/supervision/pojo/param/TaskProblemQueryParam.java +++ b/src/main/java/com/biutag/supervision/pojo/param/TaskProblemQueryParam.java @@ -10,4 +10,8 @@ import lombok.Setter; @Setter @Getter public class TaskProblemQueryParam extends BasePage { + + private String taskType; + + private Integer taskId; } diff --git a/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java b/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java index bb03265..63cea4f 100644 --- a/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java +++ b/src/main/java/com/biutag/supervision/service/SupTaskProblemService.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.biutag.supervision.common.UserContextHolder; import com.biutag.supervision.constants.enums.DistributionStateEnum; import com.biutag.supervision.constants.enums.TaskStatusEnum; import com.biutag.supervision.constants.enums.TaskTypeEnum; @@ -53,6 +54,7 @@ public class SupTaskProblemService extends ServiceImpl