分页封装修改

themis-backend/src/main/java/com/qmth/themis/backend/api/TBExamInvigilateUserController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
+import com.qmth.themis.business.base.BasePage;
 import com.qmth.themis.business.config.SystemConfig;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.response.TBExamInvigilateUserDto;
@@ -64,9 +65,10 @@ public class TBExamInvigilateUserController {
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "监考员信息", response = TBExamInvigilateUserDto.class)})
     public Result query(@ApiParam(value = "考场代码", required = false) @RequestParam(required = false) String roomCode, @ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long userId, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-        IPage<TBExamInvigilateUserDto> examInvigilateUserQuery = tbExamInvigilateUserService.examInvigilateUserQuery(new Page<>(pageNumber, pageSize), roomCode, userId);
+        IPage<TBExamInvigilateUserDto> examInvigilateUserDtoIPage = tbExamInvigilateUserService.examInvigilateUserQuery(new Page<>(pageNumber, pageSize), roomCode, userId);
+        BasePage basePage = new BasePage(examInvigilateUserDtoIPage.getRecords(), examInvigilateUserDtoIPage.getCurrent(), examInvigilateUserDtoIPage.getSize(), examInvigilateUserDtoIPage.getTotal());
         Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, examInvigilateUserQuery);
+        map.put(SystemConstant.RECORDS, basePage);
         return ResultUtil.ok(map);
     }
 

themis-backend/src/main/java/com/qmth/themis/backend/api/TBOrgController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
+import com.qmth.themis.business.base.BasePage;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.response.TBOrgDto;
 import com.qmth.themis.business.entity.TBOrg;
@@ -56,8 +57,9 @@ public class TBOrgController {
     @ApiResponses({@ApiResponse(code = 200, message = "机构信息", response = TBOrgDto.class)})
     public Result queryByPage(@ApiParam(value = "机构代码", required = false) @RequestParam(required = false) String code, @ApiParam(value = "机构名称", required = false) @RequestParam(required = false) String name, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TBOrgDto> tborgIPage = tbOrgService.queryByPage(new Page<>(pageNumber, pageSize), code, name, enable);
+        BasePage basePage = new BasePage(tborgIPage.getRecords(), tborgIPage.getCurrent(), tborgIPage.getSize(), tborgIPage.getTotal());
         Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, tborgIPage);
+        map.put(SystemConstant.RECORDS, basePage);
         return ResultUtil.ok(map);
     }
 

themis-backend/src/main/java/com/qmth/themis/backend/api/TBTaskHistoryController.java

@@ -2,9 +2,9 @@ package com.qmth.themis.backend.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qmth.themis.business.base.BasePage;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.response.TBTaskDto;
-import com.qmth.themis.business.entity.TBTaskHistory;
 import com.qmth.themis.business.enums.TaskStatusEnum;
 import com.qmth.themis.business.enums.TaskTypeEnum;
 import com.qmth.themis.business.service.TBTaskHistoryService;
@@ -48,9 +48,10 @@ public class TBTaskHistoryController {
         if (Objects.isNull(TaskTypeEnum.valueOf(type.name()))) {
             throw new BusinessException(ExceptionResultEnum.TASK_TYPE_ERROR);
         }
-        IPage<TBTaskDto> teExamStudentIPage = tbTaskHistoryService.taskQuery(new Page<>(pageNumber, pageSize), id, entityId, type, status);
+        IPage<TBTaskDto> taskDtoIPage = tbTaskHistoryService.taskQuery(new Page<>(pageNumber, pageSize), id, entityId, type, status);
+        BasePage basePage = new BasePage(taskDtoIPage.getRecords(), taskDtoIPage.getCurrent(), taskDtoIPage.getSize(), taskDtoIPage.getTotal());
         Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, teExamStudentIPage);
+        map.put(SystemConstant.RECORDS, basePage);
         return ResultUtil.ok(map);
     }
 }

themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.gson.Gson;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
+import com.qmth.themis.business.base.BasePage;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.AuthDto;
 import com.qmth.themis.business.dto.response.TBUserDto;
@@ -38,6 +39,7 @@ import com.qmth.themis.mq.enums.MqTopicEnum;
 import com.qmth.themis.mq.service.MqDtoService;
 import io.swagger.annotations.*;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DuplicateKeyException;
@@ -552,6 +554,7 @@ public class TBUserController {
     public Result query(@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "登录名", required = false) @RequestParam(required = false) String loginName, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "角色", required = false) @RequestParam(required = false) String role, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TBUserDto> tbUserIPage = tbUserService.userQuery(new Page<>(pageNumber, pageSize), id, loginName, name, role, enable);
         List<TBUserDto> tbUserDtoList = tbUserIPage.getRecords();
