From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001 From: linzhijie <19970921lzj> Date: 星期一, 12 四月 2021 15:44:53 +0800 Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua --- src/main/java/com/ots/project/exam/service/ITExamReportService.java | 105 ++++++---------------------------------------------- 1 files changed, 13 insertions(+), 92 deletions(-) diff --git a/src/main/java/com/ots/project/exam/service/ITExamReportService.java b/src/main/java/com/ots/project/exam/service/ITExamReportService.java index 9ba7470..20e076a 100644 --- a/src/main/java/com/ots/project/exam/service/ITExamReportService.java +++ b/src/main/java/com/ots/project/exam/service/ITExamReportService.java @@ -1,133 +1,54 @@ package com.ots.project.exam.service; - import com.ots.common.enums.LangTypeEnum; import com.ots.common.enums.ReportTypeEnum; import com.ots.project.exam.domain.TExamReport; import com.ots.project.exam.domain.TReportTemplate; import com.ots.project.system.dict.domain.DictData; import com.ots.project.tool.report.ReportResultData; - import java.util.List; import java.util.Map; -/** - * 璇勬祴鎶ュ憡Service鎺ュ彛 - * - * @author ots - * @date 2019-12-26 - */ public interface ITExamReportService { - /** - * 鏌ヨ璇勬祴鎶ュ憡 - * - * @param id 璇勬祴鎶ュ憡ID - * @return 璇勬祴鎶ュ憡 - */ + TExamReport selectTExamReportById(Long id); - - /** - * 鏌ヨ璇勬祴鎶ュ憡鍒楄〃 - * - * @param tExamReport 璇勬祴鎶ュ憡 - * @return 璇勬祴鎶ュ憡闆嗗悎 - */ + List<TExamReport> selectTExamReportList(TExamReport tExamReport); - - // 鏍规嵁finish鏌ヨ + List<TExamReport> selectTExamReportNoStatusList(TExamReport tExamReport); + List<TExamReport> selectViewReportList(TExamReport tExamReport); - - /** - * 鏂板璇勬祴鎶ュ憡 - * - * @param tExamReport 璇勬祴鎶ュ憡 - * @return 缁撴灉 - */ + int insertTExamReport(TExamReport tExamReport); - - /** - * 淇敼璇勬祴鎶ュ憡 - * - * @param tExamReport 璇勬祴鎶ュ憡 - * @return 缁撴灉 - */ + int updateTExamReport(TExamReport tExamReport); - int updateTExamReportStatus(TExamReport tExamReport); - int updateTExamReportByTokenId(TExamReport tExamReport); - int updateTExamReportDeleteLastOneByTokenId(TExamReport tExamReport); - - /** - * 鎵归噺鍒犻櫎璇勬祴鎶ュ憡 - * - * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID - * @return 缁撴灉 - */ + int deleteTExamReportByIds(String ids); - - /** - * 鍒犻櫎璇勬祴鎶ュ憡淇℃伅 - * - * @param id 璇勬祴鎶ュ憡ID - * @return 缁撴灉 - */ + int deleteTExamReportById(Long id); - - /** - * 鎶ュ憡瀹℃壒鐘舵�佸彉鏇� - * - * @param tExamReport - * @return - */ + int changeStatus(TExamReport tExamReport); - - /** - * 鎵归噺鏇存柊瀹℃壒鐘舵�� - * - * @param ids - * @return - */ + int updateTexamReportByIds(String ids, String downloadTimes); - - /** - * 鏍规嵁tokenId鎵归噺鏌ヨ - */ - + List<TExamReport> selectTExamReportByTokenList(String[] tokenIds); - - List<TExamReport> selectTExamReportByIds(String[] ids); - - List<DictData> getType(Long id); - TReportTemplate getReportTemplate(String questionTemplateId, String langType, String templateType); - - // 妯℃嫙璋冪敤鎺ュ彛鎶藉彇鍒版湇鍔″眰 + void setTextPicture(TExamReport tExamReport, ReportResultData reportResultData, List<String> deleteStrList, LangTypeEnum langType, Map<String, Object> textMap); - - // 鍙戦�侀檮浠舵帴鍙� + public void setExportBaseOrDetailReportData(List<TExamReport> tExamReportList, List<String> deleteStrList, List<String> fileNameList, TReportTemplate tReportTemplate); - public String getDemographicName(TExamReport tExamReport); - public boolean getBaseAndComleteSendMailFile(List<TExamReport> tExamReportList, TExamReport tExamReportResult, List<String> fileNameResult, List<String> deleteStrList, TReportTemplate tReportTemplate); - public TExamReport getReportFromTemplate(TExamReport tExamReport, List<String> fileNameResult, List<String> deleteStrList); - public void getBaseAndDetailRportDataList(TReportTemplate tReportTemplate, Map<String, Map<String, String>> excelMap, List<ReportResultData> reportResultDataList, List<TExamReport> tExamQueryReportList); - public void dealTaiData(List<TExamReport> tExamReportList, Map<String, Map<String, String>> excelMap); - public ReportResultData getRuilinReportData(String langType, Map.Entry<String, Map<String, String>> entry, TExamReport tExamReport); - public ReportResultData getMAQReportData(String langType,ReportTypeEnum reportTypeEnum, Map.Entry<String, Map<String, String>> entry, TExamReport tExamReport); - public ReportResultData getCAQReportData(String langType, Map.Entry<String, Map<String, String>> entry, TExamReport tExamReport); - public void setTextMap(TExamReport tExamReport, ReportResultData reportResultData, Map<String, Object> textMap); - public ReportResultData getReportResultData(String reportType, String langType, Map.Entry<String, Map<String, String>> entry, TExamReport tExamReport); public void setExcelMapextraValue(TExamReport tExamReport, Map dataMap); } -- Gitblit v1.9.1