From 9f73be0db07ad7e30648761f70650dbf0bc52eb5 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 20 Nov 2020 14:55:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E8=AF=9D=E9=A2=98?=
 =?UTF-8?q?=E8=BD=AC=E8=AE=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../topic/form/ResiTopicTurnIssueFromDTO.java |  8 +--
 .../topic/controller/ResiTopicController.java | 30 +++++++++
 .../service/impl/ResiTopicServiceImpl.java    | 64 ++++++++++---------
 3 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicTurnIssueFromDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicTurnIssueFromDTO.java
index 2800af1736..6238190998 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicTurnIssueFromDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicTurnIssueFromDTO.java
@@ -18,24 +18,24 @@ public class ResiTopicTurnIssueFromDTO implements Serializable {
     /**
      * 议题名称
      * */
-    @NotBlank(message = "议题名称不能为空")
+    @NotBlank(message = "议题名称不能为空" )
     private String issueTitle;
 
     /**
      * 话题Id
      * */
-    @NotBlank(message = "话题Id不能为空")
+    @NotBlank(message = "话题Id不能为空" )
     private String topicId;
 
     /**
      * 建议
      * */
-    @NotBlank(message = "建议不能为空")
+    @NotBlank(message = "建议不能为空" )
     private String suggestion;
 
     /**
      * 用户Id
      * */
-    @NotBlank(message = "用户Id不能为空")
+    @NotBlank(message = "用户Id不能为空" )
     private String userId;
 }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
index 4c7d08ba93..0015e79113 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
+++ b/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
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 9a26415681..3023465da1 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
@@ -1457,39 +1457,43 @@ 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);
-
-            //5.修改话题shiftIssue字段
-            ResiTopicEntity topic2Upd = new ResiTopicEntity();
-            topic2Upd.setId(topicTurnIssueFromDTO.getTopicId());
-            topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId());
-            topic2Upd.setShiftIssue(Boolean.TRUE);
-            topic2Upd.setIssueId(issueResult.getData().getIssueId());
-            topic2Upd.setUpdatedTime(now);
-            int topicResult = baseDao.updateOne(topic2Upd);
-            //6.新增话题操作记录
-            if (topicResult == NumConstant.ONE) {
-                ResiTopicOperationEntity operation = new ResiTopicOperationEntity();
-                operation.setCreatedTime(now);
-                operation.setCreatedBy(topicTurnIssueFromDTO.getUserId());
-                operation.setTopicId(topicTurnIssueFromDTO.getTopicId());
-                operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
-                int operationResult = resiTopicOperationDao.insertOneByParams(operation);
-                if (operationResult != NumConstant.ONE) {
-                    logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
+            if(StringUtils.equals("close",result.getAuditSwitch())) {
+                ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.ForbidAuditionGroup.class);
+                //5.修改话题shiftIssue字段
+                ResiTopicEntity topic2Upd = new ResiTopicEntity();
+                topic2Upd.setId(topicTurnIssueFromDTO.getTopicId());
+                topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId());
+                topic2Upd.setShiftIssue(Boolean.TRUE);
+                topic2Upd.setIssueId(issueResult.getData().getIssueId());
+                topic2Upd.setUpdatedTime(now);
+                int topicResult = baseDao.updateOne(topic2Upd);
+                //6.新增话题操作记录
+                if (topicResult == NumConstant.ONE) {
+                    ResiTopicOperationEntity operation = new ResiTopicOperationEntity();
+                    operation.setCreatedTime(now);
+                    operation.setCreatedBy(topicTurnIssueFromDTO.getUserId());
+                    operation.setTopicId(topicTurnIssueFromDTO.getTopicId());
+                    operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
+                    int operationResult = resiTopicOperationDao.insertOneByParams(operation);
+                    if (operationResult != NumConstant.ONE) {
+                        logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
+                    }
+                } else logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
+                //7.更新组统计信息 议题数量+1
+                resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
+                if (null != groupCache && null != groupCache.getGroupStatisticalInfo()) {
+                    groupCache.getGroupStatisticalInfo().setTotalIssues(
+                            null == groupCache.getGroupStatisticalInfo().getTotalIssues() ? NumConstant.ONE
+                                    : groupCache.getGroupStatisticalInfo().getTotalIssues() + NumConstant.ONE
+                    );
+                    resiGroupRedis.set(groupCache);
                 }
-            } else logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
-            //7.更新组统计信息 议题数量+1
-            resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
-            if (null != groupCache && null != groupCache.getGroupStatisticalInfo()) {
-                groupCache.getGroupStatisticalInfo().setTotalIssues(
-                        null == groupCache.getGroupStatisticalInfo().getTotalIssues() ? NumConstant.ONE
-                                : groupCache.getGroupStatisticalInfo().getTotalIssues() + NumConstant.ONE
-                );
-                resiGroupRedis.set(groupCache);
+            }
+            else {
+                ValidatorUtils.validateEntity(result, FirstTopicShiftedToIssueApplicationResultDTO.AllowAuditionGroup.class);
             }
 
-        }
+        }else throw new RenException(dataFilterResult.getMsg());
 
         return result;