elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【内容审核】-【待审核添加非空判断】-（王童）-2020/07/17

feature/dangjian
Jackwang 5 years ago
parent
8386e38c99
commit
f792b7cee2
7 changed files with 58 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
  2. 14
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
  3. 16
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  4. 15
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
  5. 16
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
  6. 14
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
  7. 14
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java

14
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
View File

@ -283,13 +283,15 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
} }
//判断是否为待审核 //判断是否为待审核
CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null); if (contentResult != null) {
if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
//组装要保存的信息 if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), //组装要保存的信息
commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ISSUE_COMMENT.getCode(), textList, SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
null,commentEntity.getId(), null,null,twoTypes,mobile,"0"); commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ISSUE_COMMENT.getCode(), textList,
null,commentEntity.getId(), null,null,twoTypes,mobile,"0");
contentSecurityFeign.insertRecords(record); contentSecurityFeign.insertRecords(record);
}
} }
return new Result(); return new Result();
} }

14
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
View File

@ -208,13 +208,15 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEv
} }
//保存待审核记录 //保存待审核记录
CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult); if (contentResult != null && imgResult != null) {
if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
//组装要保存的信息 if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(), //组装要保存的信息
dto.getNickName(), CheckDataUtils.cate_two, null,ModuleName.ISSUE_SUBMIT.getCode(), textList, SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(dto.getUserId(),
dto.getImages(), entity.getId(),null,null, twoTypes,dto.getMobile(),"0"); dto.getNickName(), CheckDataUtils.cate_two, null, ModuleName.ISSUE_SUBMIT.getCode(), textList,
dto.getImages(), entity.getId(), null, null, twoTypes, dto.getMobile(), "0");
contentSecurityFeign.insertRecords(record); contentSecurityFeign.insertRecords(record);
}
} }
return entity; return entity;
} }

16
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
View File

@ -354,13 +354,15 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
} }
//判断是否为待审核 //判断是否为待审核
CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null); if(contentResult != null) {
if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { 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, SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(),
null,itemEntity.getId(), null,null,twoTypes,mobile,"0"); userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList,
contentSecurityFeign.insertRecords(record); null,itemEntity.getId(), null,null,twoTypes,mobile,"0");
contentSecurityFeign.insertRecords(record);
}
} }
return new Result(); return new Result();
} else { } else {

15
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java
View File

@ -225,15 +225,16 @@ public class TopicCommentServiceImpl extends BaseServiceImpl<TopicCommentDao, To
} }
//判断是否为待审核 //判断是否为待审核
CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null); if (contentResult != null) {
if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, null);
//组装要保存的信息 if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(), //组装要保存的信息
commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList, SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(commentFormDTO.getUserId(),
null,commentEntity.getId(), null,null,twoTypes,mobile,"0"); commentFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.GROUP_TOPIC_COMMENT.getCode(), textList,
null, commentEntity.getId(), null, null, twoTypes, mobile, "0");
contentSecurityFeign.insertRecords(record); contentSecurityFeign.insertRecords(record);
}
} }
return new Result(); return new Result();
} }

16
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
View File

@ -243,13 +243,15 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
contentSecurityFeign.insertRecords(record); contentSecurityFeign.insertRecords(record);
} }
//保存待审核记录 //保存待审核记录
CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult); if (contentResult != null && imgResult != null) {
if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { 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, SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(formDto.getUserId(),
formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0"); formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList,
contentSecurityFeign.insertRecords(record); formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0");
contentSecurityFeign.insertRecords(record);
}
} }
return new Result(); return new Result();

14
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
View File

@ -186,13 +186,15 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
} }
//保存待审核记录 //保存待审核记录
CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult); if (contentResult != null && imgResult != null) {
if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { 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, SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(userId,
imgList, entity.getId(),null,null, twoTypes,dto.getTel(),"0"); userName, CheckDataUtils.cate_two, null,ModuleName.HELP_ACTIVITY.getCode(), textList,
imgList, entity.getId(),null,null, twoTypes,dto.getTel(),"0");
contentSecurityFeign.insertRecords(record); contentSecurityFeign.insertRecords(record);
}
} }
return new Result().error(); return new Result().error();
} }

14
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
View File

@ -368,13 +368,15 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
contentSecurityFeign.insertRecords(record); contentSecurityFeign.insertRecords(record);
} }
//保存待审核记录 //保存待审核记录
CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult); if (contentResult != null && imgResult != null) {
if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { CheckResultMessageDTO twoTypes = CheckDataUtils.checkTwoTypes(contentResult, imgResult);
//组装要保存的信息 if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) {
SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(), //组装要保存的信息
userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList, SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(appActUserClockLogDTO.getUserId(),
appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes,mobile,"0"); userName, CheckDataUtils.cate_two, null,ModuleName.HELP_SIGNIN.getCode(), textList,
appActUserClockLogDTO.getImages(), entity.getId(),null,null, twoTypes,mobile,"0");
contentSecurityFeign.insertRecords(record); contentSecurityFeign.insertRecords(record);
}
} }
return new Result().ok("打卡成功"); return new Result().ok("打卡成功");
} }

Write Preview
Loading…
Cancel
Save