From 1999f351586f54704035993695a61a0279400787 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 30 Nov 2020 14:32:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E4=BA=8E=E3=80=90=E5=BE=85=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91=E7=8A=B6=E6=80=81=E8=BD=AC=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E7=9A=84=E8=AF=9D=E9=A2=98=E9=83=BD=E4=B8=8D=E5=8F=AF=E5=B1=8F?= =?UTF-8?q?=E8=94=BD=E3=80=81=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 3 +- .../service/IssueApplicationService.java | 2 +- .../impl/IssueApplicationServiceImpl.java | 9 +++++- .../resources/mapper/IssueApplicationDao.xml | 1 + .../service/impl/ResiTopicServiceImpl.java | 32 +++++++++++++++++++ .../epmet/modules/utils/ModuleConstant.java | 5 +++ 6 files changed, 49 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index e6222a10e1..4422f6c1ed 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -135,7 +135,8 @@ public enum EpmetErrorCode { GROUP_EDIT_ERROR(9000,"组信息编辑失败"), GROUP_NOT_EXISTS(9001,"该组不存在"), GROUP_IN_AUDITING(9002,"该组已提交编辑，处于待审核状态，完成审核前不可再次提交"), - GROUP_EDIT_NUM_LIMITED(9003,"已达编辑次数上限"); + GROUP_EDIT_NUM_LIMITED(9003,"已达编辑次数上限"), + TOPIC_SHIFTED_TO_ISSUE_UNDER_AUDITING(9004,"当前话题正在转议题审核"); private int code; diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java index 2ece400620..6c2df1b318 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java @@ -55,7 +55,7 @@ public interface IssueApplicationService extends BaseService * @author generator diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java index 40c4993f92..71e62d3e1f 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java @@ -65,9 +65,16 @@ public class IssueApplicationServiceImpl extends BaseServiceImpl + * @author wangc + * @date 2020.11.30 09:53 + */ @Override public List list(Map params) { - //List entityList = baseDao.selectByTopicId(getWrapper(params)); + //List entityList = baseDao.selectList(getWrapper(params)); return baseDao.selectByTopicId((String)params.get(ModuleConstants.FIELD_JAVA_TOPIC_ID)); //return ConvertUtils.sourceToTarget(entityList, IssueApplicationDTO.class); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml index b62639e121..3d94af1c56 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml @@ -70,5 +70,6 @@ FROM issue_application WHERE DEL_FLAG = '0' AND TOPIC_ID = #{topicId} + ORDER BY CREATED_TIME DESC \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index c066e4a4ec..99ad8940fa 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -498,6 +498,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl params = new HashMap<>(); + params.put(ModuleConstant.FILED_TOPIC_ID_HUMP,topicId); + Result> reply = issueOpenFeignClient.list(params); + if(reply.success()){ + if(!CollectionUtils.isEmpty(reply.getData())){ + List applications = reply.getData(); + + return StringUtils.equals(ModuleConstant.TOPIC_SHIFTED_TO_ISSUE_STATUS_UNDER_AUDITING,applications.get(NumConstant.ZERO).getApplyStatus()) ? true : false; + }else return false; + } + log.error("Method [checkTopicIfUnderAuditing] of service gov-issue called failed,topicId is [%s]",topicId); + throw new RenException(reply.getInternalMsg()); + } + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java index dd235abc8c..3c7ed1387a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java @@ -262,6 +262,11 @@ public interface ModuleConstant extends Constant { * */ String TOPIC_STATUS_DISCUSSING = "discussing"; + /** + * 话题转议题正在审核中 + */ + String TOPIC_SHIFTED_TO_ISSUE_STATUS_UNDER_AUDITING = "under_auditing"; + /** * 话题操作记录状态- 转议题 * */