Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -138,7 +138,10 @@ public enum EpmetErrorCode {
 	GROUP_NOT_EXISTS(9001,"该组不存在"),
 	GROUP_IN_AUDITING(9002,"该组已提交编辑，处于待审核状态，完成审核前不可再次提交"),
 	GROUP_EDIT_NUM_LIMITED(9003,"已达编辑次数上限"),
-	TOPIC_SHIFTED_TO_ISSUE_UNDER_AUDITING(9004,"当前话题正在转议题审核");
+	TOPIC_SHIFTED_TO_ISSUE_UNDER_AUDITING(9004,"当前话题正在转议题审核"),
+    TOPIC_ALREADY_SHIFTED_TO_ISSUE(9005,"该话题已被转为议题，请勿重复操作"),
+    TOPIC_IS_HIDDEN(9006,"该话题已被屏蔽，请先解除屏蔽"),
+    TOPIC_IS_CLOSED(9008,"该话题已关闭，无法转为议题");
 
 
 	private int code;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1259,8 +1259,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             logger.error(ModuleConstant.NO_SUCH_TOPIC);
             throw new RenException(ModuleConstant.NO_SUCH_TOPIC);
         }else if(topic.getShiftIssue() || StringUtils.isNotBlank(topic.getIssueId()) || !StringUtils.equals(ModuleConstant.TOPIC_STATUS_DISCUSSING,topic.getStatus())){
-            logger.error(ModuleConstant.CURRENT_TOPIC_COULD_NOT_TURN_TO_ISSUE);
+            throw new RenException(EpmetErrorCode.TOPIC_ALREADY_SHIFTED_TO_ISSUE.getCode());
-            throw new RenException(ModuleConstant.CURRENT_TOPIC_COULD_NOT_TURN_TO_ISSUE);
+        }else if(StringUtils.equals(ModuleConstant.TOPIC_STATUS_HIDDEN,topic.getStatus())){
+            throw new RenException(EpmetErrorCode.TOPIC_IS_HIDDEN.getCode());
+        }else if(StringUtils.equals(ModuleConstant.TOPIC_STATUS_CLOSED,topic.getStatus())){
+            throw new RenException(EpmetErrorCode.TOPIC_IS_CLOSED.getCode());
         }
         //2.通过话题找组信息，得到该组组长信息与当前用户进行对比
         ResiGroupMemberInfoRedisDTO member =
@@ -1437,6 +1440,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      */
     @Override
     public FirstTopicShiftedToIssueApplicationResultDTO shiftIssueV2(ResiTopicTurnIssueFromDTO topicTurnIssueFromDTO) {
+
+
         //话题转议题审核：标题、建议
         String issueTitle = topicTurnIssueFromDTO.getIssueTitle();
         String suggestion = topicTurnIssueFromDTO.getSuggestion();

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_STATUS_HIDDEN = "hidden";
+
 	/**
 	 * 话题转议题正在审核中
 	 */