议题审核通过后生成相应的议题相关数据

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -256,7 +256,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         issueDTO.setIssueStatus(ModuleConstants.ISSUE_STATUS_VOTING);
         issueDTO.setDecidedTime(issueShiftedFromTopicFormDTO.getCreatedTime());
         int issueAffectedRow = baseDao.insertOne(issueDTO);
-        if(issueAffectedRow == NumConstant.ONE && StringUtils.isNotBlank(issueDTO.getId())){
+
+        if(issueAffectedRow == NumConstant.ONE && (StringUtils.isNotBlank(issueDTO.getId()) || StringUtils.isNotBlank(issueDTO.getIssueId()))){
+          if(StringUtils.isNotBlank(issueDTO.getIssueId())) issueDTO.setId(issueDTO.getIssueId());
+
             //2.新增议题流程
             IssueProcessDTO issueProcessDTO = new IssueProcessDTO();
             issueProcessDTO.setIssueId(issueDTO.getId());
@@ -278,6 +281,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                         ModuleConstants.FAILURE_TO_ADD_ISSUE_PROCESS_LOG_TEMPLATE,issueDTO.getId()));
                 throw new RenException(ModuleConstants.FAILURE_TO_ADD_ISSUE_PROCESS);
             }
+
+
             //3.新增议题表决统计表
             IssueVoteStatisticalDTO voteStatistical = new IssueVoteStatisticalDTO();
             voteStatistical.setIssueId(issueDTO.getId());
@@ -446,23 +451,15 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         if(null == application) throw new RenException("没有相应的议题申请信息");
 
         IssueApplicationDTO app2update = new IssueApplicationDTO();
-        app2update.setId(param.getIssueApplicationId());
+        //app2update.setId(param.getIssueApplicationId());
-        app2update.setApplyStatus(param.getActionType());
+        //app2update.setApplyStatus(param.getActionType());
-        app2update.setUpdatedBy(token.getUserId());
+        //app2update.setUpdatedBy(token.getUserId());
-        app2update.setUpdatedTime(unifiedDate);
+        //app2update.setUpdatedTime(unifiedDate);
 
-        IssueApplicationHistoryDTO history2add = new IssueApplicationHistoryDTO();
-        history2add.setIssueApplicationId(param.getIssueApplicationId());
-        history2add.setReason(param.getReason());
-        history2add.setActionType(param.getActionType());
-        history2add.setCreatedTime(unifiedDate);
-        history2add.setCreatedBy(token.getUserId());
-        history2add.setCustomerId(application.getCustomerId());
 
-        //historyService.save(history2add);
 
         //if(!StringUtils.equals(ModuleConstants.AUDITION_TYPE_REJECT,param.getActionType())){
-            app2update.setPassedReason(param.getReason());
+            //app2update.setPassedReason(param.getReason());
             ResiTopicTurnIssueFromDTO form = new ResiTopicTurnIssueFromDTO();
             form.setActionType(param.getActionType());
             form.setUnifiedDate(unifiedDate);form.setUserId(application.getCreatedBy());form.setTopicId(application.getTopicId());form.setIssueId(UUID.randomUUID().toString().replaceAll("-", ""));