更改数据类型

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

@@ -275,7 +275,7 @@ public class ExamTaskController {
     @RequestMapping(value = "/apply_list", method = RequestMethod.POST)
     public Result taskApplyList(@RequestParam(value = "auditStatus", required = false) String auditStatus,
                                 @RequestParam(value = "reviewStatus", required = false) String reviewStatus,
-                                @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
+                                @RequestParam(value = "cardRuleId", required = false) String cardRuleId,
                                 @RequestParam(value = "courseCode", required = false) String courseCode,
                                 @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                 @RequestParam(value = "startTime", required = false) Long startTime,
@@ -283,7 +283,7 @@ public class ExamTaskController {
                                 @RequestParam(value = "userName", required = false) String userName,
                                 @RequestParam("pageNumber") Integer pageNumber,
                                 @RequestParam("pageSize") Integer pageSize) {
-        return ResultUtil.ok(examTaskService.listTaskApply(auditStatus, reviewStatus, cardRuleId, courseCode, paperNumber, startTime, endTime, userName, pageNumber, pageSize));
+        return ResultUtil.ok(examTaskService.listTaskApply(auditStatus, reviewStatus, SystemConstant.convertIdToLong(cardRuleId), courseCode, paperNumber, startTime, endTime, userName, pageNumber, pageSize));
     }
 
     /**
@@ -364,7 +364,7 @@ public class ExamTaskController {
     public Result taskReviewListUnaudited(@RequestParam(value = "courseCode", required = false) String courseCode,
                                           @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                           @RequestParam(value = "userId", required = false) Long userId,
-                                          @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
+                                          @RequestParam(value = "cardRuleId", required = false) String cardRuleId,
                                           @RequestParam(value = "startTime", required = false) Long startTime,
                                           @RequestParam(value = "endTime", required = false) Long endTime,
                                           @RequestParam(value = "startCreateTime", required = false) Long startCreateTime,
@@ -372,7 +372,7 @@ public class ExamTaskController {
                                           @RequestParam(value = "createName", required = false) String createName,
                                           @RequestParam("pageNumber") Integer pageNumber,
                                           @RequestParam("pageSize") Integer pageSize) {
-        return ResultUtil.ok(examTaskService.listTaskReviewUnaudited(courseCode, paperNumber, userId, cardRuleId, startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
+        return ResultUtil.ok(examTaskService.listTaskReviewUnaudited(courseCode, paperNumber, userId, SystemConstant.convertIdToLong(cardRuleId), startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
     }
 
     /**
@@ -398,7 +398,7 @@ public class ExamTaskController {
                                         @RequestParam(value = "courseCode", required = false) String courseCode,
                                         @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                         @RequestParam(value = "userId", required = false) Long userId,
-                                        @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
+                                        @RequestParam(value = "cardRuleId", required = false) String cardRuleId,
                                         @RequestParam(value = "startTime", required = false) Long startTime,
                                         @RequestParam(value = "endTime", required = false) Long endTime,
                                         @RequestParam(value = "startCreateTime", required = false) Long startCreateTime,
@@ -406,7 +406,7 @@ public class ExamTaskController {
                                         @RequestParam(value = "createName", required = false) String createName,
                                         @RequestParam("pageNumber") Integer pageNumber,
                                         @RequestParam("pageSize") Integer pageSize) {
-        return ResultUtil.ok(examTaskService.listTaskReviewAudited(reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
+        return ResultUtil.ok(examTaskService.listTaskReviewAudited(reviewStatus, courseCode, paperNumber, userId, SystemConstant.convertIdToLong(cardRuleId), startTime, endTime, startCreateTime, endCreateTime, createName, pageNumber, pageSize));
     }
 
     /**
@@ -490,10 +490,10 @@ public class ExamTaskController {
                                 @RequestParam(value = "startTime", required = false) Long startTime,
                                 @RequestParam(value = "endTime", required = false) Long endTime,
                                 @RequestParam(value = "makeMethod", required = false) MakeMethodEnum makeMethod,
-                                @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
+                                @RequestParam(value = "cardRuleId", required = false) String cardRuleId,
                                 @RequestParam("pageNumber") Integer pageNumber,
                                 @RequestParam("pageSize") Integer pageSize) {
-        return ResultUtil.ok(examTaskService.listTaskPaper(courseCode, paperNumber, startTime, endTime, makeMethod, cardRuleId, pageNumber, pageSize));
+        return ResultUtil.ok(examTaskService.listTaskPaper(courseCode, paperNumber, startTime, endTime, makeMethod, SystemConstant.convertIdToLong(cardRuleId), pageNumber, pageSize));
     }