机构整合

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

@@ -10,7 +10,7 @@ import java.util.Objects;
 public enum DictionaryEnum {
     CAMPUS("校区"),
     SEMESTER("学期"),
-//    COLLEGE("学院"),
+    COLLEGE("学院"),
     MAJOR("专业"),
     CLAZZ("班级"),
     ALL_CLAZZ("教学班和基础班"),

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

@@ -2,28 +2,21 @@ package com.qmth.distributed.print.business.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskDetailDto;
+import com.qmth.distributed.print.business.bean.dto.ExamTaskPaperDto;
+import com.qmth.distributed.print.business.bean.dto.ExamTaskPaperExportDto;
+import com.qmth.distributed.print.business.bean.dto.ExamTaskPaperFileDto;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.MakeMethodEnum;
 import com.qmth.distributed.print.business.mapper.ExamCardMapper;
 import com.qmth.distributed.print.business.mapper.ExamTaskDetailMapper;
-import com.qmth.distributed.print.business.bean.dto.ExamTaskPaperDto;
-import com.qmth.distributed.print.business.bean.dto.ExamTaskPaperExportDto;
-import com.qmth.distributed.print.business.bean.dto.ExamTaskPaperFileDto;
-import com.qmth.distributed.print.business.entity.ExamPrintPlan;
 import com.qmth.distributed.print.business.mapper.ExamTaskMapper;
 import com.qmth.distributed.print.business.service.BasicCardRuleService;
 import com.qmth.distributed.print.business.service.DownloadService;
-import com.qmth.distributed.print.business.service.ExamPrintPlanService;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicAttachment;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.service.BasicAttachmentService;
 import com.qmth.distributed.print.business.service.ExamCardDetailService;
+import com.qmth.distributed.print.business.service.ExamPrintPlanService;
 import com.qmth.distributed.print.business.util.CreatePdfUtil;
 import com.qmth.distributed.print.business.util.HtmlToPdfUtil;
 import com.qmth.teachcloud.common.contant.SystemConstant;
@@ -33,6 +26,7 @@ import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.PageSizeEnum;
 import com.qmth.teachcloud.common.mapper.BasicAttachmentMapper;
 import com.qmth.teachcloud.common.service.AttachmentCommonService;
+import com.qmth.teachcloud.common.service.BasicAttachmentService;
 import com.qmth.teachcloud.common.service.SysOrgService;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import org.apache.commons.lang3.StringUtils;
@@ -40,13 +34,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.FileCopyUtils;
 
 import javax.annotation.Resource;
-import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 @Service
 public class DownloadServiceImpl implements DownloadService {
@@ -92,6 +82,8 @@ public class DownloadServiceImpl implements DownloadService {
         Page<ExamTaskDetailDto> page = new Page<>(pageNumber, pageSize);
         Set<Long> orgIds = null;
         if (orgId != null) {
+            orgIds = new HashSet<>(Arrays.asList(orgId));
+        } else {
             orgIds = teachcloudCommonService.listSubOrgIds(orgId);
         }
         return examTaskMapper.listExamTaskDetailDownload(page, semesterId, examId, courseName, orgIds);
@@ -195,7 +187,7 @@ public class DownloadServiceImpl implements DownloadService {
         // 创建导出接收集合
         List<ExamTaskPaperExportDto> examTaskPaperExportDtoList = new ArrayList<>();
 
-        if (examTaskDetailDtoList.size() > 0){
+        if (examTaskDetailDtoList.size() > 0) {
             for (ExamTaskDetailDto examTaskDetailDto : examTaskDetailDtoList) {
                 Long examTaskId = SystemConstant.convertIdToLong(examTaskDetailDto.getId());
                 String semesterName = examTaskDetailDto.getSemesterName();
@@ -204,7 +196,7 @@ public class DownloadServiceImpl implements DownloadService {
                 String courseCode = examTaskDetailDto.getCourseCode();
                 String courseName = examTaskDetailDto.getCourseName();
                 String paperNumber = examTaskDetailDto.getPaperNumber();
-                Long examCardId= examTaskDetailDto.getExamCardId();
+                Long examCardId = examTaskDetailDto.getExamCardId();
                 Long cardRuleId = SystemConstant.convertIdToLong(examTaskDetailDto.getCardRuleId());
 
                 // 生成导出对象
@@ -218,7 +210,7 @@ public class DownloadServiceImpl implements DownloadService {
 
 
                 // 所属印刷计划信息
-                List<ExamPrintPlan> examPrintPlanList = examPrintPlanService.findByPaperNumber(schoolId,paperNumber);
+                List<ExamPrintPlan> examPrintPlanList = examPrintPlanService.findByPaperNumber(schoolId, paperNumber);
 
 
                 // 处理试卷
@@ -229,7 +221,7 @@ public class DownloadServiceImpl implements DownloadService {
                 if (Objects.isNull(paperInfo)) {
                     throw ExceptionResultEnum.ERROR.exception("试卷信息不存在");
                 }
-                 // 试卷信息
+                // 试卷信息
                 for (Map paper : paperInfo) {
                     Long attachmentId = SystemConstant.convertIdToLong(String.valueOf(paper.get("attachmentId")));
                     BasicAttachment basicAttachment = basicAttachmentService.getById(attachmentId);
@@ -240,16 +232,15 @@ public class DownloadServiceImpl implements DownloadService {
                     String paperPath = (String) jsonObject.get(SystemConstant.PATH);
 
                     boolean exposureStatus;
-                    if (exposedPaperTypeList.contains(paperType)){
+                    if (exposedPaperTypeList.contains(paperType)) {
                         exposureStatus = true;
-                    }else if (unexposedPaperTypeList.contains(paperType)){
+                    } else if (unexposedPaperTypeList.contains(paperType)) {
                         exposureStatus = false;
-                    }else {
+                    } else {
                         throw ExceptionResultEnum.ERROR.exception("命题任务曝光卷型异常【" + examTaskId + "(" + paperType + ")】");
                     }
 
 
-
                     ExamTaskPaperFileDto cell = new ExamTaskPaperFileDto();
                     // 基本信息
                     cell.setExamTaskId(examTaskId);

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

@@ -12,8 +12,9 @@ import com.qmth.distributed.print.business.entity.TBSyncTask;
 import com.qmth.distributed.print.business.entity.TeachClazz;
 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.service.PrintCommonService;
 import com.qmth.distributed.print.business.service.TBSyncTaskService;
+import com.qmth.distributed.print.business.service.TeachClazzService;
 import com.qmth.distributed.print.business.util.PdfUtil;
 import com.qmth.teachcloud.common.bean.auth.AuthBean;
 import com.qmth.teachcloud.common.bean.result.LoginResult;
@@ -105,18 +106,12 @@ public class SysController {
     @Resource
     BasicSemesterService basicSemesterService;
 
-    @Resource
-    ExamPrintPlanService examPrintPlanService;
-
     @Resource
     TBSyncTaskService tbSyncTaskService;
 
     @Resource
     BasicCampusService basicCampusService;
 
-    @Resource
-    BasicExamService basicExamService;
-
     @Resource
     AuthInfoService authInfoService;
 
@@ -567,7 +562,6 @@ public class SysController {
 
     @ApiOperation(value = "获取系统编码")
     @RequestMapping(value = "/get_code", method = RequestMethod.POST)
-//    @Aac(auth = BOOL.FALSE)
     public Result getCode(@ApiParam(value = "编码类型", required = true) @RequestParam SystemCodeEnum type) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         String number = teachcloudCommonService.getSysIncrCode(type, sysUser);
@@ -607,6 +601,16 @@ public class SysController {
                     return dictionaryResult;
                 }).collect(Collectors.toList());
                 break;
+            case COLLEGE:
+                List<SysOrg> sysOrgList = sysOrgService.findDeepByOrgIdAndType(null);
+                dictionaryResultList = sysOrgList.stream().map(e -> {
+                    DictionaryResult dictionaryResult = new DictionaryResult();
+                    dictionaryResult.setId(e.getId());
+                    dictionaryResult.setCode(e.getCode());
+                    dictionaryResult.setName(e.getName());
+                    return dictionaryResult;
+                }).collect(Collectors.toList());
+                break;
 //            case COLLEGE:
 //                if (Objects.nonNull(semesterId)) {
 //                    QueryWrapper<BasicExam> basicExamQueryWrapper = new QueryWrapper<>();

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

@@ -207,8 +207,7 @@ public class TFCustomFlowController {
         TFCustomFlow tfCustomFlow = tfCustomFlowService.getById(SystemConstant.convertIdToLong(id));
         Optional.ofNullable(tfCustomFlow).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("自定义流程数据为空"));
         Optional.ofNullable(tfCustomFlow.getObjectData()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("自定义流程绘图数据为空"));
-        Gson gson = new Gson();
-        List<CustomFlowCommonDto> customFlowLists = gson.fromJson(tfCustomFlow.getObjectData(), new TypeToken<List<CustomFlowCommonDto>>() {
+        List<CustomFlowCommonDto> customFlowLists = new Gson().fromJson(tfCustomFlow.getObjectData(), new TypeToken<List<CustomFlowCommonDto>>() {
         }.getType());
         return ResultUtil.ok(new CustomFlowEditDto(tfCustomFlow, customFlowLists), null);
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TAExamTotalServiceImpl.java

@@ -67,8 +67,7 @@ public class TAExamTotalServiceImpl extends ServiceImpl<TAExamTotalMapper, TAExa
     @Override
     public void exportCourseSummary(Long semesterId, Long examId, String column, OrderEnum order) throws Exception {
         IPage<TAExamCourse> taExamCourseIPage = this.getCourseSummary(semesterId, examId, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE, column, order);
-        Gson gson = new Gson();
-        List<TAExamCourseDto> examStudentCourseDtoList = gson.fromJson(JacksonUtil.parseJson(taExamCourseIPage.getRecords()), new TypeToken<List<TAExamCourseDto>>() {
+        List<TAExamCourseDto> examStudentCourseDtoList = new Gson().fromJson(JacksonUtil.parseJson(taExamCourseIPage.getRecords()), new TypeToken<List<TAExamCourseDto>>() {
         }.getType());
         ExcelUtil.excelExport("课程分析", TAExamCourseDto.class, examStudentCourseDtoList, ServletUtil.getResponse());
     }