代码调整

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

@@ -51,7 +51,14 @@ public interface TCPaperStructService extends IService<TCPaperStruct> {
      */
     public Map<String, String> paperStructSync(Long examId, Long courseId, String paperNumber, Long cultureProgramId) throws IOException;
 
-
+    /**
+     * 查询试卷数据
+     *
+     * @param cultureProgramId
+     * @param courseId
+     * @param paperNumber
+     * @return
+     */
     public TCPaperStruct queryPaperStruct(Long cultureProgramId, Long courseId, String paperNumber);
 
     /**

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

@@ -22,9 +22,9 @@ public interface TCUsualScoreService extends IService<TCUsualScore> {
     /**
      * 平时成绩导入
      *
-     * @param file             excel
-     * @param cultureProgramId 培养方案id
-     * @param courseId         课程id
+     * @param file
+     * @param cultureProgramId
+     * @param courseId
      * @return 结果
      */
     public Map<String, String> usualScoreExcelImport(MultipartFile file, Long cultureProgramId, Long courseId) throws IOException;

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

@@ -119,7 +119,6 @@ public interface TRBasicInfoService extends IService<TRBasicInfo> {
      */
     public ChartMultiSeriesRenderData buildCourseTargetColumnDiagram1(Map<String, Object> map);
 
-
     /**
      * 构建word图形表格2
      *
@@ -157,10 +156,10 @@ public interface TRBasicInfoService extends IService<TRBasicInfo> {
     /**
      * 清除报告数据
      *
-     * @param cultureProgramId cultureProgramId
-     * @param courseId         courseId
-     * @param paperNumber      paperNumber
-     * @param clearDimension   clearDimension
+     * @param cultureProgramId
+     * @param courseId
+     * @param paperNumber
+     * @param clearDimension
      */
     public void clearReportData(Long cultureProgramId, Long courseId, String paperNumber, boolean clearDimension);
 }

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

@@ -30,7 +30,6 @@ import com.qmth.teachcloud.common.service.BasicCourseService;
 import com.qmth.teachcloud.common.util.*;
 import com.qmth.teachcloud.mark.bean.archivescore.MarkStudentScoreVo;
 import com.qmth.teachcloud.mark.dto.mark.ScoreItem;
-import com.qmth.teachcloud.mark.entity.MarkPaper;
 import com.qmth.teachcloud.mark.service.MarkStudentService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
@@ -80,6 +79,16 @@ public class TCFinalScoreServiceImpl extends ServiceImpl<TCFinalScoreMapper, TCF
     @Resource
     BasicCourseService basicCourseService;
 
+    /**
+     * 导入期末成绩excel
+     *
+     * @param file
+     * @param examId
+     * @param courseId
+     * @param paperNumber
+     * @param cultureProgramId
+     * @return
+     */
     @Override
     @Transactional
     public Map<String, String> finalScoreExcelImport(MultipartFile file, Long examId, Long courseId, String paperNumber, Long cultureProgramId) {
@@ -291,6 +300,16 @@ public class TCFinalScoreServiceImpl extends ServiceImpl<TCFinalScoreMapper, TCF
         return this.baseMapper.examStudentOverview(cultureProgramId, courseId);
     }
 
+    /**
+     * 同步期末成绩
+     *
+     * @param examId
+     * @param courseId
+     * @param paperNumber
+     * @param cultureProgramId
+     * @return
+     * @throws IOException
+     */
     @Override
     @Transactional
     public Map<String, String> finalScoreSync(Long examId, Long courseId, String paperNumber, Long cultureProgramId) throws IOException {
@@ -363,6 +382,14 @@ public class TCFinalScoreServiceImpl extends ServiceImpl<TCFinalScoreMapper, TCF
         return messageMap;
     }
 
+    /**
+     * 根据考试id/课程编码/试卷编码删除数据
+     *
+     * @param cultureProgramId
+     * @param courseId
+     * @param paperNumber
+     * @return
+     */
     @Override
     @Transactional
     public Boolean remove(Long cultureProgramId, Long courseId, String paperNumber) {
@@ -374,6 +401,14 @@ public class TCFinalScoreServiceImpl extends ServiceImpl<TCFinalScoreMapper, TCF
         return tcFinalScoreService.remove(queryWrapper);
     }
 
+    /**
+     * 根据考试id/课程编码/试卷编码查询数据库数据
+     *
+     * @param cultureProgramId
+     * @param courseId
+     * @param paperNumber
+     * @return
+     */
     @Override
     public List<TCFinalScore> queryFinalScore(Long cultureProgramId, Long courseId, String paperNumber) {
         QueryWrapper<TCFinalScore> queryWrapper = new QueryWrapper<>();
@@ -384,6 +419,13 @@ public class TCFinalScoreServiceImpl extends ServiceImpl<TCFinalScoreMapper, TCF
         return tcFinalScoreService.list(queryWrapper);
     }
 
+    /**
+     * 获取期末考试同步锁
+     *
+     * @param cultureProgramId
+     * @param courseId
+     * @param paperNumber
+     */
     @Override
     public void getFinalScoreSyncLock(Long cultureProgramId, Long courseId, String paperNumber) {
         String lockKey = SystemConstant.REDIS_FINAL_SCORE_DATA_PREFIX + SystemConstant.SYNC + cultureProgramId + "_" + courseId + "_" + paperNumber;
@@ -393,6 +435,13 @@ public class TCFinalScoreServiceImpl extends ServiceImpl<TCFinalScoreMapper, TCF
         }
     }
 
