Merge branch 'dev_v2.2.0' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v2.2.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskDto.java

@@ -1,8 +1,11 @@
 package com.qmth.distributed.print.business.bean.dto;
 
+import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
+import com.qmth.teachcloud.common.enums.FlowStatusEnum;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @Date: 2021/3/31.
@@ -20,7 +23,7 @@ public class ExamTaskDto {
     private String userName;
     private Long startTime;
     private Long endTime;
-    private String status;
+    private ExamStatusEnum status;
     private Boolean enable;
     private String createId;
     private String createName;
@@ -32,9 +35,43 @@ public class ExamTaskDto {
     private String teachingRoomName;
     private String flowId;
     private Integer setup;
-
+    private FlowStatusEnum flowStatus;
+    private String flowStatusStr;
+    private String statusStr;
     private List<BlurryUserDto> users;
 
+    public FlowStatusEnum getFlowStatus() {
+        return flowStatus;
+    }
+
+    public void setFlowStatus(FlowStatusEnum flowStatus) {
+        this.flowStatus = flowStatus;
+    }
+
+    public String getFlowStatusStr() {
+        if (Objects.nonNull(flowStatus)) {
+            return flowStatus.getTitle();
+        } else {
+            return flowStatusStr;
+        }
+    }
+
+    public void setFlowStatusStr(String flowStatusStr) {
+        this.flowStatusStr = flowStatusStr;
+    }
+
+    public String getStatusStr() {
+        if (Objects.nonNull(status)) {
+            return status.getDesc();
+        } else {
+            return statusStr;
+        }
+    }
+
+    public void setStatusStr(String statusStr) {
+        this.statusStr = statusStr;
+    }
+
     public String getId() {
         return id;
     }
@@ -123,11 +160,11 @@ public class ExamTaskDto {
         this.endTime = endTime;
     }
 
-    public String getStatus() {
+    public ExamStatusEnum getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(ExamStatusEnum status) {
         this.status = status;
     }
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/ExamStatusEnum.java

@@ -12,7 +12,7 @@ import java.util.List;
  */
 public enum ExamStatusEnum {
 
-    DRAFT("草稿"),
+    DRAFT("新建"),
     STAGE("待命题"),
     SUBMIT("已提交");
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -252,18 +252,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
 
         UpdateWrapper<ExamTask> updateWrapper = new UpdateWrapper<>();
-////        // 启用时，后续状态清空
-//        if (examTask.getEnable()) {
-//            updateWrapper.lambda().set(ExamTask::getEnable, examTask.getEnable()) // 修改启用状态
-//                    .set(ExamTask::getReviewStatus, null) // 清空审核状态
-//                    .set(ExamTask::getStatus, task.getStatus().equals(ExamStatusEnum.NEW) || task.getStatus().equals(ExamStatusEnum.READY) ? task.getStatus() : ExamStatusEnum.STAGE) // 更新为命题中
-//                    .eq(ExamTask::getId, examTask.getId());
-//        } else {
-//            updateWrapper.lambda().set(ExamTask::getEnable, examTask.getEnable()).eq(ExamTask::getId, examTask.getId());
-//        }
-
-        // 解除题卡绑定
-        if (task.getEnable()) {
+        updateWrapper.lambda().set(ExamTask::getEnable, examTask.getEnable()).eq(ExamTask::getId, task.getId());
+        // 启用时，后续状态清空
+        if (!examTask.getEnable()) {//解除题卡绑定
             examTaskDetailService.resetCardId(examTask.getId());
         }
         return this.update(updateWrapper);
@@ -347,7 +338,14 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             examTask.setOrgId(sysUser.getOrgId());
             if (examTask.getUserId() == null) {
                 examTask.setStatus(ExamStatusEnum.DRAFT);
-            } else {
+            } else if (examTask.getReview()) {
+                examTask.setStatus(ExamStatusEnum.STAGE);
+                //TODO 这里以后要判断学校code来取流程key
+                Map<String, Object> map = new HashMap<>();
+                map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(examTask.getUserId()));
+                ProcessInstance processInstance = activitiService.startActivity(SystemConstant.GDYKDX_FLOW_KEY, map);
+                examTask.setFlowId(Long.parseLong(processInstance.getId()));
+            } else if (!examTask.getReview()) {
                 examTask.setStatus(ExamStatusEnum.STAGE);
             }
             this.save(examTask);
@@ -867,7 +865,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         /*if (examTaskDetail.getOperateType().equals(ExamStatusEnum.SUBMIT.name())) {
             if (Objects.isNull(examTask.getFlowId())) {
                 //TODO 这里以后要判断学校code来取流程key
-                examTask.setStatus(ExamStatusEnum.SUBMIT);
+                examTask.setStatus(ExamStatusEnum.STAGE);
                 if (examTask.getReview()) {
                     Map<String, Object> map = new HashMap<>();
                     map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(examTask.getUserId()));
@@ -887,10 +885,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 .eq(ExamTask::getId, examTask.getId());
         this.update(updateWrapper);
 
-        if(Objects.nonNull(examTask.getFlowId())){
+        if (Objects.nonNull(examTask.getFlowId())) {
             // 审核一级
             Task task = taskService.createTaskQuery().processInstanceId(String.valueOf(examTask.getFlowId())).singleResult();
-            if(Objects.nonNull(task)) {
+            if (Objects.nonNull(task)) {
                 Map<String, Object> map1 = new HashMap<>();
                 map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
                 activitiService.taskApprove(map1);
@@ -1368,7 +1366,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             } else {
                 if (Objects.isNull(examTask.getFlowId())) {
                     //TODO 这里以后要判断学校code来取流程key
-                    examTask.setStatus(ExamStatusEnum.SUBMIT);
+                    examTask.setStatus(ExamStatusEnum.STAGE);
                     if (basicExamRule.getReview()) {
                         Map<String, Object> map = new HashMap<>();
                         map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> String.valueOf(examTask.getUserId()));
@@ -1383,10 +1381,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             // 提交时，校验
             if (ExamStatusEnum.SUBMIT.name().equals(examTaskDetail.getOperateType())) {
 
-                if(Objects.nonNull(examTask.getFlowId())){
+                if (Objects.nonNull(examTask.getFlowId())) {
                     // 审核一级
                     Task task = taskService.createTaskQuery().processInstanceId(String.valueOf(examTask.getFlowId())).singleResult();
-                    if(Objects.nonNull(task)) {
+                    if (Objects.nonNull(task)) {
                         Map<String, Object> map1 = new HashMap<>();
                         map1.computeIfAbsent(SystemConstant.FLOW_TASK_ID, v -> task.getId());
                         activitiService.taskApprove(map1);

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -256,15 +256,7 @@
             a.status,
             a.flow_id flowId,
             f.setup,
-            CASE
-                WHEN a.review = 1 AND a.status = 'SUBMIT' THEN 'NOT_AUDITED'
-                WHEN a.review = 1 AND a.status IN ('STAGE', 'FINISH') AND a.review_status IS NOT NULL THEN 'AUDITED'
-                ELSE ''
-            END auditStatus,
-            CASE
-                WHEN a.review_status IS NULL THEN ''
-                ELSE a.review_status
-            END reviewStatus
+            f.status as flowStatus
         FROM
             exam_task a
         LEFT JOIN
@@ -280,7 +272,7 @@
         <where>
             a.enable = true
             AND a.review = true
-            AND f.status != 'FINISH'
+            AND f.status = 'AUDITING' or f.status = 'REJECT'
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>
@@ -322,7 +314,7 @@
     </select>
     <select id="listTaskReviewAudited" resultType="com.qmth.distributed.print.business.bean.dto.ExamTaskDto">
         SELECT
-        a.id,
+        distinct a.id,
         a.school_id schoolId,
         a.course_code courseCode,
         a.course_name courseName,
@@ -340,15 +332,9 @@
         a.create_id createId,
         a.create_time createTime,
         a.status,
-        CASE
-        WHEN a.review = 1 AND a.status = 'SUBMIT' THEN 'NOT_AUDITED'
-        WHEN a.review = 1 AND a.status IN ('STAGE', 'FINISH') AND a.review_status IS NOT NULL THEN 'AUDITED'
-        ELSE ''
-        END auditStatus,
-        CASE
-        WHEN a.review_status IS NULL THEN ''
-        ELSE a.review_status
-        END reviewStatus
+        a.flow_id flowId,
+        f.setup,
+        f.status as flowStatus
         FROM
         exam_task a
         LEFT JOIN
@@ -357,6 +343,10 @@
         sys_user c ON a.user_id = c.id
         LEFT JOIN
         sys_user d ON a.create_id = d.id
+        LEFT JOIN t_f_flow_approve f ON
+        a.flow_id = f.flow_id
+        LEFT JOIN t_f_flow_approve_log tffal ON
+        a.flow_id = tffal.flow_id
         <where>
             a.enable = true and a.review = true and a.status in ('STAGE','FINISH') and a.review_status is not null
             <if test="schoolId != null and schoolId != ''">
@@ -372,7 +362,7 @@
                 and a.paper_number = #{paperNumber}
             </if>
             <if test="userId != null and userId != ''">
-                and a.user_id = #{userId}
+                and (tffal.primary_approve_id = #{userId} or tffal.second_approve_id = #{userId})
             </if>
             <if test="cardRuleId != null and cardRuleId != ''">
                 and a.card_rule_id = #{cardRuleId}
@@ -764,104 +754,117 @@
 
     <select id="getFlowTaskReadyList" resultType="com.qmth.distributed.print.business.bean.result.WorkResult">
         select
-        et.id,
-        et.school_id schoolId,
-        et.org_id as orgId,
-        et.course_code courseCode,
-        et.course_name courseName,
-        et.specialty,
-        et.paper_number paperNumber,
-        et.card_rule_id cardRuleId,
-        case
-        et.card_rule_id when -1 then '全部通卡'
-        else b.name
-        end cardRuleName,
-        art.ASSIGNEE_ as userId,
-        c.real_name userName,
-        et.start_time startTime,
-        et.end_time endTime,
-        tffa.status,
-        et.enable,
-        et.create_time createTime,
-        art.EXECUTION_ID_ as executionId,
-        et.flow_id as flowId,
-        art.NAME_ as taskName,
-        art.TASK_DEF_KEY_ as taskDefKey,
-        art.ID_ as taskId,
-        tffa.setup
-        from
-        ACT_RU_TASK art
-        left join exam_task et on
-        et.flow_id = art.PROC_INST_ID_
-        left join basic_card_rule b ON
-        et.card_rule_id = b.id
-        left join t_f_flow_approve tffa on
-        tffa.flow_id = et.flow_id
-        left join sys_user c ON
-        art.ASSIGNEE_ = c.id
-        <where>
-            <if test="userId != null and userId != ''">
-                and art.ASSIGNEE_ = #{userId}
-            </if>
-            <if test="schoolId != null and schoolId != ''">
-                and et.school_id = #{schoolId}
-            </if>
-<!--            <if test="orgId != null and orgId != ''">-->
-<!--                and et.org_id = #{orgId}-->
-<!--            </if>-->
-        </where>
-        UNION all
-        select
-        et.id,
-        et.school_id schoolId,
-        et.org_id as orgId,
-        et.course_code courseCode,
-        et.course_name courseName,
-        et.specialty,
-        et.paper_number paperNumber,
-        et.card_rule_id cardRuleId,
-        case
-        et.card_rule_id when -1 then '全部通卡'
-        else b.name
-        end cardRuleName,
-        ari.USER_ID_ as userId,
-        c.real_name userName,
-        et.start_time startTime,
-        et.end_time endTime,
-        tffa.status,
-        et.enable,
-        et.create_time createTime,
-        art.EXECUTION_ID_ as executionId,
-        et.flow_id as flowId,
-        art.NAME_ as taskName,
-        art.TASK_DEF_KEY_ as taskDefKey,
-        art.ID_ as taskId,
-        tffa.setup
+            temp.*,
+            c.real_name as userName
         from
-        ACT_RU_TASK art
-        left join exam_task et on
-        et.flow_id = art.PROC_INST_ID_
-        left join act_ru_identitylink ari on
-        ari.TASK_ID_ = art.ID_
-        left join basic_card_rule b ON
-        et.card_rule_id = b.id
-        left join t_f_flow_approve tffa on
-        tffa.flow_id = et.flow_id
+            (
+            select
+                et.id,
+                et.school_id schoolId,
+                et.org_id as orgId,
+                et.course_code courseCode,
+                et.course_name courseName,
+                et.specialty,
+                et.paper_number paperNumber,
+                et.card_rule_id cardRuleId,
+                case
+                    et.card_rule_id when -1 then '全部通卡'
+                    else b.name
+                end cardRuleName,
+                case
+                    when art.ASSIGNEE_ is null then
+                 (
+                    select
+                        ari.USER_ID_
+                    from
+                        act_ru_identitylink ari
+                    where
+                        ari.TASK_ID_ = art.ID_
+                        and art.ASSIGNEE_ is null
+                        and ari.TYPE_ = 'candidate'
+                        and ari.USER_ID_ = #{userId})
+                    else art.ASSIGNEE_
+                end as userId,
+                et.start_time startTime,
+                et.end_time endTime,
+                tffa.status,
+                et.enable,
+                et.create_time createTime,
+                art.EXECUTION_ID_ as executionId,
+                et.flow_id as flowId,
+                art.NAME_ as taskName,
+                art.TASK_DEF_KEY_ as taskDefKey,
+                art.ID_ as taskId,
+                tffa.setup
+            from
+                (
+                select
+                    et.id,
+                    et.school_id ,
+                    et.org_id,
+                    et.course_code,
+                    et.course_name,
+                    et.specialty,
+                    et.paper_number,
+                    et.card_rule_id,
+                    case
+                        et.card_rule_id when -1 then '全部通卡'
+                        else b.name
+                    end,
+                    et.user_id,
+                    et.start_time,
+                    et.end_time,
+                    et.enable,
+                    et.create_time,
+                    et.flow_id
+                from
+                    exam_task et
+                left join basic_card_rule b ON
+                    et.card_rule_id = b.id
+                left join sys_user c ON
+                    et.user_id = c.id
+                WHERE
+                    et.user_id = #{userId}
+                    and et.school_id = #{schoolId}
+                    and et.flow_id is null
+            union all
+                select
+                    et.id,
+                    et.school_id,
+                    et.org_id,
+                    et.course_code,
+                    et.course_name,
+                    et.specialty,
+                    et.paper_number,
+                    et.card_rule_id,
+                    case
+                        et.card_rule_id when -1 then '全部通卡'
+                        else b.name
+                    end,
+                    et.user_id,
+                    et.start_time,
+                    et.end_time,
+                    et.enable,
+                    et.create_time,
+                    et.flow_id
+                from
+                    exam_task et
+                left join basic_card_rule b ON
+                    et.card_rule_id = b.id
+                left join sys_user c ON
+                    et.user_id = c.id
+                WHERE
+                    et.user_id = #{userId}
+                    and et.school_id = #{schoolId}
+                    and et.flow_id is not null) et
+            left join ACT_RU_TASK art on
+                et.flow_id = art.PROC_INST_ID_
+            left join t_f_flow_approve tffa on
+                tffa.flow_id = et.flow_id
+            left join basic_card_rule b ON
+                et.card_rule_id = b.id ) temp
         left join sys_user c ON
-        ari.USER_ID_ = c.id
-        <where>
-            and art.ASSIGNEE_ is null
-            and ari.TYPE_ = 'candidate'
-            <if test="userId != null and userId != ''">
-                and ari.USER_ID_ = #{userId}
-            </if>
-            <if test="schoolId != null and schoolId != ''">
-                and et.school_id = #{schoolId}
-            </if>
-<!--            <if test="orgId != null and orgId != ''">-->
-<!--                and et.org_id = #{orgId}-->
-<!--            </if>-->
-        </where>
+            temp.userId = c.id
     </select>
 
     <select id="findByFlowStatus" resultType="com.qmth.distributed.print.business.entity.ExamTask">

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicExamRuleController.java

@@ -51,7 +51,7 @@ public class BasicExamRuleController {
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public Result save(@RequestBody BasicExamRule examRule) {
-        return ResultUtil.ok(new EditResult(basicExamRuleService.saveExamRule(examRule)));
+        return ResultUtil.ok(basicExamRuleService.saveExamRule(examRule));
     }
 
 }

distributed-print/src/main/java/com/qmth/distributed/print/api/ExamTaskController.java

@@ -93,6 +93,7 @@ public class ExamTaskController {
 
     /**
      * 命题任务管理-查询
+     *
      * @param enable
      * @param status
      * @param cardRuleId
@@ -100,8 +101,8 @@ public class ExamTaskController {
      * @param paperNumber
      * @param startTime
      * @param endTime
-     * @param userName 命题教师姓名
-     * @param createName 创建人姓名
+     * @param userName    命题教师姓名
+     * @param createName  创建人姓名
      * @param pageNumber
      * @param pageSize
      * @return
@@ -119,7 +120,7 @@ public class ExamTaskController {
                        @RequestParam(required = false) String createName,
                        @RequestParam Integer pageNumber,
                        @RequestParam Integer pageSize) {
-        IPage<ExamTaskDto> examTasks = examTaskService.list(enable, status, SystemConstant.convertIdToLong(cardRuleId), courseCode, paperNumber, startTime, endTime,userName,createName, pageNumber, pageSize);
+        IPage<ExamTaskDto> examTasks = examTaskService.list(enable, status, SystemConstant.convertIdToLong(cardRuleId), courseCode, paperNumber, startTime, endTime, userName, createName, pageNumber, pageSize);
         return ResultUtil.ok(examTasks);
     }
 
@@ -134,7 +135,7 @@ public class ExamTaskController {
     public Result paperNumberQuery(@RequestParam(value = "param", required = false) String param,
                                    @RequestParam(value = "printPlanId", required = false) List<String> printPlanId) {
 
-        if (Objects.isNull(printPlanId)){
+        if (Objects.isNull(printPlanId)) {
             printPlanId = new ArrayList<>();
         }
         List<Long> printPlanIdList = printPlanId.stream().map(SystemConstant::convertIdToLong).collect(Collectors.toList());
@@ -177,8 +178,7 @@ public class ExamTaskController {
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
     public Result enable(@RequestBody ExamTask examTask) {
-        boolean isSuccess = examTaskService.enable(examTask);
-        return ResultUtil.ok(isSuccess);
+        return ResultUtil.ok(examTaskService.enable(examTask));
     }
 
     /**
@@ -265,6 +265,7 @@ public class ExamTaskController {
 
     /**
      * 入库申请查询
+     *
      * @param auditStatus
      * @param reviewStatus
      * @param cardRuleId
@@ -272,7 +273,7 @@ public class ExamTaskController {
      * @param paperNumber
      * @param startTime
      * @param endTime
-     * @param userName 命题老师名称
+     * @param userName     命题老师名称
      * @param pageNumber
      * @param pageSize
      * @return
@@ -286,10 +287,10 @@ public class ExamTaskController {
                                 @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                 @RequestParam(value = "startTime", required = false) Long startTime,
                                 @RequestParam(value = "endTime", required = false) Long endTime,
-                                @RequestParam(value = "userName",required = false) String userName,
+                                @RequestParam(value = "userName", required = false) String userName,
                                 @RequestParam("pageNumber") Integer pageNumber,
                                 @RequestParam("pageSize") Integer pageSize) {
-        IPage<ExamTaskDto> list = examTaskService.listTaskApply(auditStatus, reviewStatus, cardRuleId, courseCode, paperNumber, startTime, endTime,userName, pageNumber, pageSize);
+        IPage<ExamTaskDto> list = examTaskService.listTaskApply(auditStatus, reviewStatus, cardRuleId, courseCode, paperNumber, startTime, endTime, userName, pageNumber, pageSize);
         return ResultUtil.ok(list);
     }
 
@@ -306,9 +307,9 @@ public class ExamTaskController {
                               @RequestParam(value = "examTaskId", required = true) Long examTaskId,
                               @RequestParam(value = "source", required = false) String source) {
         ExamTaskDetailCardDto detail = examTaskService.applyGetOne(examTaskId, source);
-        if(Objects.nonNull(detail) && Objects.nonNull(detail.getFlowId())){
+        if (Objects.nonNull(detail) && Objects.nonNull(detail.getFlowId())) {
             Task task = taskService.createTaskQuery().processInstanceId(detail.getFlowId()).singleResult();
-            if(Objects.nonNull(task)){
+            if (Objects.nonNull(task)) {
                 detail.setFlowTaskId(task.getId());
             }
         }
@@ -361,8 +362,8 @@ public class ExamTaskController {
      * @param startTime
      * @param endTime
      * @param startCreateTime 申请时间-起始
-     * @param endCreateTime 申请时间-终止
-     * @param createName 创建人
+     * @param endCreateTime   申请时间-终止
+     * @param createName      创建人
      * @param pageNumber
      * @param pageSize
      * @return
@@ -375,12 +376,12 @@ public class ExamTaskController {
                                           @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
                                           @RequestParam(value = "startTime", required = false) Long startTime,
                                           @RequestParam(value = "endTime", required = false) Long endTime,
-                                          @RequestParam(value = "startCreateTime",required = false) Long startCreateTime,
-                                          @RequestParam(value = "endCreateTime",required = false) Long endCreateTime,
-                                          @RequestParam(value = "createName",required = false) String createName,
+                                          @RequestParam(value = "startCreateTime", required = false) Long startCreateTime,
+                                          @RequestParam(value = "endCreateTime", required = false) Long endCreateTime,
+                                          @RequestParam(value = "createName", required = false) String createName,
                                           @RequestParam("pageNumber") Integer pageNumber,
                                           @RequestParam("pageSize") Integer pageSize) {
-        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewUnaudited(courseCode, paperNumber, userId, cardRuleId, startTime, endTime,startCreateTime,endCreateTime,createName, pageNumber, pageSize);
+        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewUnaudited(courseCode, paperNumber, userId, cardRuleId, startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize);
         return ResultUtil.ok(examTaskDtoIPage);
     }
 
@@ -394,8 +395,8 @@ public class ExamTaskController {
      * @param startTime
      * @param endTime
      * @param startCreateTime 申请时间-起始
-     * @param endCreateTime 申请时间-终止
-     * @param createName 创建人
+     * @param endCreateTime   申请时间-终止
+     * @param createName      创建人
      * @param pageNumber
      * @param pageSize
      * @return
@@ -409,12 +410,12 @@ public class ExamTaskController {
                                         @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
                                         @RequestParam(value = "startTime", required = false) Long startTime,
                                         @RequestParam(value = "endTime", required = false) Long endTime,
-                                        @RequestParam(value = "startCreateTime",required = false) Long startCreateTime,
-                                        @RequestParam(value = "endCreateTime",required = false) Long endCreateTime,
-                                        @RequestParam(value = "createName",required = false) String createName,
+                                        @RequestParam(value = "startCreateTime", required = false) Long startCreateTime,
+                                        @RequestParam(value = "endCreateTime", required = false) Long endCreateTime,
+                                        @RequestParam(value = "createName", required = false) String createName,
                                         @RequestParam("pageNumber") Integer pageNumber,
                                         @RequestParam("pageSize") Integer pageSize) {
-        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewAudited(reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime,startCreateTime,endCreateTime,createName,pageNumber, pageSize);
+        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewAudited(reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize);
         return ResultUtil.ok(examTaskDtoIPage);
     }
 
@@ -501,7 +502,7 @@ public class ExamTaskController {
                                 @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
                                 @RequestParam("pageNumber") Integer pageNumber,
                                 @RequestParam("pageSize") Integer pageSize) {
-        IPage<ExamTaskDetailDto> examTaskDtoIPage = examTaskService.listTaskPaper(courseCode, paperNumber, startTime, endTime,makeMethod,cardRuleId, pageNumber, pageSize);
+        IPage<ExamTaskDetailDto> examTaskDtoIPage = examTaskService.listTaskPaper(courseCode, paperNumber, startTime, endTime, makeMethod, cardRuleId, pageNumber, pageSize);
         return ResultUtil.ok(examTaskDtoIPage);
     }
 
@@ -735,7 +736,7 @@ public class ExamTaskController {
     @RequestMapping(value = "/find_card_title", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
 //    @Aac(auth = BOOL.FALSE)
-    public Result findCardTitle(@ApiParam(value = "题卡规则id",required = true) @RequestParam String cardRuleId) {
+    public Result findCardTitle(@ApiParam(value = "题卡规则id", required = true) @RequestParam String cardRuleId) {
         return ResultUtil.ok((Object) examTaskService.findCardTitle(SystemConstant.convertIdToLong(cardRuleId)));
     }