Merge remote-tracking branch 'origin/feature/contentSecurityDev'

esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java

@@ -48,6 +48,11 @@ public class CheckRecordsEntity extends BaseEpdcEntity {
      */
 	private String name;
 
+	/**
+	 * 用户名称
+	 */
+	private String system;
+
 	/**
 	 * 手机号
 	 */

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();
     }