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

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

@@ -127,6 +127,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
             TBTask tbTask = (TBTask) map.get(SystemConstant.TASK);
             SysUser sysUser = (SysUser) map.get(SystemConstant.USER);
             Long examDetailId = Objects.nonNull(map.get("examDetailId")) ? (Long) map.get("examDetailId") : null;
+            List<Long> examDetailIds = Objects.nonNull(map.get("examDetailIds")) ? (List<Long>) map.get("examDetailIds") : null;
             Long schoolId = (Long) map.get("schoolId");
             List<Long> examDetailCourseIds = Objects.nonNull(map.get("examDetailCourseIds")) ? (List<Long>) map.get("examDetailCourseIds") : null;
             String paperTypeParam = Objects.nonNull(map.get("paperType")) ? (String) map.get("paperType") : null;
@@ -154,6 +155,8 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     .eq(ExamDetail::getPrintPlanId, tbTask.getPrintPlanId());
             if (Objects.nonNull(examDetailId)) {
                 examDetailQueryWrapper.lambda().eq(ExamDetail::getId, examDetailId);
+            } else if (Objects.nonNull(examDetailIds)) {
+                examDetailQueryWrapper.lambda().in(ExamDetail::getId, examDetailIds);
             }
             List<ExamDetail> examDetailList = detailService.list(examDetailQueryWrapper);
             if (Objects.isNull(examDetailList) || examDetailList.size() == 0) {