From 8386e38c994b094dff49227d2489b7ec90fafadf Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 17 Jul 2020 09:52:06 +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=8E=A5=E5=8F=A3=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5?= =?UTF-8?q?=EF=BC=89-2020/07/17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventCommentServiceImpl.java | 33 +++++++++---------- .../service/impl/EpdcEventsServiceImpl.java | 31 +++++++++-------- .../item/service/impl/ItemServiceImpl.java | 33 +++++++++---------- .../service/impl/TopicCommentServiceImpl.java | 33 +++++++++---------- .../topic/service/impl/TopicServiceImpl.java | 31 +++++++++-------- .../service/impl/ActInfoServiceImpl.java | 32 +++++++++--------- .../impl/ActUserClockLogServiceImpl.java | 31 +++++++++-------- 7 files changed, 109 insertions(+), 115 deletions(-) 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 6d480bb39..41657e8a9 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 @@ -173,13 +173,6 @@ public class EventCommentServiceImpl extends BaseServiceImpl implem contentSecurityFeign.insertViolationsRecord(record); return new Result().error(CheckDataUtils.violations_message); } - //接口异常，保存至待审核信息 - if(contentResult == null) { - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), - userName, CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList, - null, null,null,null, null,mobile,"1"); - contentSecurityFeign.insertRecords(record); - } ItemEntity itemEntity = new ItemEntity(); itemEntity.setId(evaluationFormDTO.getItemId()); @@ -352,17 +345,23 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemEntity.setEvaluationTime(new Date()); baseDao.updateById(itemEntity); + //接口异常，保存至待审核信息 + if(contentResult == null) { + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), + userName, CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList, + null, itemEntity.getId(),null,null, null,mobile,"1"); + contentSecurityFeign.insertRecords(record); + } + //判断是否为待审核 - if (contentResult != null) { - CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null); - if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { - //组装要保存的信息 - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), - userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, - null,itemEntity.getId(), null,null,twoTypes,mobile,"0"); - contentSecurityFeign.insertRecords(record); - } - }//如果是审核状态是pass，不作任何处理 + CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null); + if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { + //组装要保存的信息 + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), + userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, + null,itemEntity.getId(), null,null,twoTypes,mobile,"0"); + contentSecurityFeign.insertRecords(record); + } return new Result(); } else { return new Result().error("您无法评价"); 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 c223b4dd8..baccc62cd 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 @@ -154,13 +154,6 @@ public class TopicCommentServiceImpl extends BaseServiceImpl imp contentSecurityFeign.insertViolationsRecord(record); return new Result().error(CheckDataUtils.violations_message); } - //接口异常，保存至待审核信息 - if(contentResult == null || imgResult == null) { - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), - formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList, - formDto.getImages(), null,null,null, null,formDto.getMobile(),"1"); - contentSecurityFeign.insertRecords(record); - } TopicEntity entity = ConvertUtils.sourceToTarget(formDto, TopicEntity.class); if (insert(entity)) { @@ -241,16 +234,22 @@ public class TopicServiceImpl extends BaseServiceImpl imp groupTopicUserReadService.insertBatch(readEntities); + + //接口异常，保存至待审核信息 + if(contentResult == null || imgResult == null) { + 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"); + contentSecurityFeign.insertRecords(record); + } //保存待审核记录 - if (contentResult != null || imgResult != null) { - CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult); - if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { - //组装要保存的信息 - SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), - formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList, - formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0"); - contentSecurityFeign.insertRecords(record); - } + CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult); + if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { + //组装要保存的信息 + SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(), + formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList, + formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0"); + contentSecurityFeign.insertRecords(record); } return new Result(); 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 beb58ed87..30ac16ff0 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 @@ -165,13 +165,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl statusList = new ArrayList<>(); statusList.add(ActUserRelationStatusConstant.APPROVED); @@ -366,16 +359,22 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl