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/EntTestSendtaskServiceImpl.java |   69 +++++-----------------------------
 1 files changed, 10 insertions(+), 59 deletions(-)

diff --git a/src/main/java/com/ots/project/exam/service/impl/EntTestSendtaskServiceImpl.java b/src/main/java/com/ots/project/exam/service/impl/EntTestSendtaskServiceImpl.java
index bdea33f..fef244f 100644
--- a/src/main/java/com/ots/project/exam/service/impl/EntTestSendtaskServiceImpl.java
+++ b/src/main/java/com/ots/project/exam/service/impl/EntTestSendtaskServiceImpl.java
@@ -1,5 +1,4 @@
 package com.ots.project.exam.service.impl;
-
 import com.ots.common.enums.SenderType;
 import com.ots.common.enums.SendtaskStatus;
 import com.ots.common.utils.DateUtils;
@@ -16,104 +15,56 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-
 import static com.ots.common.enums.ResponseCode.*;
 
-/**
- * 璇勬祴閭�璇峰彂閫佷换鍔ervice涓氬姟灞傚鐞�
- *
- * @author ots
- * @date 2019-12-19
- */
 @Service
 @Slf4j
 public class EntTestSendtaskServiceImpl implements IEntTestSendtaskService {
     @Autowired
     private EntTestSendtaskMapper entTestSendtaskMapper;
-
     @Autowired
     private EntTestMemberServiceImpl entTestMemberService;
-
     @Autowired
     private EntTestPackageServiceImpl entTestPackageService;
-
     @Autowired
     private VueConfig vueConfig;
     @Autowired
     private IUserService userService;
-
-    /**
-     * 鏌ヨ璇勬祴閭�璇峰彂閫佷换鍔�
-     *
-     * @param id 璇勬祴閭�璇峰彂閫佷换鍔D
-     * @return 璇勬祴閭�璇峰彂閫佷换鍔�
-     */
+    
     @Override
     public EntTestSendtask selectEntTestSendtaskById(Long id) {
         return entTestSendtaskMapper.selectEntTestSendtaskById(id);
     }
-
-    /**
-     * 鏌ヨ璇勬祴閭�璇峰彂閫佷换鍔″垪琛�
-     *
-     * @param entTestSendtask 璇勬祴閭�璇峰彂閫佷换鍔�
-     * @return 璇勬祴閭�璇峰彂閫佷换鍔�
-     */
+    
     @Override
     public List<EntTestSendtask> selectEntTestSendtaskList(EntTestSendtask entTestSendtask) {
         return entTestSendtaskMapper.selectEntTestSendtaskList(entTestSendtask);
     }
-
-    /**
-     * 鏂板璇勬祴閭�璇峰彂閫佷换鍔�
-     *
-     * @param entTestSendtask 璇勬祴閭�璇峰彂閫佷换鍔�
-     * @return 缁撴灉
-     */
+    
     @Override
     public int insertEntTestSendtask(EntTestSendtask entTestSendtask) {
         entTestSendtask.setCreateTime(DateUtils.getNowDate());
         return entTestSendtaskMapper.insertEntTestSendtask(entTestSendtask);
     }
-
-    /**
-     * 淇敼璇勬祴閭�璇峰彂閫佷换鍔�
-     *
-     * @param entTestSendtask 璇勬祴閭�璇峰彂閫佷换鍔�
-     * @return 缁撴灉
-     */
+    
     @Override
     public int updateEntTestSendtask(EntTestSendtask entTestSendtask) {
         entTestSendtask.setUpdateTime(DateUtils.getNowDate());
         return entTestSendtaskMapper.updateEntTestSendtask(entTestSendtask);
     }
-
-    /**
-     * 鍒犻櫎璇勬祴閭�璇峰彂閫佷换鍔″璞�
-     *
-     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
-     * @return 缁撴灉
-     */
+    
     @Override
     public int deleteEntTestSendtaskByIds(String ids) {
         return entTestSendtaskMapper.deleteEntTestSendtaskByIds(Convert.toStrArray(ids));
     }
-
-    /**
-     * 鍒犻櫎璇勬祴閭�璇峰彂閫佷换鍔′俊鎭�
-     *
-     * @param id 璇勬祴閭�璇峰彂閫佷换鍔D
-     * @return 缁撴灉
-     */
+    
     public int deleteEntTestSendtaskById(Long id) {
         return entTestSendtaskMapper.deleteEntTestSendtaskById(id);
     }
-
     @Override
     public int insertEntTestSendtaskFromMemberIds(SendTask sendTask) {
         String memberIds = sendTask.getMemberIds();
@@ -139,16 +90,16 @@
                 TEL_IS_NOLL.assertNotNull(entTestMember.getMemberPhone());
                 entTestSendtask.setAddressee(entTestMember.getMemberPhone());
             }
-            //鐢熸垚閾炬帴涓撳睘鍦板潃
+            
             String url = vueConfig.getUrl();
             String token = entTestMember.getToken();
             String urlNew = MessageFormat.format(url, token);
-            //鏇挎崲閾炬帴鍦板潃
+            
             String content = entTestSendtask.getContent();
             String replace = content.replace("{url}", urlNew);
-            //鏇挎崲鍏徃鍚嶇О
+            
             String content2 = replace.replace("{Company}",user.getUserName());
-            //鏇挎崲鐢ㄦ埛鍚嶇О
+            
             String content3 = content2.replace("{FullName}",entTestMember.getMemberName());
             entTestSendtask.setContent(content3);
             entTestSendtask.setCreateTime(DateUtils.getNowDate());

--
Gitblit v1.9.1