Merge remote-tracking branch 'origin/dev_v3.2.0' into dev_v3.2.0

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamStudentCourseClassDto.java

@@ -27,10 +27,12 @@ public class ExamStudentCourseClassDto extends ExamStudent {
     @ApiModelProperty("任课老师工号")
     private String teacherNumber;
 
+    @Override
     public String getPaperNumber() {
         return paperNumber;
     }
 
+    @Override
     public void setPaperNumber(String paperNumber) {
         this.paperNumber = paperNumber;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamStudentCourseDto.java

@@ -34,10 +34,12 @@ public class ExamStudentCourseDto extends ExamStudent {
     @ApiModelProperty("任课老师工号")
     private String teacherNumber;
 
+    @Override
     public String getPaperNumber() {
         return paperNumber;
     }
 
+    @Override
     public void setPaperNumber(String paperNumber) {
         this.paperNumber = paperNumber;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamStudentPdfInfoDto.java

@@ -30,10 +30,12 @@ public class ExamStudentPdfInfoDto extends ExamStudent {
         this.courseName = courseName;
     }
 
+    @Override
     public String getPaperNumber() {
         return paperNumber;
     }
 
+    @Override
     public void setPaperNumber(String paperNumber) {
         this.paperNumber = paperNumber;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/SyncExamStudentDto.java

@@ -1,7 +1,6 @@
 package com.qmth.distributed.print.business.bean.dto;
 
 import com.qmth.distributed.print.business.entity.ExamStudent;
-import io.swagger.annotations.ApiModelProperty;
 
 /**
  * @Description: 考生同步 DTO
@@ -34,10 +33,12 @@ public class SyncExamStudentDto extends ExamStudent {
         this.courseName = courseName;
     }
 
+    @Override
     public String getPaperNumber() {
         return paperNumber;
     }
 
+    @Override
     public void setPaperNumber(String paperNumber) {
         this.paperNumber = paperNumber;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamDetailCourseMapper.java

@@ -19,6 +19,7 @@ import java.util.Set;
  */
 public interface ExamDetailCourseMapper extends BaseMapper<ExamDetailCourse> {
 
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     List<Map<String, Object>> listByExamDetailId(@Param("examDetailId") Long examDetailId, @Param("status") String status);
 
     List<ExamDetailCourse> listByExamDetailIdAndStatus(@Param("examDetailId") Long examDetailId, @Param("status") String status);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamDetailMapper.java

@@ -87,6 +87,7 @@ public interface ExamDetailMapper extends BaseMapper<ExamDetail> {
 
     IPage<ClientExamStudentDto> listClientExamStudentPage(Page<ClientExamStudentDto> page, @Param("schoolId") Long schoolId, @Param("examDetailId") Long examDetailId, @Param("ticketNumber") String ticketNumber, @Param("studentName") String studentName, @Param("courseCode") String courseCode);
 
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     List<Map> listStudentByExamDetailCourseId(@Param("schoolId") Long schoolId, @Param("examDetailCourseId") Long examDetailCourseId, @Param("ticketNumber") String ticketNumber, @Param("type") String type);
 
     Integer selectPaperCount(@Param("schoolId") Long schoolId,

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamStudentMapper.java

@@ -7,7 +7,6 @@ import com.qmth.distributed.print.business.bean.dto.ExamStudentPdfInfoDto;
 import com.qmth.distributed.print.business.bean.dto.SyncExamStudentDto;
 import com.qmth.distributed.print.business.entity.ExamStudent;
 import com.qmth.teachcloud.common.entity.BasicCollege;
-import com.qmth.teachcloud.common.entity.SysOrg;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,6 +22,7 @@ import java.util.Map;
  */
 public interface ExamStudentMapper extends BaseMapper<ExamStudent> {
 
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     Map<String, Object> getStudentDetail(Long id);
 
     /**
@@ -50,6 +50,7 @@ public interface ExamStudentMapper extends BaseMapper<ExamStudent> {
 
     ExamStudentPdfInfoDto getByStudentId(Long id);
 
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     List<Map> listStudentScoreSync(@Param("schoolId") Long schoolId, @Param("studentCode") String studentCode, @Param("examNumber") String examNumber, @Param("subjectCode") String subjectCode, @Param("printPlanId") Long printPlanId);
 
     List<ExamStudentCourseClassDto> listExamStudentByPaperNumberAndPaperType(@Param("batchId") Long batchId, @Param("paperNumber") String paperNumber, @Param("paperType") String paperType);

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

@@ -1,6 +1,5 @@
 package com.qmth.distributed.print.business.service.impl;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -29,7 +28,6 @@ import com.qmth.distributed.print.business.util.CreatePdfUtil;
 import com.qmth.distributed.print.business.util.HtmlToPdfUtil;
 import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
 import com.qmth.teachcloud.common.bean.dto.MqDto;
-import com.qmth.teachcloud.common.bean.dto.excel.BasicStudentImportDto;
 import com.qmth.teachcloud.common.bean.dto.excel.DescribeImportDto;
 import com.qmth.teachcloud.common.bean.params.BasicStudentExtrasParam;
 import com.qmth.teachcloud.common.bean.result.BasicStudentResult;
@@ -1867,13 +1865,13 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public List<ExamTaskStudentObjectResult> findExamTaskStudentObject(ExamObjectType examObjectType, Long basicCourseId,SysUser requestUser) throws Exception {
+    public List<ExamTaskStudentObjectResult> findExamTaskStudentObject(ExamObjectType examObjectType, Long basicCourseId, SysUser requestUser) throws Exception {
         Long schoolId = requestUser.getSchoolId();
         Long userId = requestUser.getId();
         List<ExamTaskStudentObjectResult> result = new ArrayList<>();
         switch (examObjectType) {
             case TEACH_CLAZZ_STUDENT:
-                if (!SystemConstant.longNotNull(basicCourseId)){
+                if (!SystemConstant.longNotNull(basicCourseId)) {
                     throw ExceptionResultEnum.ERROR.exception("缺少考试课程id");
                 }
                 TeachCourse teachCourse = teachCourseService.getOne(new QueryWrapper<TeachCourse>().lambda().eq(TeachCourse::getSchoolId, schoolId).eq(TeachCourse::getBasicCourseId, basicCourseId));
@@ -1952,6 +1950,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     result.add(examTaskStudentObjectResult);
                 }
                 break;
+            default:
+                break;
         }
         return result;
     }
@@ -2035,7 +2035,6 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         basicStudentService.saveBasicStudentWithExtrasList(basicStudentExtrasParamList, requestUser);
 
 
-
         // 考生信息回溯
         List<ExamTaskExamStudentImportResult> result = new ArrayList<>();
 
@@ -2052,7 +2051,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     .map(ExamStudentImportDto::getExamPlace)
                     .distinct()
                     .collect(Collectors.toList());
-            if (examPlaceList.size() > 1){
+            if (examPlaceList.size() > 1) {
                 throw ExceptionResultEnum.ERROR.exception("异常：考场对应多个考点");
             }
             String examPlace = examPlaceList.get(0);
@@ -2115,7 +2114,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         for (Map paperAttachmentId : paperAttachmentIds) {
             // 校验试卷必须绑定题卡
             Long cardId = SystemConstant.convertIdToLong(String.valueOf(paperAttachmentId.get("cardId")));
-            if (!SystemConstant.longNotNull(cardId)){
+            if (!SystemConstant.longNotNull(cardId)) {
                 throw ExceptionResultEnum.ERROR.exception("没有绑定题卡");
             }
             // 校验题卡是否提交

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

@@ -1406,7 +1406,7 @@ public class PrintCommonServiceImpl implements PrintCommonService {
 
     /**
      * 上传pdf文件
-     * @param file
+     * @param pdfFile
      * @return
      */
     @Override

distributed-print-business/src/main/resources/mapper/BasicExamRuleMapper.xml

@@ -10,7 +10,6 @@
         <result column="extend_fields" property="extendFields" />
         <result column="review" property="review" />
         <result column="include_paper" property="includePaper" />
-        <result column="custom_card" property="customCard" />
         <result column="print_method" property="printMethod" />
         <result column="create_id" property="createId" />
         <result column="create_time" property="createTime" />

distributed-print-business/src/main/resources/mapper/ClientStatusMapper.xml

@@ -9,10 +9,7 @@
         <result column="course_code" property="courseCode"/>
         <result column="course_name" property="courseName"/>
         <result column="paper_number" property="paperNumber"/>
-        <result column="is_try" property="isTry"/>
         <result column="try_time" property="tryTime"/>
-        <result column="is_pass" property="isPass"/>
-        <result column="is_download" property="isDownload"/>
         <result column="create_id" property="createId"/>
         <result column="create_time" property="createTime"/>
         <result column="update_id" property="updateId"/>

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

@@ -574,7 +574,7 @@ public class SysController {
                                      @ApiParam(value = "专业id") @RequestParam(required = false) String majorId,
                                      @ApiParam(value = "班级id") @RequestParam(required = false) String clazzId,
                                      @ApiParam(value = "学生id") @RequestParam(required = false) String studentId,
-                                     @ApiParam(value = "查询字典对象",required = true) @RequestParam DictionaryEnum dictionaryEnum) {
+                                     @ApiParam(value = "查询字典对象", required = true) @RequestParam DictionaryEnum dictionaryEnum) {
         Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString());
         List<DictionaryResult> dictionaryResultList = new ArrayList<>();
         switch (dictionaryEnum) {
@@ -741,6 +741,8 @@ public class SysController {
                     return dictionaryResult;
                 }).collect(Collectors.toList());
                 break;
+            default:
+                break;
         }
         return ResultUtil.ok(dictionaryResultList);
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/AuthOrgInfoDto.java

@@ -5,6 +5,13 @@ import com.qmth.boot.core.solar.model.OrgInfo;
 
 import java.io.Serializable;
 
+/**
+ * @Description: 鉴权org dto
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2022/9/2
+ */
 public class AuthOrgInfoDto implements Serializable {
 
     OrgInfo orgInfo;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/BasicClazzMapper.java

@@ -29,5 +29,6 @@ public interface BasicClazzMapper extends BaseMapper<BasicClazz> {
      * @param clazzIds 班级idSet
      * @return 数据
      */
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     List<Map<Object,Object>> findExamTaskPrintByClazzIdSet(@Param("schoolId") Long schoolId,@Param("clazzIds") List<Long> clazzIds);
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/BasicCourseMapper.java

@@ -48,5 +48,6 @@ public interface BasicCourseMapper extends BaseMapper<BasicCourse> {
                                                  @Param("schoolId") Long schoolId,
                                                  @Param("orgIds") Set<Long> orgIds);
 
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     Set<Map<String, Object>> findExamTaskByCourseCode(@Param("schoolId") Long schoolId, @Param("courseCodeSet") Set<String> courseCodeSet);
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/mapper/CourseReportMapper.java

@@ -2,7 +2,6 @@ package com.qmth.teachcloud.report.business.mapper;
 
 import com.qmth.teachcloud.report.business.bean.result.inspectCourseExamTotal.CollegeCourseInfo;
 import com.qmth.teachcloud.report.business.bean.result.inspectCourseExamTotal.ExamBaseInfo;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,6 +18,7 @@ public interface CourseReportMapper {
 
     List<CollegeCourseInfo> findCollegeCourseInfo(@Param("examId") Long examId,@Param("collegeId") Long collegeId);
 
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     List<Map<String, Object>> list1();
 
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/mapper/TAExamCourseMapper.java

@@ -54,6 +54,7 @@ public interface TAExamCourseMapper extends BaseMapper<TAExamCourse> {
                                                  @Param("semesterId") Long semesterId,
                                                  @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
 
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     Map<String, String> getScoreAndRate(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 
     /**