+        BasePage basePage = new BasePage(tbUserDtoList, tbUserIPage.getCurrent(), tbUserIPage.getSize(), tbUserIPage.getTotal());
         tbUserDtoList.forEach(s -> {
             if (Objects.nonNull(s.getRoleNameStr())) {
                 s.setRoleName(Arrays.asList(s.getRoleNameStr().split(",")));
@@ -561,7 +564,7 @@ public class TBUserController {
             }
         });
         Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, tbUserIPage);
+        map.put(SystemConstant.RECORDS, basePage);
         return ResultUtil.ok(map);
     }
 

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamActivityController.java

@@ -2,6 +2,7 @@ package com.qmth.themis.backend.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qmth.themis.business.base.BasePage;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.entity.TBUser;
 import com.qmth.themis.business.entity.TEExam;
@@ -100,8 +101,9 @@ public class TEExamActivityController {
     @ApiResponses({@ApiResponse(code = 200, message = "考试场次信息", response = TEExamActivity.class)})
     public Result query(@ApiParam(value = "考试批次id", required = false) @RequestParam(required = false) Long examId, @ApiParam(value = "考试场次编码", required = false) @RequestParam(required = false) String code, @ApiParam(value = "开始日期", required = false) @RequestParam(required = false) String startDate, @ApiParam(value = "结束日期", required = false) @RequestParam(required = false) String finishDate, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TEExamActivity> teExamActivityIPage = teExamActivityService.examActivityQuery(new Page<>(pageNumber, pageSize), examId, code, startDate, finishDate);
+        BasePage basePage = new BasePage(teExamActivityIPage.getRecords(), teExamActivityIPage.getCurrent(), teExamActivityIPage.getSize(), teExamActivityIPage.getTotal());
         Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, teExamActivityIPage);
+        map.put(SystemConstant.RECORDS, basePage);
         return ResultUtil.ok(map);
     }
 }

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
+import com.qmth.themis.business.base.BasePage;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.entity.TBOrg;
 import com.qmth.themis.business.entity.TBUser;
@@ -169,8 +170,9 @@ public class TEExamController {
     @ApiResponses({@ApiResponse(code = 200, message = "考试批次信息", response = TEExam.class)})
     public Result query(@ApiParam(value = "考试批次id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "考试批次编码", required = false) @RequestParam(required = false) String code, @ApiParam(value = "考试批次名称", required = false) @RequestParam(required = false) String name, @ApiParam(value = "考试批次模式", required = false) @RequestParam(required = false) Integer mode, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TEExam> teExamIPage = teExamService.examQuery(new Page<>(pageNumber, pageSize), id, code, name, mode, enable);
+        BasePage basePage = new BasePage(teExamIPage.getRecords(), teExamIPage.getCurrent(), teExamIPage.getSize(), teExamIPage.getTotal());
         Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, teExamIPage);
+        map.put(SystemConstant.RECORDS, basePage);
         return ResultUtil.ok(map);
     }
 

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamCourseController.java

@@ -2,6 +2,7 @@ package com.qmth.themis.backend.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qmth.themis.business.base.BasePage;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.entity.TEExamCourse;
 import com.qmth.themis.business.enums.FieldUniqueEnum;
@@ -72,9 +73,10 @@ public class TEExamCourseController {
         if (Objects.isNull(examId) || Objects.equals(examId, "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
         }
-        IPage<TEExamCourse> teExamActivityIPage = teExamCourseService.examCourseQuery(new Page<>(pageNumber, pageSize), examId, courseCode, courseName, hasPaper);
+        IPage<TEExamCourse> examCourseIPage = teExamCourseService.examCourseQuery(new Page<>(pageNumber, pageSize), examId, courseCode, courseName, hasPaper);
+        BasePage basePage = new BasePage(examCourseIPage.getRecords(), examCourseIPage.getCurrent(), examCourseIPage.getSize(), examCourseIPage.getTotal());
         Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, teExamActivityIPage);
+        map.put(SystemConstant.RECORDS, basePage);
         return ResultUtil.ok(map);
     }
 }

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamStudentController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
+import com.qmth.themis.business.base.BasePage;
 import com.qmth.themis.business.config.SystemConfig;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.response.TEExamStudentDto;
@@ -82,8 +83,9 @@ public class TEExamStudentController {
             throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
         }
         IPage<TEExamStudentDto> teExamStudentIPage = teExamStudentService.examStudentQuery(new Page<>(pageNumber, pageSize), examId, activityId, identity, name, roomCode, courseCode, grade, enable);
