Browse Source

fix: 移动督察APP BUG修复

master
wxc 7 months ago
parent
commit
1278feced4
  1. 5
      src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskController.java
  2. 5
      src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java
  3. 1
      src/main/java/com/biutag/supervision/pojo/param/SupRotaQueryParam.java
  4. 3
      src/main/java/com/biutag/supervision/service/SupRotaService.java

5
src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskController.java

@ -36,6 +36,11 @@ public class TaskController {
return Result.success(taskService.getTaskCount()); return Result.success(taskService.getTaskCount());
} }
@GetMapping("detail")
public Result<SupTask> get(Integer id) {
return Result.success(taskService.getById(id));
}
@GetMapping("count/all") @GetMapping("count/all")
public Result<TaskCountVo> countAll() { public Result<TaskCountVo> countAll() {
long todoCount = taskService.count(new LambdaQueryWrapper<SupTask>().eq(SupTask::getTaskStatus, WorkStatusEnum.todo.name())); long todoCount = taskService.count(new LambdaQueryWrapper<SupTask>().eq(SupTask::getTaskStatus, WorkStatusEnum.todo.name()));

5
src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java

@ -11,18 +11,14 @@ import com.alibaba.excel.read.listener.ReadListener;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.Result;
import com.biutag.supervision.pojo.dto.DataCaseVerifImportDto;
import com.biutag.supervision.pojo.dto.SupRiskDto; import com.biutag.supervision.pojo.dto.SupRiskDto;
import com.biutag.supervision.pojo.dto.TaskManagementDto; import com.biutag.supervision.pojo.dto.TaskManagementDto;
import com.biutag.supervision.pojo.dto.TemperancePoliceDto; import com.biutag.supervision.pojo.dto.TemperancePoliceDto;
import com.biutag.supervision.pojo.entity.RiskPersonInfo; import com.biutag.supervision.pojo.entity.RiskPersonInfo;
import com.biutag.supervision.pojo.entity.SupDepart; import com.biutag.supervision.pojo.entity.SupDepart;
import com.biutag.supervision.pojo.entity.SupPolice; import com.biutag.supervision.pojo.entity.SupPolice;
import com.biutag.supervision.pojo.entity.SupRiskPersonal;
import com.biutag.supervision.pojo.param.TaskInspectionQueryParam;
import com.biutag.supervision.pojo.param.TaskQueryParam; import com.biutag.supervision.pojo.param.TaskQueryParam;
import com.biutag.supervision.pojo.param.TaskRiskPersonalQueryParam; import com.biutag.supervision.pojo.param.TaskRiskPersonalQueryParam;
import com.biutag.supervision.pojo.vo.TaskInspectionVo;
import com.biutag.supervision.pojo.vo.TaskVo; import com.biutag.supervision.pojo.vo.TaskVo;
import com.biutag.supervision.service.*; import com.biutag.supervision.service.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -52,7 +48,6 @@ public class TaskManagementController {
private final RiskPersonInfoService riskPersonInfoService; private final RiskPersonInfoService riskPersonInfoService;
@GetMapping @GetMapping
public Result<Page<TaskVo>> pageResult(TaskQueryParam queryParam) { public Result<Page<TaskVo>> pageResult(TaskQueryParam queryParam) {
return Result.success(taskService.pageTaskData(queryParam)); return Result.success(taskService.pageTaskData(queryParam));

1
src/main/java/com/biutag/supervision/pojo/param/SupRotaQueryParam.java

@ -10,6 +10,7 @@ import java.util.Date;
@Getter @Getter
@Setter @Setter
public class SupRotaQueryParam { public class SupRotaQueryParam {
private String deptId; private String deptId;
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")

3
src/main/java/com/biutag/supervision/service/SupRotaService.java

@ -1,5 +1,6 @@
package com.biutag.supervision.service; package com.biutag.supervision.service;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -31,7 +32,7 @@ public class SupRotaService extends ServiceImpl<SupRotaMapper, SupRota> {
//判断传入的id是市局、还是分局 //判断传入的id是市局、还是分局
JSONObject jsonObject=new JSONObject(); JSONObject jsonObject=new JSONObject();
if (user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode()) || user.getRoleCodes().contains(RoleCodeEnum.ADMIN.getCode()) ) { if (StrUtil.isBlank(queryParam.getDeptId()) && (user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode()) || user.getRoleCodes().contains(RoleCodeEnum.ADMIN.getCode()))) {
SupDepart supDepart = departService.getById(AppConstants.ROOT_DEPART_ID); SupDepart supDepart = departService.getById(AppConstants.ROOT_DEPART_ID);
//市局的数据进行分类 //市局的数据进行分类

Loading…
Cancel
Save