fix:

1.公共方法 - 查询字典

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TCStatistics.java

@@ -2,14 +2,12 @@ package com.qmth.distributed.print.business.entity;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.business.bean.dto.ClazzContentDto;
 import com.qmth.distributed.print.business.enums.StatisticsStatusEnum;
 import com.qmth.teachcloud.common.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * <p>

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

@@ -13,6 +13,7 @@ public enum DictionaryEnum {
     COLLEGE("学院"),
     MAJOR("专业"),
     CLAZZ("班级"),
+    ALL_CLAZZ("教学班和基础班"),
     STUDENT("学生");
     private final String desc;
 

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

@@ -10,10 +10,8 @@ import com.qmth.distributed.print.business.enums.StatisticsStatusEnum;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.util.Result;
 
-import java.sql.ResultSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * <p>

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

@@ -15,7 +15,6 @@ import com.qmth.distributed.print.business.bean.result.TCStatisticResult;
 import com.qmth.distributed.print.business.entity.ExamStudent;
 import com.qmth.distributed.print.business.entity.TCStatistics;
 import com.qmth.distributed.print.business.entity.TCStatisticsTemp;
-import com.qmth.distributed.print.business.entity.TeachStudent;
 import com.qmth.distributed.print.business.enums.BackupMethodEnum;
 import com.qmth.distributed.print.business.enums.ClazzContentEnum;
 import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
@@ -24,7 +23,6 @@ import com.qmth.distributed.print.business.mapper.TCStatisticsMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicStudent;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;

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

@@ -16,6 +16,7 @@ import com.qmth.distributed.print.business.enums.DictionaryEnum;
 import com.qmth.distributed.print.business.enums.LoginTypeEnum;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.PdfUtil;
+import com.qmth.teachcloud.common.base.BaseEntity;
 import com.qmth.teachcloud.common.bean.auth.AuthBean;
 import com.qmth.teachcloud.common.bean.result.LoginResult;
 import com.qmth.teachcloud.common.bean.result.UserLoginCheckResult;
@@ -593,17 +594,16 @@ public class SysController {
                     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());
+                        List<Long> examIdList = basicExamList.stream().map(BaseEntity::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());
+                            Set<Long> orgIdSet = examPrintPlanList.stream().map(ExamPrintPlan::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);
+                            List<SysOrg> newSysOrgList = new ArrayList<>(sysOrgList);
                             for (SysOrg s : sysOrgList) {
                                 if (s.getType() == OrgTypeEnum.SCHOOL) {
                                     newSysOrgList.addAll(sysOrgService.findByConnectByRootOrgId(s.getId()));
@@ -676,6 +676,27 @@ public class SysController {
                 }).collect(Collectors.toList());
 
                 dictionaryResultList.addAll(resultBasicClazzList);
+                break;
+            case ALL_CLAZZ: //针对归档管理临时处理用
+                QueryWrapper<BasicClazz> basicClazzQueryWrapper = new QueryWrapper<>();
+                basicClazzQueryWrapper.lambda().eq(BasicClazz::getSchoolId, schoolId).eq(BasicClazz::getEnable, true);
+                if (SystemConstant.longNotNull(SystemConstant.convertIdToLong(campusId))) {
+                    basicClazzQueryWrapper.lambda().eq(BasicClazz::getCampusId, campusId);
+                }
+                if (SystemConstant.longNotNull(SystemConstant.convertIdToLong(majorId))) {
+                    basicClazzQueryWrapper.lambda().eq(BasicClazz::getMajorId, majorId);
+                }
+                // 基础班
+                List<BasicClazz> bClazzList = basicClazzService.list(basicClazzQueryWrapper);
+                List<DictionaryResult> rbClazzList = bClazzList.stream().map(e -> {
+                    DictionaryResult dictionaryResult = new DictionaryResult();
+                    dictionaryResult.setId(e.getId());
+                    dictionaryResult.setCode(e.getClazzCode());
+                    dictionaryResult.setName(e.getClazzName());
+                    return dictionaryResult;
+                }).collect(Collectors.toList());
+
+                dictionaryResultList.addAll(rbClazzList);
 
                 // 教学班
                 QueryWrapper<TeachClazz> teachClazzQueryWrapper = new QueryWrapper<>();