From 907f3a99cf8600d86f2b51398afdd8c056fda7dd Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 24 Nov 2020 10:26:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=AE=A1=E6=A0=B8=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E5=90=8E=E7=94=9F=E6=88=90=E7=9B=B8=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IssueServiceImpl.java | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 2d49c923bc..80f44c403b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -256,8 +256,11 @@ public class IssueServiceImpl extends BaseServiceImpl imp issueDTO.setIssueStatus(ModuleConstants.ISSUE_STATUS_VOTING); issueDTO.setDecidedTime(issueShiftedFromTopicFormDTO.getCreatedTime()); int issueAffectedRow = baseDao.insertOne(issueDTO); - if(issueAffectedRow == NumConstant.ONE && StringUtils.isNotBlank(issueDTO.getId())){ - //2.新增议题流程 + + 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()); issueProcessDTO.setIssueStatus(ModuleConstants.ISSUE_STATUS_VOTING); @@ -278,6 +281,8 @@ public class IssueServiceImpl extends BaseServiceImpl 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 imp if(null == application) throw new RenException("没有相应的议题申请信息"); IssueApplicationDTO app2update = new IssueApplicationDTO(); - app2update.setId(param.getIssueApplicationId()); - app2update.setApplyStatus(param.getActionType()); - app2update.setUpdatedBy(token.getUserId()); - app2update.setUpdatedTime(unifiedDate); + //app2update.setId(param.getIssueApplicationId()); + //app2update.setApplyStatus(param.getActionType()); + //app2update.setUpdatedBy(token.getUserId()); + //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("-", ""));