diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java index 2d30a4525..bc0851566 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java @@ -77,4 +77,9 @@ public class EpdcAppActUserClockLogDTO implements Serializable { @NotBlank(message = "打卡是否有效不能为空") private String effectiveFlag; + /** + *是否提交为内容待审核状态 + */ + private Boolean isConReview = false; + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java index cb1548091..2cecfc131 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java @@ -130,6 +130,8 @@ public class ApiActUserRelationController { ValidatorUtils.validateEntity(epdcAppActUserClockLogDTO); AppActUserClockLogDTO appActUserClockLogDTO = ConvertUtils.sourceToTarget(epdcAppActUserClockLogDTO, AppActUserClockLogDTO.class); appActUserClockLogDTO.setUserId(tokenDto.getUserId()); + appActUserClockLogDTO.setUsername(tokenDto.getNickname()); + appActUserClockLogDTO.setDeptId(tokenDto.getGridId()); return actUserRelationService.activityClock(appActUserClockLogDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java index d9163414b..8edab3246 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java @@ -42,6 +42,7 @@ public class CommentServiceImpl implements CommentService { commentFormDTO.setUserId(userDetail.getUserId()); commentFormDTO.setUserName(userDetail.getNickname()); commentFormDTO.setUserFace(userDetail.getFaceImg()); + commentFormDTO.setDeptId(userDetail.getGridId()); SubmitCommentFormDTO submitCommentFormDTO = ConvertUtils.sourceToTarget(commentFormDTO, SubmitCommentFormDTO.class); if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { submitCommentFormDTO.setPartyFlag(YesOrNoEnum.YES.value()); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java index e7e2f72fa..e453ffa98 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java @@ -52,6 +52,8 @@ public class ItemServiceImpl implements ItemService { return new Result().error("获取用户信息失败"); } evaluationFormDTO.setUserId(userDetail.getUserId()); + evaluationFormDTO.setUserName(userDetail.getNickname()); + evaluationFormDTO.setDeptId(userDetail.getGridId()); return itemFeignClient.evaluation(evaluationFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicCommentServiceImpl.java index e3eededb8..6c9290caa 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicCommentServiceImpl.java @@ -40,6 +40,7 @@ public class TopicCommentServiceImpl implements TopicCommentService { topicCommentFormDTO.setUserId(userDetail.getUserId()); topicCommentFormDTO.setUserName(userDetail.getNickname()); topicCommentFormDTO.setUserFace(userDetail.getFaceImg()); + topicCommentFormDTO.setDeptId(userDetail.getGridId()); if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { topicCommentFormDTO.setPartyFlag(YesOrNoEnum.YES.value()); } else { diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java index 0a5e55ecc..a6044fcbf 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/CheckRecordsDTO.java @@ -156,4 +156,14 @@ public class CheckRecordsDTO implements Serializable { private List imgUrls; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 所有部门 + */ + private String allDeptNames; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsRecordsDTO.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsRecordsDTO.java index a3bf1dc25..50b2497d2 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsRecordsDTO.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-client/src/main/java/com/elink/esua/epdc/dto/ViolationsRecordsDTO.java @@ -112,6 +112,14 @@ public class ViolationsRecordsDTO implements Serializable { private List imgUrls; + /** + * 部门名称 + */ + private String deptName; + /** + * 所有部门 + */ + private String allDeptNames; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java index b47da115d..48972f32d 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/CheckRecordsEntity.java @@ -113,4 +113,29 @@ public class CheckRecordsEntity extends BaseEpdcEntity { */ private String allPass; + /** + * 部门ID + */ + private Long deptId; + /** + * 部门名称 + */ + private String deptName; + /** + * 父所有部门ID + */ + private String parentDeptIds; + /** + * 父所有部门 + */ + private String parentDeptNames; + /** + * 所有部门ID + */ + private String allDeptIds; + /** + * 所有部门 + */ + private String allDeptNames; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java index 6518bf5c1..4dbf01969 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/entity/ViolationsRecordsEntity.java @@ -108,4 +108,30 @@ public class ViolationsRecordsEntity extends BaseEpdcEntity { */ private BigDecimal rate; + + /** + * 部门ID + */ + private Long deptId; + /** + * 部门名称 + */ + private String deptName; + /** + * 父所有部门ID + */ + private String parentDeptIds; + /** + * 父所有部门 + */ + private String parentDeptNames; + /** + * 所有部门ID + */ + private String allDeptIds; + /** + * 所有部门 + */ + private String allDeptNames; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java index c5aac96a8..5fdc29653 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/java/com/elink/esua/epdc/service/impl/ViolationsRecordsServiceImpl.java @@ -57,8 +57,6 @@ public class ViolationsRecordsServiceImpl extends BaseServiceImpl page(Map params) { -// params.put("deptIdList", SecurityUser.getUser().getDeptIdList()); -// params.put("creatUser",SecurityUser.getUser().getId()); IPage page = getPage(params); List list = baseDao.getViolationsRecord(params); return new PageData<>(list, page.getTotal()); diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml index 5bd20a1fc..9df1fd12b 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/CheckRecordsDao.xml @@ -38,7 +38,9 @@ st.DESCRIPTION as SUGGESTION, st.code as suggestionCode, date_format(ecr.CREATED_TIME,'%Y-%m-%d %H:%i') as CREATED_TIME, - date_format(ecr.AUDIT_TIME,'%Y-%m-%d %H:%i') as AUDIT_TIME + date_format(ecr.AUDIT_TIME,'%Y-%m-%d %H:%i') as AUDIT_TIME, + ecr.DEPT_NAME, + ecr.ALL_DEPT_NAMES FROM `epdc_check_records` ecr left join epdc_check_code mo on ecr.MODULE=mo.`CODE` left join epdc_check_code la on ecr.LABEL=la.`CODE` diff --git a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml index 6e1b8ff94..68b174aed 100644 --- a/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml +++ b/esua-epdc/epdc-module/epdc-content-security/epdc-content-security-server/src/main/resources/mapper/ViolationsRecordsDao.xml @@ -35,7 +35,9 @@ la.DESCRIPTION as label, IF(evr.DECISION='1','系统判定','人工审核') decision, date_format(evr.CREATED_TIME,'%Y-%m-%d %H:%i') as CREATED_TIME, - date_format(evr.AUDIT_TIME,'%Y-%m-%d %H:%i') as AUDIT_TIME + date_format(evr.AUDIT_TIME,'%Y-%m-%d %H:%i') as AUDIT_TIME, + evr.DEPT_NAME, + evr.ALL_DEPT_NAMES FROM `epdc_violations_records` evr left join epdc_check_code mo on evr.MODULE=mo.`CODE` left join epdc_check_code la on evr.LABEL=la.`CODE` diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java index e846e9c26..356bea170 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java @@ -48,4 +48,14 @@ public class CommentFormDTO { */ private String userFace; + /** + *是否提交为内容待审核状态 + */ + private Boolean isConReview = false; + + + /** + * 部门id + */ + private Long deptId; } 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..b5ca09130 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,14 @@ public class SubmitCommentFormDTO implements Serializable { * 党员标识（0-否，1-是） */ private String partyFlag; + + /** + *是否提交为内容待审核状态 + */ + private Boolean isConReview = false; + + /** + * 部门id + */ + private Long deptId; } 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..7b889112d 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 = false; } 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..438c6ce3b 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,19 @@ public class EvaluationFormDTO implements Serializable { private String userId; + /** + *是否提交为内容待审核状态 + */ + private Boolean isConReview = false; + + /** + * 昵称 + */ + private String userName; + + /** + * 部门id + */ + private Long deptId; + } 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 0e9a869f3..a60b10b92 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 @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; import com.elink.esua.epdc.commons.tools.security.content.ModuleName; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO; @@ -49,6 +50,7 @@ import com.elink.esua.epdc.modules.comment.entity.EventCommentEntity; import com.elink.esua.epdc.modules.comment.service.EventCommentService; import com.elink.esua.epdc.modules.comment.service.EventCommentUserAttitudeService; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; +import com.elink.esua.epdc.modules.feign.AdminFeignClient; import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; import com.elink.esua.epdc.modules.feign.UserFeignClient; import com.elink.esua.epdc.modules.issue.entity.IssueEntity; @@ -100,6 +102,9 @@ public class EventCommentServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -156,6 +161,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); textList.add(commentFormDTO.getContent()); String mobile = null; @@ -163,15 +169,17 @@ public class EventCommentServiceImpl extends BaseServiceImpl { * @Author: liuchuang * @Date: 2019/9/8 16:52 */ - EpdcEventsEntity saveEvent(EpdcEventSubmitFormDTO dto); + Result saveEvent(EpdcEventSubmitFormDTO dto); void update(EpdcEventsDTO dto); 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 47672cfa4..7f4d2fe69 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 @@ -23,12 +23,12 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; -import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; import com.elink.esua.epdc.commons.tools.security.content.ModuleName; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO; @@ -171,20 +171,23 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); textList.add(dto.getEventContent()); + // 获取所有上级机构名称和ID拼接 + ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(dto.getGridId()).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, - dto.getImages(), null,contentResult, imgResult,null,dto.getMobile(),"0"); + dto.getImages(), null,contentResult, imgResult,null,dto.getMobile(),"0",deptDto); contentSecurityFeign.insertViolationsRecord(record); - throw new RenException(CheckDataUtils.violations_message); -// return new Result().error(CheckDataUtils.violations_message); + return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message); } EpdcEventsEntity entity = ConvertUtils.sourceToTarget(dto, EpdcEventsEntity.class); @@ -200,25 +203,30 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl().ok(entity); } @Override @@ -541,7 +549,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl eventsEntityResult = this.saveEvent(dto); + EpdcEventsEntity eventsEntity = eventsEntityResult.getData(); // 保存议题 IssueEntity issueEntity = this.initIssueEntity(eventsEntity); issueService.insert(issueEntity); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java index ce29951be..ff6d4d9c8 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.modules.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.DeptGridPlatformDTO; @@ -102,4 +103,16 @@ public interface AdminFeignClient { */ @GetMapping(value="sys/dept/getDeptTypeKey", consumes = MediaType.APPLICATION_JSON_VALUE) Result getDeptTypeKey(@RequestParam("deptId") Long deptId); + + + /** + * 根据部门ID获取所有上级机构名称和ID拼接 + * + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author lipengfei + * @date 2019/11/27 09:31 + */ + @GetMapping("sys/dept/getParentAndAllDept/{deptId}") + Result getParentAndAllDept(@PathVariable("deptId") Long deptId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java index 5d923aba6..ba418eab4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.modules.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CompleteDeptDTO; @@ -59,4 +60,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result getDeptTypeKey(Long deptId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTypeKey",deptId); } + + @Override + public Result getParentAndAllDept(Long deptId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId); + } } 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 bdfcdf16f..281593c04 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 @@ -32,6 +32,7 @@ import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; import com.elink.esua.epdc.commons.tools.security.content.ModuleName; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO; @@ -316,26 +317,25 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (itemEntityResult.getUserId().equals(evaluationFormDTO.getUserId()) && itemEntityResult.getEvaluationScore() == null) { //内容审核 - String userName = null; - if(null != SecurityUser.getUser()){ - userName = SecurityUser.getUser().getUsername(); - } + Boolean isConReview = evaluationFormDTO.getIsConReview(); String mobile = null; Result user = userInfoFeignClient.getUserInfoById(evaluationFormDTO.getUserId()); if(null != user.getData()){ mobile = user.getData().getMobile(); } + // 获取所有上级机构名称和ID拼接 + ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(evaluationFormDTO.getDeptId()).getData(); List 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, + evaluationFormDTO.getUserName(),CheckDataUtils.cate_two , CheckDataUtils.decision_one, ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult, - null,null,mobile,"0"); + null,null,mobile,"0",deptDto); contentSecurityFeign.insertViolationsRecord(record); - return new Result().error(CheckDataUtils.violations_message); + return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message); } ItemEntity itemEntity = new ItemEntity(); @@ -346,22 +346,27 @@ public class ItemServiceImpl extends BaseServiceImpl 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"); - contentSecurityFeign.insertRecords(record); + evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList, + null, itemEntity.getId(),null,null, null,mobile,"1",deptDto); + contentSecurityFeign.insertRecords(record); } //判断是否为待审核 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(), - userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, - null,itemEntity.getId(), null,null,twoTypes,mobile,"0"); - contentSecurityFeign.insertRecords(record); + evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, + null,itemEntity.getId(), null,null,twoTypes,mobile,"0",deptDto); + contentSecurityFeign.insertRecords(record); } } return new Result(); 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..136dc5e10 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,14 @@ public class TopicCommentFormDTO { */ private String partyFlag; + /** + *是否提交为内容待审核状态 + */ + private Boolean isConReview = false; + + /** + * 部门id + */ + private Long deptId; + } 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..362e55c05 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 = false; + } 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 b23a78071..5e799a5e8 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 @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; import com.elink.esua.epdc.commons.tools.security.content.ModuleName; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO; @@ -41,6 +42,7 @@ import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.comment.dao.TopicCommentDao; import com.elink.esua.epdc.modules.comment.entity.TopicCommentEntity; import com.elink.esua.epdc.modules.comment.service.TopicCommentService; +import com.elink.esua.epdc.modules.feign.AdminFeignClient; import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; import com.elink.esua.epdc.modules.feign.UserFeignClient; import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO; @@ -79,6 +81,9 @@ public class TopicCommentServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); textList.add(commentFormDTO.getContent()); String mobile = null; @@ -144,15 +150,17 @@ public class TopicCommentServiceImpl extends BaseServiceImpl + * @author lipengfei + * @date 2019/11/27 09:31 + */ + @GetMapping("sys/dept/getParentAndAllDept/{deptId}") + Result getParentAndAllDept(@PathVariable("deptId") Long deptId); +} diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/AdminFeignClientFallback.java new file mode 100644 index 000000000..57203d7d7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/AdminFeignClientFallback.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.modules.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.modules.feign.AdminFeignClient; +import org.springframework.stereotype.Component; + + +/** + * @author yujintao + * @email yujintao@elink-cn.com + * @date 2019/9/7 9:30 + */ +@Component +public class AdminFeignClientFallback implements AdminFeignClient { + + + @Override + public Result getParentAndAllDept(Long deptId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId); + } + + +} 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 74337515b..c61c43330 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 @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; import com.elink.esua.epdc.commons.tools.security.content.ModuleName; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO; @@ -57,6 +58,7 @@ import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO; import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.async.TopicChangeToIssueTask; import com.elink.esua.epdc.modules.comment.service.TopicCommentService; +import com.elink.esua.epdc.modules.feign.AdminFeignClient; import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; import com.elink.esua.epdc.modules.feign.EventFeignClient; import com.elink.esua.epdc.modules.group.service.GroupService; @@ -123,6 +125,9 @@ public class TopicServiceImpl extends BaseServiceImpl imp @Autowired private TopicImgDao topicImgDao; + @Autowired + private AdminFeignClient adminFeignClient; + private static final Logger logger = LoggerFactory.getLogger(TopicServiceImpl.class); @Override @@ -198,17 +203,21 @@ public class TopicServiceImpl extends BaseServiceImpl imp @Transactional(rollbackFor = Exception.class) public Result saveTopic(TopicSubmitFormDTO formDto) { //内容审核 + Boolean isConReview = formDto.getIsConReview(); List textList = new ArrayList<>(); textList.add(formDto.getTopicContent()); + // 获取所有上级机构名称和ID拼接 + ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(formDto.getGridId()).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, - formDto.getImages(), null,contentResult, imgResult,null,formDto.getMobile(),"0"); + formDto.getImages(), null,contentResult, imgResult,null,formDto.getMobile(),"0",deptDto); contentSecurityFeign.insertViolationsRecord(record); - return new Result().error(CheckDataUtils.violations_message); + return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message); } TopicEntity entity = ConvertUtils.sourceToTarget(formDto, TopicEntity.class); @@ -236,21 +245,26 @@ public class TopicServiceImpl extends BaseServiceImpl 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"); - contentSecurityFeign.insertRecords(record); + formDto.getImages(), entity.getId(),null,null, null,formDto.getMobile(),"1",deptDto); + contentSecurityFeign.insertRecords(record); } //保存待审核记录 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(), formDto.getNickname(), CheckDataUtils.cate_two, null,ModuleName.GROUP_TOPIC.getCode(), textList, - formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0"); - contentSecurityFeign.insertRecords(record); + formDto.getImages(), entity.getId(),null,null, twoTypes,formDto.getMobile(),"0",deptDto); + contentSecurityFeign.insertRecords(record); } } 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..3e3f25734 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 = false; } \ 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..0937b83a2 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,19 @@ public class AppActUserClockLogDTO implements Serializable { @NotBlank(message = "打卡是否有效不能为空") private String effectiveFlag; + /** + *是否提交为内容待审核状态 + */ + private Boolean isConReview = false; + + /** + * 用户姓名 + */ + private String username; + + /** + * 部门id + */ + private Long deptId; + } 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 fb7b2657d..3df781d4e 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 @@ -35,6 +35,7 @@ import com.elink.esua.epdc.commons.tools.constant.StrConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; import com.elink.esua.epdc.commons.tools.security.content.ModuleName; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO; @@ -57,6 +58,7 @@ import com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity; import com.elink.esua.epdc.modules.activity.service.ActBannerService; import com.elink.esua.epdc.modules.activity.service.ActInfoService; import com.elink.esua.epdc.modules.async.NewsTask; +import com.elink.esua.epdc.modules.feign.AdminFeignClient; import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; import com.elink.esua.epdc.modules.feign.JobFeignClient; import com.elink.esua.epdc.modules.feign.UserInfoFeignClient; @@ -98,6 +100,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl imgList = new ArrayList<>(); imgList.add(dto.getHeadPic()); imgList.add(dto.getBannerUrl()); - CheckResultDTO contentResult = CheckDataUtils.checkContent(imgList); + // 获取所有上级机构名称和ID拼接 + 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, - imgList, null,contentResult, imgResult,null,dto.getTel(),"0"); + imgList, null,contentResult, imgResult,null,dto.getTel(),"0",deptDto); contentSecurityFeign.insertViolationsRecord(record); - return new Result().error(CheckDataUtils.violations_message); + return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message); } ActInfoEntity entity = ConvertUtils.sourceToTarget(dto, ActInfoEntity.class); @@ -173,28 +181,34 @@ public class ActInfoServiceImpl extends BaseServiceImpl queryMap = new HashMap<>(); + queryMap.put("ACT_USER_ID",actUserClockLogEntity.getActUserId()); + List actUserClockLogEntities = actUserClockLogDao.selectByMap(queryMap); + if(actUserClockLogEntities.size()==1){ + ActUserRelationEntity actUserRelationEntity = new ActUserRelationEntity(); + actUserRelationEntity.setId(actUserClockLogEntity.getActUserId()); + actUserRelationEntity.setStatus("1"); + actUserRelationDao.updateById(actUserRelationEntity); + } actUserClockLogDao.rejectActClockInfo(dto.getRelationId()); actClockPicDao.rejectActClockPicInfo(dto.getRelationId()); 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/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 21644cdc3..85f3057c6 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 @@ -34,10 +34,10 @@ import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; import com.elink.esua.epdc.commons.tools.security.content.ModuleName; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO; -import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -55,6 +55,7 @@ import com.elink.esua.epdc.modules.activity.entity.ActUserClockLogEntity; import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity; import com.elink.esua.epdc.modules.activity.service.*; import com.elink.esua.epdc.modules.async.NewsTask; +import com.elink.esua.epdc.modules.feign.AdminFeignClient; import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; import com.elink.esua.epdc.modules.feign.PointsFeignClient; import com.elink.esua.epdc.modules.feign.UserInfoFeignClient; @@ -103,6 +104,9 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl user = userInfoFeignClient.getUserInfoById(appActUserClockLogDTO.getUserId()); if(null != user.getData()){ mobile = user.getData().getMobile(); } + // 获取所有上级机构名称和ID拼接 + ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(appActUserClockLogDTO.getDeptId()).getData(); List textList = new ArrayList<>(); 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, - appActUserClockLogDTO.getImages(), null,contentResult, imgResult,null,mobile,"0"); + appActUserClockLogDTO.getUsername(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.HELP_SIGNIN.getCode(), textList, + appActUserClockLogDTO.getImages(), null,contentResult, imgResult,null,mobile,"0",deptDto); contentSecurityFeign.insertViolationsRecord(record); - return new Result().error(CheckDataUtils.violations_message); + return new Result().error(CheckDataUtils.violations_code,CheckDataUtils.violations_message); } //查询人员活动关系Id(可打卡的) List statusList = new ArrayList<>(); @@ -361,20 +365,25 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl + * @author lipengfei + * @date 2019/11/27 09:31 + */ + @GetMapping("sys/dept/getParentAndAllDept/{deptId}") + Result getParentAndAllDept(@PathVariable("deptId") Long deptId); + + +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java new file mode 100644 index 000000000..57203d7d7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.modules.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.modules.feign.AdminFeignClient; +import org.springframework.stereotype.Component; + + +/** + * @author yujintao + * @email yujintao@elink-cn.com + * @date 2019/9/7 9:30 + */ +@Component +public class AdminFeignClientFallback implements AdminFeignClient { + + + @Override + public Result getParentAndAllDept(Long deptId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId); + } + + +}