自定义流程接口-学期BUG修复

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

@@ -12,10 +12,7 @@ import com.qmth.distributed.print.business.entity.ExamPrintPlan;
 import com.qmth.distributed.print.business.entity.TBSyncTask;
 import com.qmth.distributed.print.business.enums.DictionaryEnum;
 import com.qmth.distributed.print.business.enums.LoginTypeEnum;
-import com.qmth.distributed.print.business.service.BasicVerifyCodeService;
-import com.qmth.distributed.print.business.service.ExamPrintPlanService;
-import com.qmth.distributed.print.business.service.PrintCommonService;
-import com.qmth.distributed.print.business.service.TBSyncTaskService;
+import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.PdfUtil;
 import com.qmth.teachcloud.common.bean.auth.AuthBean;
 import com.qmth.teachcloud.common.bean.result.LoginResult;
@@ -26,7 +23,10 @@ import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.*;
 import com.qmth.teachcloud.common.enums.userPush.SpecialPrivilegeEnum;
 import com.qmth.teachcloud.common.service.*;
-import com.qmth.teachcloud.common.util.*;
+import com.qmth.teachcloud.common.util.FileUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -111,7 +111,7 @@ public class SysController {
     BasicCampusService basicCampusService;
 
     @Resource
-    FileStoreUtil fileStoreUtil;
+    BasicExamService basicExamService;
 
     /**
      * 登录
@@ -581,32 +581,37 @@ public class SysController {
                 break;
             case COLLEGE:
                 if (Objects.nonNull(semesterId)) {
-                    QueryWrapper<ExamPrintPlan> examPrintPlanQueryWrapper = new QueryWrapper<>();
-                    examPrintPlanQueryWrapper.select(" DISTINCT org_id as orgId ")
-                            .eq("semester_id", SystemConstant.convertIdToLong(semesterId));
-                    List<ExamPrintPlan> examPrintPlanList = examPrintPlanService.list(examPrintPlanQueryWrapper);
-                    if (Objects.nonNull(examPrintPlanList) && examPrintPlanList.size() > 0) {
-                        Set<Long> orgIdSet = examPrintPlanList.stream().map(s -> s.getOrgId()).collect(Collectors.toSet());
-                        QueryWrapper<SysOrg> sysOrgQueryWrapper = new QueryWrapper<>();
-                        sysOrgQueryWrapper.lambda().in(SysOrg::getId, orgIdSet);
-                        List<SysOrg> sysOrgList = sysOrgService.list(sysOrgQueryWrapper);
-                        List<SysOrg> newSysOrgList = new ArrayList<>();
-                        newSysOrgList.addAll(sysOrgList);
-                        for (SysOrg s : sysOrgList) {
-                            if (s.getType() == OrgTypeEnum.SCHOOL) {
-                                newSysOrgList.addAll(sysOrgService.findByConnectByRootOrgId(s.getId()));
-                            } else if (s.getType() == OrgTypeEnum.TEACHING_ROOM || s.getType() == OrgTypeEnum.FACULTY || s.getType() == OrgTypeEnum.PRINTING_HOUSE) {
-                                newSysOrgList.addAll(sysOrgService.findByConnectByParentId(s.getId(), true, false));
+                    QueryWrapper<BasicExam> basicExamQueryWrapper = new QueryWrapper<>();
+                    basicExamQueryWrapper.lambda().eq(BasicExam::getSemesterId, SystemConstant.convertIdToLong(semesterId));
+                    List<BasicExam> basicExamList = basicExamService.list(basicExamQueryWrapper);
+                    if (Objects.nonNull(basicExamList) && basicExamList.size() > 0) {
+                        List<Long> examIdList = basicExamList.stream().map(s -> s.getId()).collect(Collectors.toList());
+                        QueryWrapper<ExamPrintPlan> examPrintPlanQueryWrapper = new QueryWrapper<>();
+                        examPrintPlanQueryWrapper.lambda().in(ExamPrintPlan::getExamId, examIdList);
+                        List<ExamPrintPlan> examPrintPlanList = examPrintPlanService.list(examPrintPlanQueryWrapper);
+                        if (Objects.nonNull(examPrintPlanList) && examPrintPlanList.size() > 0) {
+                            Set<Long> orgIdSet = examPrintPlanList.stream().map(s -> s.getOrgId()).collect(Collectors.toSet());
+                            QueryWrapper<SysOrg> sysOrgQueryWrapper = new QueryWrapper<>();
+                            sysOrgQueryWrapper.lambda().in(SysOrg::getId, orgIdSet);
+                            List<SysOrg> sysOrgList = sysOrgService.list(sysOrgQueryWrapper);
+                            List<SysOrg> newSysOrgList = new ArrayList<>();
+                            newSysOrgList.addAll(sysOrgList);
+                            for (SysOrg s : sysOrgList) {
+                                if (s.getType() == OrgTypeEnum.SCHOOL) {
+                                    newSysOrgList.addAll(sysOrgService.findByConnectByRootOrgId(s.getId()));
+                                } else if (s.getType() == OrgTypeEnum.TEACHING_ROOM || s.getType() == OrgTypeEnum.FACULTY || s.getType() == OrgTypeEnum.PRINTING_HOUSE) {
+                                    newSysOrgList.addAll(sysOrgService.findByConnectByParentId(s.getId(), true, false));
+                                }
                             }
+                            newSysOrgList = newSysOrgList.stream().filter(s -> s.getType() == OrgTypeEnum.COLLEGE).collect(Collectors.toList());
+                            dictionaryResultList = newSysOrgList.stream().map(e -> {
+                                DictionaryResult dictionaryResult = new DictionaryResult();
+                                dictionaryResult.setId(e.getId());
+                                dictionaryResult.setCode(e.getCode());
+                                dictionaryResult.setName(e.getName());
+                                return dictionaryResult;
+                            }).collect(Collectors.toList());
                         }
-                        newSysOrgList = newSysOrgList.stream().filter(s -> s.getType() == OrgTypeEnum.COLLEGE).collect(Collectors.toList());
-                        dictionaryResultList = newSysOrgList.stream().map(e -> {
-                            DictionaryResult dictionaryResult = new DictionaryResult();
-                            dictionaryResult.setId(e.getId());
-                            dictionaryResult.setCode(e.getCode());
-                            dictionaryResult.setName(e.getName());
-                            return dictionaryResult;
-                        }).collect(Collectors.toList());
                     }
                 } else {
                     List<SysOrg> sysOrgList = sysOrgService.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSchoolId, schoolId).eq(SysOrg::getEnable, true));