Browse Source

feat:添加查否时间

feature/tsjb-1.0
buaixuexideshitongxue 3 weeks ago
parent
commit
dbd01ee72e
  1. 11
      src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java
  2. 4
      src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java

11
src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskProblemController.java

@ -37,6 +37,7 @@ import org.springframework.web.bind.annotation.*;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -78,7 +79,13 @@ public class TaskProblemController {
queryWrapper.eq(SupTaskProblem::getCreateUsername, user.getUserName()); queryWrapper.eq(SupTaskProblem::getCreateUsername, user.getUserName());
} }
if(StrUtil.isNotBlank(queryParam.getActionType())){ if(StrUtil.isNotBlank(queryParam.getActionType())){
queryWrapper.eq(!"0".equals(queryParam.getActionType()),SupTaskProblem::getProblemState,queryParam.getActionType()); if("1".equals(queryParam.getActionType())){
// 待下发:筛选未分发的数据
queryWrapper.eq(SupTaskProblem::getDistributionState, "0");
} else if("2".equals(queryParam.getActionType())){
// 查否:筛选查否状态的数据
queryWrapper.eq(SupTaskProblem::getProblemState, "2");
}
} }
queryWrapper.orderByDesc(SupTaskProblem::getCreateTime); queryWrapper.orderByDesc(SupTaskProblem::getCreateTime);
Page<SupTaskProblem> page = taskProblemService.page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); Page<SupTaskProblem> page = taskProblemService.page(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
@ -102,8 +109,10 @@ public class TaskProblemController {
SupTaskProblem supTaskProblem = taskProblemService.getById(id); SupTaskProblem supTaskProblem = taskProblemService.getById(id);
if("1".equals(supTaskProblem.getProblemState())){ if("1".equals(supTaskProblem.getProblemState())){
supTaskProblem.setProblemState("2"); supTaskProblem.setProblemState("2");
supTaskProblem.setRejectTime(LocalDateTime.now()); // 设置查否时间
}else{ }else{
supTaskProblem.setProblemState("1"); supTaskProblem.setProblemState("1");
// 恢复时不处理 rejectTime,保留最后一次查否时间
} }
return Result.success(taskProblemService.updateById(supTaskProblem)); return Result.success(taskProblemService.updateById(supTaskProblem));
} }

4
src/main/java/com/biutag/supervision/pojo/entity/SupTaskProblem.java

@ -83,4 +83,8 @@ public class SupTaskProblem {
@TableField("issue_user_id") @TableField("issue_user_id")
private String issueUserId; private String issueUserId;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("reject_time")
private LocalDateTime rejectTime;
} }

Loading…
Cancel
Save