居民端话题转议题

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.result.FirstTopicShiftedToIssueApplicationResultDTO;
 import com.epmet.modules.topic.service.ResiTopicService;
 import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO;
 import com.epmet.resi.group.dto.topic.ResiTopicDTO;
@@ -236,6 +237,35 @@ public class ResiTopicController {
         return new Result();
     }
 
+    /**
+     * @Description 话题转议题
+     * @param topicTurnIssueFromDTO
+     * @param tokenDto
+     * @author wangc
+     * @date 2020.05.13 19:08
+     **/
+    @PostMapping("turnintoissuev2")
+    public Result<FirstTopicShiftedToIssueApplicationResultDTO> turnIntoIssueV2(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicTurnIssueFromDTO topicTurnIssueFromDTO){
+        topicTurnIssueFromDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(topicTurnIssueFromDTO);
+        return new Result<FirstTopicShiftedToIssueApplicationResultDTO>().ok(topicService.shiftIssueV2(topicTurnIssueFromDTO));
+    }
+    
+    /**
+     * @Description 话题转议题-重新编辑提交
+     * @param tokenDto
+     * @param param
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.FirstTopicShiftedToIssueApplicationResultDTO>
+     * @author wangc
+     * @date 2020.11.20 14:19
+    */
+    @PostMapping("editissueapplication")
+    public Result<FirstTopicShiftedToIssueApplicationResultDTO> editIssueApplication(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicTurnIssueFromDTO param){
+        param.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(param);
+        return new Result<FirstTopicShiftedToIssueApplicationResultDTO>().ok(topicService.shiftIssueV2(param));
+    }
+
     /**
      * @Description 政府端查看议题详情时的话题相关信息
      * @param govTopicIssueInfoFormDTO

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

@@ -1457,8 +1457,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 
             result = issueResult.getData();
             ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.SwitchRequiredGroup.class);
-            if(StringUtils.equals("close",result.getAuditSwitch()))ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.ForbidAuditionGroup.class);else ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.AllowAuditionGroup.class);
+            if(StringUtils.equals("close",result.getAuditSwitch())) {
-
+                ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.ForbidAuditionGroup.class);
                 //5.修改话题shiftIssue字段
                 ResiTopicEntity topic2Upd = new ResiTopicEntity();
                 topic2Upd.setId(topicTurnIssueFromDTO.getTopicId());
@@ -1488,8 +1488,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                     );
                     resiGroupRedis.set(groupCache);
                 }
-
             }
+            else {
+                ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.AllowAuditionGroup.class);
+            }
+
+        }else throw new RenException(dataFilterResult.getMsg());
 
         return result;