From 8abfb1b9b09c557058c02e89edb16c49ce18c22f Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 24 Jul 2020 17:30:18 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E3=80=91-=EF=BC=88?= =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/07/24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/entity/CheckRecordsEntity.java | 25 ++++++++++++++++++ .../epdc/entity/ViolationsRecordsEntity.java | 26 +++++++++++++++++++ 2 files changed, 51 insertions(+) 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..4abe0c5a5 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 String 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..a8cb0a7bb 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 String deptId; + /** + * 部门名称 + */ + private String deptName; + /** + * 父所有部门ID + */ + private String parentDeptIds; + /** + * 父所有部门 + */ + private String parentDeptNames; + /** + * 所有部门ID + */ + private String allDeptIds; + /** + * 所有部门 + */ + private String allDeptNames; + } \ No newline at end of file From 7c7471ae43e4a0409505a0aef0fa7cb834997994 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 30 Jul 2020 14:02:58 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E9=83=A8=E9=97=A8=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9=E3=80=91-=EF=BC=88=E7=8E=8B?= =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/07/30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/entity/CheckRecordsEntity.java | 2 +- .../com/elink/esua/epdc/entity/ViolationsRecordsEntity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 4abe0c5a5..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 @@ -116,7 +116,7 @@ public class CheckRecordsEntity extends BaseEpdcEntity { /** * 部门ID */ - private String deptId; + private Long deptId; /** * 部门名称 */ 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 a8cb0a7bb..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 @@ -112,7 +112,7 @@ public class ViolationsRecordsEntity extends BaseEpdcEntity { /** * 部门ID */ - private String deptId; + private Long deptId; /** * 部门名称 */ From db8007f192f802d9d4250a84d15e63aea7faa87c Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 31 Jul 2020 13:45:27 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E6=96=B0=E5=A2=9E=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=B1=BB=E5=9E=8B=E3=80=91-=EF=BC=88=E7=8E=8B?= =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/07/31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventCommentServiceImpl.java | 14 ++++++-- .../service/impl/EpdcEventsServiceImpl.java | 9 +++-- .../epdc/modules/feign/AdminFeignClient.java | 13 +++++++ .../fallback/AdminFeignClientFallback.java | 6 ++++ .../item/service/impl/ItemServiceImpl.java | 13 ++++--- .../service/impl/TopicCommentServiceImpl.java | 14 ++++++-- .../modules/feign/AdminFeignClient.java | 30 ++++++++++++++++ .../fallback/AdminFeignClientFallback.java | 26 ++++++++++++++ .../topic/service/impl/TopicServiceImpl.java | 17 ++++++--- .../service/impl/ActInfoServiceImpl.java | 16 ++++++--- .../impl/ActUserClockLogServiceImpl.java | 13 +++++-- .../epdc/modules/feign/AdminFeignClient.java | 35 +++++++++++++++++++ .../fallback/AdminFeignClientFallback.java | 26 ++++++++++++++ 13 files changed, 205 insertions(+), 27 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/AdminFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/feign/fallback/AdminFeignClientFallback.java create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java 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..bac96503e 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,9 +25,11 @@ 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; +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.Result; import com.elink.esua.epdc.constant.EventsNoticeConstant; @@ -49,6 +51,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 +103,9 @@ public class EventCommentServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -163,13 +169,15 @@ public class EventCommentServiceImpl extends BaseServiceImpl 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())){ //组装要保存的信息 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); @@ -203,7 +206,7 @@ public class EpdcEventsServiceImpl 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-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..700325f6d 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; @@ -325,6 +326,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem if(null != user.getData()){ mobile = user.getData().getMobile(); } + // 获取所有上级机构名称和ID拼接 + ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData(); List textList = new ArrayList<>(); textList.add(evaluationFormDTO.getEvaluationContent()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); @@ -333,7 +336,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), userName,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); } @@ -349,8 +352,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem 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); + null, itemEntity.getId(),null,null, null,mobile,"1",deptDto); + contentSecurityFeign.insertRecords(record); } //判断是否为待审核 @@ -360,8 +363,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem //组装要保存的信息 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); + 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-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..e73eb84fc 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,9 +25,11 @@ 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; +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.Result; import com.elink.esua.epdc.dto.UserDTO; @@ -41,6 +43,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 +82,9 @@ 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..615c0ce28 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 @@ -200,13 +205,15 @@ public class TopicServiceImpl extends BaseServiceImpl imp //内容审核 List 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())){ //组装要保存的信息 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); } @@ -239,8 +246,8 @@ public class TopicServiceImpl extends BaseServiceImpl imp 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); + formDto.getImages(), entity.getId(),null,null, null,formDto.getMobile(),"1",deptDto); + contentSecurityFeign.insertRecords(record); } //保存待审核记录 if (contentResult != null && imgResult != null) { @@ -249,8 +256,8 @@ public class TopicServiceImpl extends BaseServiceImpl imp //组装要保存的信息 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-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..0f4e2fbfc 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()); + // 获取所有上级机构名称和ID拼接 + ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData(); CheckResultDTO contentResult = CheckDataUtils.checkContent(imgList); CheckResultDTO imgResult = CheckDataUtils.checkImgs(imgList); if((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); } @@ -176,8 +182,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); textList.add(appActUserClockLogDTO.getClockDesc()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); @@ -321,7 +328,7 @@ 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); + } + + +} From 8925388132bf7c85f04802a1e32ba92448a4779f Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 3 Aug 2020 10:31:47 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E6=B7=BB=E5=8A=A0=E8=BF=9D?= =?UTF-8?q?=E8=A7=84=E8=AE=B0=E5=BD=95=E7=BC=96=E7=A0=81=E3=80=91-?= =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/comment/service/impl/EventCommentServiceImpl.java | 2 +- .../modules/events/service/impl/EpdcEventsServiceImpl.java | 3 +-- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 2 +- .../modules/comment/service/impl/TopicCommentServiceImpl.java | 2 +- .../modules/topic/service/impl/TopicServiceImpl.java | 2 +- .../epdc/modules/activity/service/impl/ActInfoServiceImpl.java | 2 +- .../activity/service/impl/ActUserClockLogServiceImpl.java | 2 +- 7 files changed, 7 insertions(+), 8 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 bac96503e..287be84e6 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 @@ -179,7 +179,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl implem ModuleName.ITEM_SATISFACTION.getCode(), textList,null, null,contentResult, 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(); 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 e73eb84fc..931d45839 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 @@ -160,7 +160,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl imp formDto.getNickname(), CheckDataUtils.cate_two, CheckDataUtils.decision_one, ModuleName.GROUP_TOPIC.getCode(), textList, 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); 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 0f4e2fbfc..9939fdd5e 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 @@ -169,7 +169,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl statusList = new ArrayList<>(); From 8092e0b605c9b30e57494ca7b119ebf667a5bbc1 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 4 Aug 2020 09:09:52 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E5=90=8E=E5=8F=B0=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=B4=BB=E5=8A=A8bug=E4=BF=AE=E6=94=B9=E3=80=91-?= =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activity/service/impl/ActInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9939fdd5e..a225001b2 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 @@ -161,7 +161,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl Date: Tue, 4 Aug 2020 17:09:59 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E5=8A=9F=E8=83=BD=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/?= =?UTF-8?q?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 textList = new ArrayList<>(); textList.add(commentFormDTO.getContent()); String mobile = null; @@ -172,7 +173,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl 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().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 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 implem 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, @@ -349,7 +350,7 @@ 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",deptDto); @@ -358,7 +359,12 @@ public class ItemServiceImpl extends BaseServiceImpl 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 textList = new ArrayList<>(); textList.add(commentFormDTO.getContent()); String mobile = null; @@ -153,7 +154,7 @@ public class TopicCommentServiceImpl 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(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 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 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 Date: Tue, 4 Aug 2020 17:29:51 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E5=8A=9F=E8=83=BD=E5=8D=87?= =?UTF-8?q?=E7=BA=A7-=E5=8F=91=E5=B8=83=E8=AE=AE=E4=BA=8B=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=E3=80=91-=EF=BC=88=E7=8E=8B?= =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/8/4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../events/controller/EpdcAppEventsController.java | 4 ++-- .../modules/events/service/EpdcEventsService.java | 2 +- .../events/service/impl/EpdcEventsServiceImpl.java | 13 +++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java index ecb48316a..16b8a0272 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java @@ -36,8 +36,8 @@ public class EpdcAppEventsController { public Result submitEvent(@RequestBody EpdcEventSubmitFormDTO formDto) { //效验数据 ValidatorUtils.validateEntity(formDto); - epdcEventsService.saveEvent(formDto); - return new Result(); + return epdcEventsService.saveEvent(formDto); +// return new Result(); } /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java index a1724d349..63f5ad863 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java @@ -79,7 +79,7 @@ public interface EpdcEventsService extends BaseService { * @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 4298b0d68..b2b89540b 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,7 +23,6 @@ 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; @@ -172,7 +171,7 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); @@ -188,7 +187,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl().ok(entity); +// return entity; + return new Result().ok(entity); } @Override @@ -552,7 +552,8 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl eventsEntityResult = this.saveEvent(dto); + EpdcEventsEntity eventsEntity = eventsEntityResult.getData(); // 保存议题 IssueEntity issueEntity = this.initIssueEntity(eventsEntity); issueService.insert(issueEntity); From eab752daf4fc8c0b474364946448cea5fdd2939a Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 5 Aug 2020 17:25:04 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E5=90=8E=E5=8F=B0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/dto/CheckRecordsDTO.java | 10 ++++++++++ .../com/elink/esua/epdc/dto/ViolationsRecordsDTO.java | 8 ++++++++ .../service/impl/ViolationsRecordsServiceImpl.java | 2 -- .../src/main/resources/mapper/CheckRecordsDao.xml | 4 +++- .../src/main/resources/mapper/ViolationsRecordsDao.xml | 4 +++- .../events/controller/EpdcAppEventsController.java | 1 - .../events/service/impl/EpdcEventsServiceImpl.java | 1 - 7 files changed, 24 insertions(+), 6 deletions(-) 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/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-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java index 16b8a0272..125b16e35 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java @@ -37,7 +37,6 @@ public class EpdcAppEventsController { //效验数据 ValidatorUtils.validateEntity(formDto); return epdcEventsService.saveEvent(formDto); -// return new Result(); } /** 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 b2b89540b..5582a3899 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 @@ -187,7 +187,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl Date: Wed, 5 Aug 2020 17:38:55 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E5=88=A0=E9=99=A4=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/?= =?UTF-8?q?5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/events/service/impl/EpdcEventsServiceImpl.java | 1 - .../epdc/modules/activity/service/impl/ActInfoServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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 5582a3899..87c8f49ca 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 @@ -226,7 +226,6 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl().ok(entity); } 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 e7596b519..f0f9112a8 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 @@ -205,7 +205,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl Date: Thu, 6 Aug 2020 10:38:52 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E6=95=B4=E5=90=8E=E4=BB=96?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=B4=BB=E5=8A=A8=E6=B3=A8=E9=87=8A=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E3=80=91-=EF=BC=88=E7=8E=8B?= =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/8/6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/activity/service/impl/ActInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f0f9112a8..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 @@ -205,7 +205,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl Date: Thu, 6 Aug 2020 13:46:21 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E5=88=9D=E5=BF=83=E4=BA=92?= =?UTF-8?q?=E5=8A=A9=E5=8F=91=E5=B8=83=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5?= =?UTF-8?q?=EF=BC=89-2020/8/6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/activity/service/impl/ActInfoServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e7596b519..bd81ff656 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 @@ -207,7 +207,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl Date: Thu, 6 Aug 2020 14:30:56 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E5=88=9D=E5=BF=83=E4=BA=92?= =?UTF-8?q?=E5=8A=A9=E5=8F=91=E5=B8=83=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5?= =?UTF-8?q?=EF=BC=89-2020/8/6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/modules/activity/service/impl/ActInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bd81ff656..e9e1df4a2 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 @@ -207,7 +207,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl Date: Thu, 6 Aug 2020 16:58:40 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90isConReview=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E3=80=91-=EF=BC=88=E7=8E=8B?= =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/8/6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/comment/form/SubmitCommentFormDTO.java | 2 +- .../epdc/dto/events/form/EpdcEventSubmitFormDTO.java | 2 +- .../esua/epdc/dto/item/form/EvaluationFormDTO.java | 2 +- .../dto/comment/TopicCommentFormDTO.java | 2 +- .../dto/topic/form/TopicSubmitFormDTO.java | 2 +- .../java/com/elink/esua/epdc/activity/ActInfoDTO.java | 2 +- .../esua/epdc/activity/AppActUserClockLogDTO.java | 2 +- .../service/impl/ActUserClockLogServiceImpl.java | 10 +++++----- 8 files changed, 12 insertions(+), 12 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 c42f41db1..66c3811e3 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 @@ -51,5 +51,5 @@ public class SubmitCommentFormDTO implements Serializable { /** *是否提交为内容待审核状态 */ - private Boolean isConReview; + private Boolean isConReview = false; } 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 8ab6ef1ed..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 @@ -161,5 +161,5 @@ public class EpdcEventSubmitFormDTO implements Serializable { /** *是否提交为内容待审核状态 */ - private Boolean isConReview; + 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 f135222b7..377765308 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 @@ -29,6 +29,6 @@ public class EvaluationFormDTO implements Serializable { /** *是否提交为内容待审核状态 */ - private Boolean isConReview; + private Boolean isConReview = false; } 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 e8b0b027c..2b282249b 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 @@ -53,6 +53,6 @@ public class TopicCommentFormDTO { /** *是否提交为内容待审核状态 */ - private Boolean isConReview; + private Boolean isConReview = false; } 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 65c5873c0..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 @@ -148,6 +148,6 @@ public class TopicSubmitFormDTO implements Serializable { /** *是否提交为内容待审核状态 */ - private Boolean isConReview; + private Boolean isConReview = false; } 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 d01e0784c..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 @@ -218,5 +218,5 @@ public class ActInfoDTO implements Serializable { /** *是否提交为内容待审核状态 */ - private Boolean isConReview; + 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 a42d18ea4..548a238f5 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 @@ -80,6 +80,6 @@ public class AppActUserClockLogDTO implements Serializable { /** *是否提交为内容待审核状态 */ - private Boolean isConReview; + private Boolean isConReview = false; } 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 0b856fa8b..2bcfcf577 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 @@ -379,11 +379,11 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl Date: Thu, 6 Aug 2020 18:15:46 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E5=88=9D=E5=BF=83=E4=BA=92?= =?UTF-8?q?=E5=8A=A9=E6=B4=BB=E5=8A=A8=E6=89=93=E5=8D=A1=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java | 5 +++++ 1 file changed, 5 insertions(+) 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; + } From 4c12648106406e7410a5b34910cba6b21f9f470e Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 6 Aug 2020 18:27:29 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E8=AF=84=E8=AE=BA=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4=E3=80=91-?= =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/comment/form/CommentFormDTO.java | 5 +++++ 1 file changed, 5 insertions(+) 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..d611048b4 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,9 @@ public class CommentFormDTO { */ private String userFace; + /** + *是否提交为内容待审核状态 + */ + private Boolean isConReview = false; + } From d65d8b66f3e71c1979b434bc60840cd40960c441 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 6 Aug 2020 18:44:06 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E6=95=B4=E4=BD=93=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9=E3=80=91-?= =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/07/14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiActUserRelationController.java | 2 ++ .../esua/epdc/activity/AppActUserClockLogDTO.java | 10 ++++++++++ .../service/impl/ActUserClockLogServiceImpl.java | 13 ++++--------- 3 files changed, 16 insertions(+), 9 deletions(-) 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-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 548a238f5..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 @@ -82,4 +82,14 @@ public class AppActUserClockLogDTO implements Serializable { */ 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/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 2bcfcf577..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 @@ -38,7 +38,6 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllD 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; @@ -310,17 +309,13 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl user = userInfoFeignClient.getUserInfoById(appActUserClockLogDTO.getUserId()); if(null != user.getData()){ mobile = user.getData().getMobile(); } // 获取所有上级机构名称和ID拼接 - ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData(); + ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(appActUserClockLogDTO.getDeptId()).getData(); List textList = new ArrayList<>(); textList.add(appActUserClockLogDTO.getClockDesc()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); @@ -329,7 +324,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl Date: Thu, 6 Aug 2020 19:36:29 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90events=E3=80=81group=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=8F=96=E5=80=BC=E6=96=B9=E5=BC=8F=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/CommentServiceImpl.java | 1 + .../esua/epdc/service/impl/ItemServiceImpl.java | 2 ++ .../epdc/service/impl/TopicCommentServiceImpl.java | 1 + .../esua/epdc/dto/comment/form/CommentFormDTO.java | 5 +++++ .../epdc/dto/comment/form/SubmitCommentFormDTO.java | 5 +++++ .../esua/epdc/dto/item/form/EvaluationFormDTO.java | 10 ++++++++++ .../service/impl/EventCommentServiceImpl.java | 3 +-- .../events/service/impl/EpdcEventsServiceImpl.java | 2 +- .../modules/item/service/impl/ItemServiceImpl.java | 12 ++++-------- .../dto/comment/TopicCommentFormDTO.java | 5 +++++ .../service/impl/TopicCommentServiceImpl.java | 3 +-- .../modules/topic/service/impl/TopicServiceImpl.java | 2 +- 12 files changed, 37 insertions(+), 14 deletions(-) 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-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 d611048b4..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 @@ -53,4 +53,9 @@ public class CommentFormDTO { */ 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 66c3811e3..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 @@ -52,4 +52,9 @@ public class SubmitCommentFormDTO implements Serializable { *是否提交为内容待审核状态 */ 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/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 377765308..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 @@ -31,4 +31,14 @@ public class EvaluationFormDTO implements Serializable { */ 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 09af73e1e..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 @@ -29,7 +29,6 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllD 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.Result; import com.elink.esua.epdc.constant.EventsNoticeConstant; @@ -171,7 +170,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl textList = new ArrayList<>(); textList.add(dto.getEventContent()); // 获取所有上级机构名称和ID拼接 - ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData(); + ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(dto.getGridId()).getData(); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); CheckResultDTO imgResult = CheckDataUtils.checkImgs(dto.getImages()); if(!isConReview && 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 bf9e3d215..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 @@ -318,24 +318,20 @@ public class ItemServiceImpl extends BaseServiceImpl implem //内容审核 Boolean isConReview = evaluationFormDTO.getIsConReview(); - String userName = null; - if(null != SecurityUser.getUser()){ - userName = SecurityUser.getUser().getUsername(); - } String mobile = null; Result user = userInfoFeignClient.getUserInfoById(evaluationFormDTO.getUserId()); if(null != user.getData()){ mobile = user.getData().getMobile(); } // 获取所有上级机构名称和ID拼接 - ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData(); + ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(evaluationFormDTO.getDeptId()).getData(); List textList = new ArrayList<>(); textList.add(evaluationFormDTO.getEvaluationContent()); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); 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",deptDto); contentSecurityFeign.insertViolationsRecord(record); @@ -352,7 +348,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem //接口异常，保存至待审核信息 if(contentResult == null && !isConReview) { SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), - userName, CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList, + evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null,ModuleName.ITEM_SATISFACTION.getCode(), textList, null, itemEntity.getId(),null,null, null,mobile,"1",deptDto); contentSecurityFeign.insertRecords(record); } @@ -368,7 +364,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (CheckDataUtils.review.equals(twoTypes.getSuggestion())) { //组装要保存的信息 SaveCheckRecordsDTO record = CheckDataUtils.getPackageRecords(evaluationFormDTO.getUserId(), - userName, CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, + evaluationFormDTO.getUserName(), CheckDataUtils.cate_two, null, ModuleName.ITEM_SATISFACTION.getCode(), textList, null,itemEntity.getId(), null,null,twoTypes,mobile,"0",deptDto); contentSecurityFeign.insertRecords(record); } 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 2b282249b..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 @@ -55,4 +55,9 @@ public class TopicCommentFormDTO { */ private Boolean isConReview = false; + /** + * 部门id + */ + private Long deptId; + } 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 be6542786..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 @@ -29,7 +29,6 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllD 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.Result; import com.elink.esua.epdc.dto.UserDTO; @@ -152,7 +151,7 @@ public class TopicCommentServiceImpl extends BaseServiceImpl imp List textList = new ArrayList<>(); textList.add(formDto.getTopicContent()); // 获取所有上级机构名称和ID拼接 - ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(SecurityUser.getDeptId()).getData(); + ParentAndAllDeptDTO deptDto = adminFeignClient.getParentAndAllDept(formDto.getGridId()).getData(); CheckResultDTO contentResult = CheckDataUtils.checkContent(textList); CheckResultDTO imgResult = CheckDataUtils.checkImgs(formDto.getImages()); if(!isConReview && From 462c46cf5c1d3b39057b924024c69804c5a174f7 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 7 Aug 2020 18:11:54 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E5=88=9D=E5=BF=83=E4=BA=92?= =?UTF-8?q?=E5=8A=A9=E6=89=93=E5=8D=A1=E9=A9=B3=E5=9B=9E=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=91-=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/service/impl/ActInfoServiceImpl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 e9e1df4a2..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 @@ -633,6 +633,17 @@ 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();