From 6d7ed7b936065350f33b7e953d80580d9cc21b13 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 17 Jul 2020 20:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E3=80=91-=E3=80=90=E6=B4=BB=E6=80=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9=E3=80=91-=EF=BC=88?=
 =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/07/17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ActInfoServiceImpl.java      | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
index c48d069ab..5a34e5d83 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
@@ -166,35 +166,33 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             return new Result().error(CheckDataUtils.violations_message);
         }
 
-
         ActInfoEntity entity = ConvertUtils.sourceToTarget(dto, ActInfoEntity.class);
         if (insert(entity)) {
             if (NumConstant.ONE_STR.equals(dto.getIsBanner())) {
                 // 保存到banner
                 this.saveActInfoToBanner(entity.getId(), dto);
             }
-            // 创建定时任务（活动开始后将未审核的报名人员自动置为审核通过或不通过）
-            return this.saveActToScheduleJob(entity.getId(), dto.getActStartTime());
-        }
-
-        //接口异常，保存至待审核信息
-        if(contentResult == null || imgResult == null) {
-            SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
-                    userName, CheckDataUtils.cate_one, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
-                    imgList, entity.getId(),null,null, null,dto.getTel(),"1");
-            contentSecurityFeign.insertRecords(record);
-        }
-
-        //保存待审核记录
-        if (contentResult != null && imgResult != null) {
-            CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
-            if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
-                //组装要保存的信息
+            //接口异常，保存至待审核信息
+            if(contentResult == null || imgResult == null) {
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
-                        userName, CheckDataUtils.cate_two, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
-                        imgList, entity.getId(),null,null, twoTypes,dto.getTel(),"0");
+                        userName, CheckDataUtils.cate_one, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
+                        imgList, entity.getId(),null,null, null,dto.getTel(),"1");
                 contentSecurityFeign.insertRecords(record);
             }
+
+            //保存待审核记录
+            if (contentResult != null && imgResult != null) {
+                CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
+                if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
+                    //组装要保存的信息
+                    SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
+                            userName, CheckDataUtils.cate_two, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
+                            imgList, entity.getId(),null,null, twoTypes,dto.getTel(),"0");
+                    contentSecurityFeign.insertRecords(record);
+                }
+            }
+            // 创建定时任务（活动开始后将未审核的报名人员自动置为审核通过或不通过）
+            return this.saveActToScheduleJob(entity.getId(), dto.getActStartTime());
         }
         return new Result().error();
     }