+        BasePage basePage = new BasePage(teExamStudentIPage.getRecords(), teExamStudentIPage.getCurrent(), teExamStudentIPage.getSize(), teExamStudentIPage.getTotal());
         Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, teExamStudentIPage);
+        map.put(SystemConstant.RECORDS, basePage);
         return ResultUtil.ok(map);
     }
 

themis-backend/src/main/java/com/qmth/themis/backend/api/TEStudentController.java

@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
+import com.qmth.themis.business.base.BasePage;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.response.TEStudentDto;
 import com.qmth.themis.business.dto.response.TEStudentExamRecordDto;
 import com.qmth.themis.business.entity.TBUser;
-import com.qmth.themis.business.entity.TEExamStudent;
 import com.qmth.themis.business.entity.TEStudent;
 import com.qmth.themis.business.service.TEStudentService;
 import com.qmth.themis.business.util.JacksonUtil;
@@ -46,8 +46,9 @@ public class TEStudentController {
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEStudentDto.class)})
     public Result query(@ApiParam(value = "证件号", required = false) @RequestParam(required = false) String identity, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TEStudentDto> teExamStudentIPage = teStudentService.studentQuery(new Page<>(pageNumber, pageSize), identity, name, enable);
+        BasePage basePage = new BasePage(teExamStudentIPage.getRecords(), teExamStudentIPage.getCurrent(), teExamStudentIPage.getSize(), teExamStudentIPage.getTotal());
         Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, teExamStudentIPage);
+        map.put(SystemConstant.RECORDS, basePage);
         return ResultUtil.ok(map);
     }
 
@@ -112,9 +113,10 @@ public class TEStudentController {
         if (Objects.isNull(id) || Objects.equals(id, "")) {
             throw new BusinessException(ExceptionResultEnum.STUDENT_ID_IS_NULL);
         }
-        IPage<TEStudentExamRecordDto> studentExamRecordQuery = teStudentService.studentExamRecordQuery(new Page<>(pageNumber, pageSize), id, name);
+        IPage<TEStudentExamRecordDto> teStudentExamRecordDtoIPage = teStudentService.studentExamRecordQuery(new Page<>(pageNumber, pageSize), id, name);
+        BasePage basePage = new BasePage(teStudentExamRecordDtoIPage.getRecords(), teStudentExamRecordDtoIPage.getCurrent(), teStudentExamRecordDtoIPage.getSize(), teStudentExamRecordDtoIPage.getTotal());
         Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, studentExamRecordQuery);
+        map.put(SystemConstant.RECORDS, basePage);
         return ResultUtil.ok(map);
     }
 }

themis-backend/src/main/java/com/qmth/themis/backend/api/TIeInvigilateController.java

