From 5de95365a13e7afc2a551469dc7282073ff32f31 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 4 Aug 2020 17:09:59 +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=E5=8A=9F=E8=83=BD=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/comment/form/SubmitCommentFormDTO.java     |  5 +++++
 .../dto/events/form/EpdcEventSubmitFormDTO.java    |  5 +++++
 .../esua/epdc/dto/item/form/EvaluationFormDTO.java |  5 +++++
 .../service/impl/EventCommentServiceImpl.java      | 12 +++++++++---
 .../events/service/impl/EpdcEventsServiceImpl.java | 14 +++++++++++---
 .../modules/item/service/impl/ItemServiceImpl.java | 12 +++++++++---
 .../dto/comment/TopicCommentFormDTO.java           |  5 +++++
 .../dto/topic/form/TopicSubmitFormDTO.java         |  6 +++++-
 .../service/impl/TopicCommentServiceImpl.java      | 12 +++++++++---
 .../topic/service/impl/TopicServiceImpl.java       | 13 ++++++++++---
 .../com/elink/esua/epdc/activity/ActInfoDTO.java   |  9 ++++++---
 .../esua/epdc/activity/AppActUserClockLogDTO.java  |  5 +++++
 .../activity/service/impl/ActInfoServiceImpl.java  | 13 ++++++++++---
 .../service/impl/ActUserClockLogServiceImpl.java   | 13 ++++++++++---
 14 files changed, 104 insertions(+), 25 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java