+    /**
+     * 获取期末考试导入锁
+     *
+     * @param cultureProgramId
+     * @param courseId
+     * @param paperNumber
+     */
     @Override
     public void getFinalScoreImportLock(Long cultureProgramId, Long courseId, String paperNumber) {
         String lockKey = SystemConstant.REDIS_FINAL_SCORE_DATA_PREFIX + SystemConstant.IMPORT + cultureProgramId + "_" + courseId + "_" + paperNumber;

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

@@ -93,6 +93,15 @@ public class TCPaperStructServiceImpl extends ServiceImpl<TCPaperStructMapper, T
         return tcPaperStructService.remove(queryWrapper);
     }
 
+    /**
+     * 导入期末成绩-试卷结构excel
+     *
+     * @param file
+     * @param cultureProgramId
+     * @param courseId
+     * @param paperNumber
+     * @return
+     */
     @Override
     @Transactional
     public Map<String, String> paperStructExcelImport(MultipartFile file, Long cultureProgramId, Long courseId, String paperNumber) {
@@ -236,10 +245,6 @@ public class TCPaperStructServiceImpl extends ServiceImpl<TCPaperStructMapper, T
                     paperStructDbList = markQuestionList.stream().map(e -> e.getMainNumber() + "_" + e.getSubNumber() + "_" + e.getTotalScore()).collect(Collectors.toList());
                 }
                 if (!CollectionUtils.isEmpty(paperStructDbList) && !CollectionUtils.isEmpty(paperStructList) && !CollectionUtils.isEqualCollection(paperStructDbList, paperStructList)) {
-                    Collections.sort(paperStructDbList);
-                    Collections.sort(paperStructList);
-
-//                    tcFinalScoreService.remove(cultureProgramId, courseId, paperNumber);
                     trBasicInfoService.clearReportData(cultureProgramId, courseId, paperNumber, false);
                     tcPaperStruct.setPaperStruct(null);
                 }
@@ -255,10 +260,6 @@ public class TCPaperStructServiceImpl extends ServiceImpl<TCPaperStructMapper, T
                 }
                 paperStructDbList = markQuestionList.stream().map(e -> e.getMainNumber() + "_" + e.getSubNumber() + "_" + e.getTotalScore()).collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(paperStructDbList) && !CollectionUtils.isEmpty(paperStructList) && !CollectionUtils.isEqualCollection(paperStructDbList, paperStructList)) {
-                    Collections.sort(paperStructDbList);
-                    Collections.sort(paperStructList);
-
-//                    tcFinalScoreService.remove(cultureProgramId, courseId, paperNumber);
                     trBasicInfoService.clearReportData(cultureProgramId, courseId, paperNumber, false);
                 }
             }

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

@@ -9,7 +9,6 @@ import com.qmth.boot.tools.excel.enums.ExcelType;
 import com.qmth.distributed.print.business.bean.dto.TCUsualScoreDto;
 import com.qmth.distributed.print.business.entity.TCUsualScore;
 import com.qmth.distributed.print.business.mapper.TCUsualScoreMapper;
-import com.qmth.distributed.print.business.service.ObeCourseOutlineService;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.distributed.print.business.service.TCUsualScoreService;
 import com.qmth.distributed.print.business.service.TRBasicInfoService;
@@ -59,6 +58,14 @@ public class TCUsualScoreServiceImpl extends ServiceImpl<TCUsualScoreMapper, TCU
     @Resource
     BasicCourseService basicCourseService;
 
+    /**
+     * 平时成绩导入
+     *
+     * @param file             excel
+     * @param cultureProgramId 培养方案id
+     * @param courseId         课程id
+     * @return
+     */
     @Override
     @Transactional
     public Map<String, String> usualScoreExcelImport(MultipartFile file, Long cultureProgramId, Long courseId) {
@@ -165,13 +172,28 @@ public class TCUsualScoreServiceImpl extends ServiceImpl<TCUsualScoreMapper, TCU
         return messageMap;
     }
 
-
+    /**
+     * 平时成绩列表（分页）
+     *
+     * @param iPage
+     * @param cultureProgramId
+     * @param courseId
+     * @param paperNumber
+     * @return
+     */
     @Override
     public IPage<TCUsualScore> usualScoreList(IPage<Map> iPage, Long cultureProgramId, Long courseId, String paperNumber) {
         return this.baseMapper.usualScoreList(iPage, cultureProgramId, courseId, paperNumber);
     }
 
-
+    /**
+     * 查询平时作业成绩
+     *
+     * @param cultureProgramId
+     * @param courseId
+     * @param paperNumber
+     * @return
+     */
     @Override
     public List<TCUsualScore> queryUsualScore(Long cultureProgramId, Long courseId, String paperNumber) {
         QueryWrapper<TCUsualScore> queryWrapper = new QueryWrapper<>();

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

@@ -1014,6 +1014,14 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
         return chart;
     }
 
+    /**
+     * 删除报表数据
+     *
+     * @param cultureProgramId
+     * @param courseId
+     * @param paperNumber
+     * @return
+     */
     @Override
     @Transactional
     public Boolean remove(Long cultureProgramId, Long courseId, String paperNumber) {
@@ -1078,7 +1086,14 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
         return null;
     }
 
-
+    /**
+     * 清除报表
+     *
+     * @param cultureProgramId
+     * @param courseId
+     * @param paperNumber
+     * @param clearDimension
+     */
     @Override
     @Transactional
     public void clearReportData(Long cultureProgramId, Long courseId, String paperNumber, boolean clearDimension) {