@@ -64,7 +64,7 @@ public class TIeInvigilateController {
     public Result finish(@ApiJsonObject(name = "invigilateFinish", value = {
             @ApiJsonProperty(key = "examRecordId", description = "考试记录id"),
             @ApiJsonProperty(key = "type", description = "收卷类型，手动/强制")
-    }) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> mapParameter) {
+    }) @ApiParam(value = "考试记录信息", required = true) @RequestBody Map<String, Object> mapParameter) {
         if (Objects.isNull(mapParameter.get("examRecordId")) || Objects.equals(mapParameter.get("examRecordId"), "")) {
             throw new BusinessException(ExceptionResultEnum.RECORD_ID_IS_NULL);
         }
@@ -79,4 +79,14 @@ public class TIeInvigilateController {
         mqDtoService.assembleSendOneWayMsg(mqDto);
         return ResultUtil.ok(SystemConstant.SUCCESS);
     }
+
+    @ApiOperation(value = "监考消息通知接口")
+    @RequestMapping(value = "/notice", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
+    public Result notice(@ApiJsonObject(name = "invigilateNotice", value = {
+            @ApiJsonProperty(key = "examRecordId", description = "考试记录id"),
+            @ApiJsonProperty(key = "type", description = "收卷类型，手动/强制")
+    }) @ApiParam(value = "考试记录信息", required = true) @RequestBody Map<String, Object> mapParameter) {
+        return ResultUtil.ok(SystemConstant.SUCCESS);
+    }
 }

themis-business/src/main/java/com/qmth/themis/business/base/BasePage.java

@@ -0,0 +1,68 @@
+package com.qmth.themis.business.base;
+
+
+import com.qmth.themis.business.dto.response.TBUserDto;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.poi.ss.formula.functions.T;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @Description: 分页封装
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/8/7
+ */
+public class BasePage {
+    @ApiModelProperty(value = "当前第几页(从1开始)")
+    private int current;
+
+    @ApiModelProperty(value = "每页条数")
+    private int size;
+
+    @ApiModelProperty(value = "总条数")
+    private int total;
+
+    @ApiModelProperty(value = "内容列表")
+    private List<?> records;
+
+    public BasePage(List<?> records, long current, long size, long total) {
+        this.current = (int) current;
+        this.size = (int) size;
+        this.total = (int) total;
+        this.records = records;
+    }
+
+    public int getCurrent() {
+        return current;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public List<?> getRecords() {
+        return records;
+    }
+
+    /**
+     * 总页数
+     */
+    public int getPages() {
+        if (getSize() == 0) {
+            return 0;
+        }
+        int pages = getTotal() / getSize();
+        if (getTotal() % getSize() != 0) {
+            pages++;
+        }
+        return pages;
+    }
+}

themis-business/src/main/java/com/qmth/themis/business/dao/TBTaskHistoryMapper.java

@@ -31,5 +31,5 @@ public interface TBTaskHistoryMapper extends BaseMapper<TBTaskHistory> {
      * @param status
      * @return
      */
-    public IPage<TBTaskDto> taskQuery(IPage<Map> iPage, @Param("taskId") Long taskId, @Param("entityId") Long entityId, @Param("type") TaskTypeEnum type, @Param("status") TaskStatusEnum status);
+    public IPage<TBTaskDto> taskQuery(IPage<Map> iPage, @Param("taskId") Long taskId, @Param("entityId") Long entityId, @Param("type") String type, @Param("status") String status);
 }

themis-business/src/main/java/com/qmth/themis/business/entity/TIeExamInvigilateCall.java

@@ -0,0 +1,113 @@
+package com.qmth.themis.business.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.qmth.themis.business.base.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+* @Description: 监考监考通话申请
+* @Param:
+* @return:
+* @Author: wangliang
+* @Date: 2020/8/7
+*/
+@ApiModel(value = "t_ie_exam_invigilate_call", description = "监控观看地址和通话申请")
+public class TIeExamInvigilateCall extends BaseEntity {
+
+    @ApiModelProperty(value = "考试ID")
+    @TableField(value = "exam_id")
+    private Long examId;
+
+    @ApiModelProperty(value = "场次ID")
+    @TableField(value = "exam_activity_id")
+    private Long examActivityId;
+
+    @ApiModelProperty(value = "考试记录ID")
+    @TableField(value = "exam_record_id")
+    private Long examRecordId;
+
+    @ApiModelProperty(value = "考生ID")
+    @TableField(value = "exam_student_id")
+    private Long examStudentId;
+
+    @ApiModelProperty(value = "监考视频源")
+    @TableField(value = "source")
+    private String source;
+
+    @ApiModelProperty(value = "观看地址")
+    @TableField(value = "live_url")
+    private String liveUrl;
+
+    @ApiModelProperty(value = "状态")
+    @TableField(value = "status")
+    private String status;
+
+    @ApiModelProperty(value = "类型")
+    @TableField(value = "type")
+    private String type;
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Long getExamActivityId() {
+        return examActivityId;
+    }
+
+    public void setExamActivityId(Long examActivityId) {
+        this.examActivityId = examActivityId;
+    }
+
+    public Long getExamRecordId() {
+        return examRecordId;
+    }
+
+    public void setExamRecordId(Long examRecordId) {
+        this.examRecordId = examRecordId;
+    }
+
+    public Long getExamStudentId() {
+        return examStudentId;
+    }
+
+    public void setExamStudentId(Long examStudentId) {
+        this.examStudentId = examStudentId;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getLiveUrl() {
+        return liveUrl;
+    }
+
+    public void setLiveUrl(String liveUrl) {
+        this.liveUrl = liveUrl;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}

themis-business/src/main/java/com/qmth/themis/business/service/impl/TBTaskHistoryServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @Description: 异步任务 服务实现类
@@ -38,6 +39,6 @@ public class TBTaskHistoryServiceImpl extends ServiceImpl<TBTaskHistoryMapper, T
      */
     @Override
     public IPage<TBTaskDto> taskQuery(IPage<Map> iPage, Long taskId, Long entityId, TaskTypeEnum type, TaskStatusEnum status) {
-        return tbTaskHistoryMapper.taskQuery(iPage, taskId, entityId, type, status);
+        return tbTaskHistoryMapper.taskQuery(iPage, taskId, entityId, Objects.isNull(type) ? null : type.name(), Objects.isNull(status) ? null : status.name());
     }
 }