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/impl/EntTestPackageServiceImpl.java |   68 ++++------------------------------
 1 files changed, 8 insertions(+), 60 deletions(-)

diff --git a/src/main/java/com/ots/project/exam/service/impl/EntTestPackageServiceImpl.java b/src/main/java/com/ots/project/exam/service/impl/EntTestPackageServiceImpl.java
index 0c0e945..b2e0343 100644
--- a/src/main/java/com/ots/project/exam/service/impl/EntTestPackageServiceImpl.java
+++ b/src/main/java/com/ots/project/exam/service/impl/EntTestPackageServiceImpl.java
@@ -1,5 +1,4 @@
 package com.ots.project.exam.service.impl;
-
 import com.ots.common.enums.TestMemberStatusEnum;
 import com.ots.common.utils.DateUtils;
 import com.ots.common.utils.StringUtils;
@@ -10,50 +9,28 @@
 import com.ots.project.exam.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.*;
-
 import static com.ots.common.enums.OpertypeEnum.DIS_USER;
 import static com.ots.common.enums.ResponseCode.ERROR_RECOVER;
 
-/**
- * 娴嬭瘯鍖呯鐞哠ervice涓氬姟灞傚鐞�
- *
- * @author ots
- * @date 2019-11-27
- */
 @Service
 public class EntTestPackageServiceImpl implements IEntTestPackageService {
     @Autowired
     private EntTestPackageMapper entTestPackageMapper;
-
     @Autowired
     private IEntTestMemberService entTestMemberService;
-
     @Autowired
     private CountCalculateService calculate;
     @Autowired
     private IEntOperLogService entOperLogService;
     @Autowired
     private ITReportTemplateService reportTemplateService;
-
-    /**
-     * 鏌ヨ娴嬭瘯鍖呯鐞�
-     *
-     * @param id 娴嬭瘯鍖呯鐞咺D
-     * @return 娴嬭瘯鍖呯鐞�
-     */
+    
     @Override
     public EntTestPackage selectEntTestPackageById(Long id) {
         return entTestPackageMapper.selectEntTestPackageById(id);
     }
-
-    /**
-     * 鏌ヨ娴嬭瘯鍖呯鐞嗗垪琛�
-     *
-     * @param entTestPackage 娴嬭瘯鍖呯鐞�
-     * @return 娴嬭瘯鍖呯鐞�
-     */
+    
     @Override
     public List<EntTestPackage> selectEntTestPackageList(EntTestPackage entTestPackage) {
         List<EntTestPackage> entTestPackages = entTestPackageMapper.selectEntTestPackageList(entTestPackage);
@@ -69,7 +46,7 @@
                 String[] split = reportTemplateId.split(",");
                 Arrays.stream(split).forEach(item -> {
                     TReportTemplate template = reportTemplateService.selectTReportTemplateById(Long.parseLong(item));
-                    // 濡傛灉鎶ュ憡琚垹闄や簡灏变笉璇诲嚭鏉ヤ簡
+                    
                     if (Objects.nonNull(template)) {
                         String reportTemplateShowValue = Objects.isNull(p.getReportTemplateShowValue()) ? "" : p.getReportTemplateShowValue();
                         p.setReportTemplateShowValue(template.getReportType() + "-" + template.getTemplateType() + "-" + template.getLangType() + ";" + reportTemplateShowValue);
@@ -79,63 +56,36 @@
         });
         return entTestPackages;
     }
-
-
     @Override
     public List<EntTestPackage> selectEntTestPackageMainList(EntTestPackage entTestPackage) {
         List<EntTestPackage> entTestPackages = entTestPackageMapper.selectEntTestPackageMainList(entTestPackage);
         return entTestPackages;
     }
-
-    /**
-     * 鏂板娴嬭瘯鍖呯鐞�
-     *
-     * @param entTestPackage 娴嬭瘯鍖呯鐞�
-     * @return 缁撴灉
-     */
+    
     @Override
     public int insertEntTestPackage(EntTestPackage entTestPackage) {
-        // 濡傛灉鐢ㄦ埛缂栫爜涓虹┖锛屾彁鍙栧綋澶╂湁鏁堢櫥褰曠敤鎴�
+        
         if (Objects.isNull(entTestPackage.getUserId())) {
             entTestPackage.setUserId(ShiroUtils.getSysUser().getUserId());
         }
         entTestPackage.setCreateTime(DateUtils.getNowDate());
         return entTestPackageMapper.insertEntTestPackage(entTestPackage);
     }
-
-    /**
-     * 淇敼娴嬭瘯鍖呯鐞�
-     *
-     * @param entTestPackage 娴嬭瘯鍖呯鐞�
-     * @return 缁撴灉
-     */
+    
     @Override
     public int updateEntTestPackage(EntTestPackage entTestPackage) {
         entTestPackage.setUpdateTime(DateUtils.getNowDate());
         return entTestPackageMapper.updateEntTestPackage(entTestPackage);
     }
-
-    /**
-     * 鍒犻櫎娴嬭瘯鍖呯鐞嗗璞�
-     *
-     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
-     * @return 缁撴灉
-     */
+    
     @Override
     public int deleteEntTestPackageByIds(String ids) {
         return entTestPackageMapper.deleteEntTestPackageByIds(Convert.toStrArray(ids));
     }
-
-    /**
-     * 鍒犻櫎娴嬭瘯鍖呯鐞嗕俊鎭�
-     *
-     * @param id 娴嬭瘯鍖呯鐞咺D
-     * @return 缁撴灉
-     */
+    
     public int deleteEntTestPackageById(Long id) {
         return entTestPackageMapper.deleteEntTestPackageById(id);
     }
-
     @Override
     public List<EntTestPackage> selectEntTestPackageListByIdAndStatusIn(Long userId, List<String> status) {
         if (Objects.isNull(userId) && Objects.isNull(status) && status.isEmpty()) {
@@ -150,11 +100,9 @@
         }
         return selectEntTestPackageListByIdAndStatusIn(paramMap);
     }
-
     public List<EntTestPackage> selectEntTestPackageListByIdAndStatusIn(Map paramMap) {
         return entTestPackageMapper.selectEntTestPackageListByIdAndStatusIn(paramMap);
     }
-
     @Override
     public int recover(Long testId) {
         EntTestMember member = new EntTestMember();

--
Gitblit v1.9.1