index 1f6373f36..c42f41db1 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java
@@ -47,4 +47,9 @@ public class SubmitCommentFormDTO implements Serializable {
 	 * 党员标识（0-否，1-是）
 	 */
 	private String partyFlag;
+
+	/**
+	 *是否提交为内容待审核状态
+	 */
+	private Boolean isConReview;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java
index 3fe1cb2c8..8ab6ef1ed 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java
@@ -157,4 +157,9 @@ public class EpdcEventSubmitFormDTO implements Serializable {
     private Long changeUserId;
     private String changeUsername;
     private String changeUserMobile;
+
+    /**
+     *是否提交为内容待审核状态
+     */
+    private Boolean isConReview;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java
index 98ca092a4..f135222b7 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/EvaluationFormDTO.java
@@ -26,4 +26,9 @@ public class EvaluationFormDTO implements Serializable {
 
     private String userId;
 
+    /**
+     *是否提交为内容待审核状态
+     */
+    private Boolean isConReview;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
index 287be84e6..09af73e1e 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
@@ -162,6 +162,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
     @Transactional(rollbackFor = Exception.class)
     public Result submit(SubmitCommentFormDTO commentFormDTO) {
         //内容审核
+        Boolean isConReview = commentFormDTO.getIsConReview();
         List<String> textList = new ArrayList<>();
         textList.add(commentFormDTO.getContent());
         String mobile = null;
@@ -172,7 +173,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         // 获取所有上级机构名称和ID拼接
         ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
-        if (contentResult != null && !contentResult.getAllPass()) {
+        if (!isConReview && (contentResult != null && !contentResult.getAllPass())) {
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                     commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one,
@@ -283,7 +284,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
         newsTask.insertUserInformation(informationFormDTO);
 
         //接口异常，保存至待审核信息
-        if(contentResult == null) {
+        if(contentResult == null && !isConReview) {
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                     commentFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_COMMENT.getCode(), textList,
                     null, commentEntity.getId(),null,null, null,mobile,"1",deptDto);
@@ -292,7 +293,12 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
 
         //判断是否为待审核
         if (contentResult != null) {
-            CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
+            CheckResultMessageDTO twoTypes = null;
+                if(isConReview){
+                    twoTypes = CheckDataUtils.saveTwoTypes(contentResult, null);
+                }else{
+                    twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
+                }
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
index 0636702dd..4298b0d68 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
@@ -174,13 +174,15 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
     @Transactional(rollbackFor = Exception.class)
     public EpdcEventsEntity saveEvent(EpdcEventSubmitFormDTO dto) {
         //内容审核
+        Boolean isConReview = dto.getIsConReview();
         List<String> textList = new ArrayList<>();
         textList.add(dto.getEventContent());
         // 获取所有上级机构名称和ID拼接
         ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         CheckResultDTO imgResult = CheckDataUtils.checkImgs(dto.getImages());
-        if((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass())){
+        if(!isConReview &&
+                ((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass()))){
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
                     dto.getNickName(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.ISSUE_SUBMIT.getCode(), textList,
@@ -202,7 +204,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
         issueOverseeResultsTask.getSysGridLeaderPhone(dto.getGridId());
 
         //接口异常，保存至待审核信息
-        if(contentResult == null || imgResult == null) {
+        if((contentResult == null || imgResult == null) && !isConReview) {
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
                     dto.getNickName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_SUBMIT.getCode(), textList,
                     dto.getImages(), entity.getId(),null,null, null,dto.getMobile(),"1",deptDto);
@@ -211,7 +213,12 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
 
         //保存待审核记录
         if (contentResult != null && imgResult != null) {
-            CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
+            CheckResultMessageDTO twoTypes = null;
+            if(isConReview){
+                twoTypes = CheckDataUtils.saveTwoTypes(contentResult, imgResult);
+            }else{
+                twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
+            }
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
@@ -221,6 +228,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
             }
         }
         return entity;
+//        return new Result<EpdcEventsEntity>().ok(entity);
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index 81947f1c3..bf9e3d215 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -317,6 +317,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if (itemEntityResult.getUserId().equals(evaluationFormDTO.getUserId()) && itemEntityResult.getEvaluationScore() == null) {
 
             //内容审核
+            Boolean isConReview = evaluationFormDTO.getIsConReview();
             String userName = null;
             if(null != SecurityUser.getUser()){
                 userName = SecurityUser.getUser().getUsername();
@@ -331,7 +332,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             List<String> textList = new ArrayList<>();
             textList.add(evaluationFormDTO.getEvaluationContent());
             CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
-            if (contentResult != null && !contentResult.getAllPass()) {
+            if (!isConReview && (contentResult != null && !contentResult.getAllPass())) {
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
                         userName,CheckDataUtils.cate_two , CheckDataUtils.decision_one,
@@ -349,7 +350,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             baseDao.updateById(itemEntity);
 
             //接口异常，保存至待审核信息
-            if(contentResult == null) {
+            if(contentResult == null && !isConReview) {
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
                         userName, CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList,
                         null, itemEntity.getId(),null,null, null,mobile,"1",deptDto);
@@ -358,7 +359,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
             //判断是否为待审核
             if(contentResult != null) {
-                CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
+                CheckResultMessageDTO twoTypes = null;
+                if(isConReview){
+                    twoTypes = CheckDataUtils.saveTwoTypes(contentResult, null);
+                }else{
+                    twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
+                }
                 if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                     //组装要保存的信息
                     SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/TopicCommentFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/TopicCommentFormDTO.java
index 10424dd8f..e8b0b027c 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/TopicCommentFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/TopicCommentFormDTO.java
@@ -50,4 +50,9 @@ public class TopicCommentFormDTO {
      */
     private String partyFlag;
 
+    /**
+     *是否提交为内容待审核状态
+     */
+    private Boolean isConReview;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java
index 602762596..65c5873c0 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java
@@ -3,7 +3,6 @@ package com.elink.esua.epdc.dto.topic.form;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.List;
@@ -146,4 +145,9 @@ public class TopicSubmitFormDTO implements Serializable {
      */
     private Integer state;
 
+    /**
+     *是否提交为内容待审核状态
+     */
+    private Boolean isConReview;
+
 }
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
index 931d45839..be6542786 100755
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
@@ -143,6 +143,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
     @Override
     public Result submit(TopicCommentFormDTO commentFormDTO) {
         //内容审核
+        Boolean isConReview = commentFormDTO.getIsConReview();
         List<String> textList = new ArrayList<>();
         textList.add(commentFormDTO.getContent());
         String mobile = null;
@@ -153,7 +154,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
         // 获取所有上级机构名称和ID拼接
         ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
-        if (contentResult != null && !contentResult.getAllPass()) {
+        if (!isConReview && (contentResult != null && !contentResult.getAllPass())) {
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                     commentFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one,
@@ -225,7 +226,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
         newsTask.insertUserInformation(informationFormDTO);
 
         //接口异常，保存至待审核信息
-        if(contentResult == null ) {
+        if(contentResult == null && !isConReview) {
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
                     commentFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,
                     null, commentEntity.getId(),null,null, null,mobile,"1",deptDto);
@@ -234,7 +235,12 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
 
         //判断是否为待审核
         if (contentResult != null) {
-            CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
+            CheckResultMessageDTO twoTypes = null;
+                if(isConReview){
+                    twoTypes = CheckDataUtils.saveTwoTypes(contentResult, null);
+                }else{
+                    twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
+                }
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
index 05824eb61..813514f3c 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
@@ -203,13 +203,15 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
     @Transactional(rollbackFor = Exception.class)
     public Result saveTopic(TopicSubmitFormDTO formDto) {
         //内容审核
+        Boolean isConReview = formDto.getIsConReview();
         List<String> textList = new ArrayList<>();
         textList.add(formDto.getTopicContent());
         // 获取所有上级机构名称和ID拼接
         ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         CheckResultDTO imgResult = CheckDataUtils.checkImgs(formDto.getImages());
-        if((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass())){
+        if(!isConReview &&
+                ((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass()))){
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(),
                     formDto.getNickname(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.GROUP_TOPIC.getCode(), textList,
@@ -243,7 +245,7 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
 
 
             //接口异常，保存至待审核信息
-            if(contentResult == null || imgResult == null) {
+            if((contentResult == null || imgResult == null) && !isConReview) {
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(),
                         formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList,
                         formDto.getImages(), entity.getId(),null,null, null,formDto.getMobile(),"1",deptDto);
@@ -251,7 +253,12 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
             }
             //保存待审核记录
             if (contentResult != null && imgResult != null) {
-                CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
+                CheckResultMessageDTO twoTypes = null;
+                if(isConReview){
+                   twoTypes = CheckDataUtils.saveTwoTypes(contentResult, imgResult);
+                }else{
+                   twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
+                }
                 if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                     //组装要保存的信息
                     SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(),
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java
index 379cdcf7d..d01e0784c 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java
@@ -17,11 +17,11 @@
 
 package com.elink.esua.epdc.activity;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 活动信息表
@@ -215,5 +215,8 @@ public class ActInfoDTO implements Serializable {
      */
     private String bannerUrl;
 
-
+    /**
+     *是否提交为内容待审核状态
+     */
+    private Boolean isConReview;
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java
index 54a16100b..a42d18ea4 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java
@@ -77,4 +77,9 @@ public class AppActUserClockLogDTO implements Serializable {
     @NotBlank(message = "打卡是否有效不能为空")
     private String effectiveFlag;
 
+    /**
+     *是否提交为内容待审核状态
+     */
+    private Boolean isConReview;
+
 }
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 a225001b2..e7596b519 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
@@ -147,6 +147,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     @Transactional(rollbackFor = Exception.class)
     public Result save(ActInfoDTO dto) {
         //内容审核
+        Boolean isConReview = dto.getIsConReview();
         String userName = null;
         String userId = null;
         if(null != SecurityUser.getUser()){
@@ -163,7 +164,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData();
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         CheckResultDTO imgResult = CheckDataUtils.checkImgs(imgList);
-        if((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass())){
+        if(!isConReview &&
+                ((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass()))){
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
                     userName, CheckDataUtils.cate_one, CheckDataUtils.decision_one, ModuleName.HELP_ACTIVITY.getCode(), textList,
@@ -179,7 +181,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
                 this.saveActInfoToBanner(entity.getId(), dto);
             }
             //接口异常，保存至待审核信息
-            if(contentResult == null || imgResult == null) {
+            if((contentResult == null || imgResult == null) && !isConReview) {
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
                         userName, CheckDataUtils.cate_one, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
                         imgList, entity.getId(),null,null, null,dto.getTel(),"1",deptDto);
@@ -188,7 +190,12 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
 
             //保存待审核记录
             if (contentResult != null && imgResult != null) {
-                CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
+                CheckResultMessageDTO twoTypes = null;
+                if(isConReview){
+                   twoTypes = CheckDataUtils.saveTwoTypes(contentResult, imgResult);
+                }else{
+                   twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
+                }
                 if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                     //组装要保存的信息
                     SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
index 3c3633280..0b856fa8b 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
@@ -309,6 +309,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
     @Override
     public Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO) {
         //内容审核
+        Boolean isConReview = appActUserClockLogDTO.getIsConReview();
         String userName = null;
         if(null != SecurityUser.getUser()){
             userName = SecurityUser.getUser().getUsername();
@@ -324,7 +325,8 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         textList.add(appActUserClockLogDTO.getClockDesc());
         CheckResultDTO contentResult = CheckDataUtils.checkContent(textList);
         CheckResultDTO imgResult = CheckDataUtils.checkImgs(appActUserClockLogDTO.getImages());
-        if((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass())){
+        if(!isConReview &&
+                ((contentResult != null && !contentResult.getAllPass()) || (imgResult != null && !imgResult.getAllPass()))){
             //组装要保存的信息
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
                     userName, CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.HELP_SIGNIN.getCode(), textList,
@@ -368,7 +370,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         actInfoService.addClockNum(appActUserClockLogDTO.getActId());
 
         //接口异常，保存至待审核信息
-        if(contentResult == null || imgResult == null) {
+        if((contentResult == null || imgResult == null) && !isConReview) {
             SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
                     userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
                     appActUserClockLogDTO.getImages(), entity.getId(),null,null, null,mobile,"1",deptDto);
@@ -376,7 +378,12 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         }
         //保存待审核记录
         if (contentResult != null && imgResult != null) {
-            CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
+            CheckResultMessageDTO twoTypes = null;
+if(isConReview){
+   twoTypes = CheckDataUtils.saveTwoTypes(contentResult, imgResult);
+}else{
+   twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
+}
             if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
                 //组装要保存的信息
                 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),