From b6edd849d6488141837833be12bfdb8fa73fd050 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 23 Nov 2020 16:27:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E9=87=8D=E6=96=B0=E7=BC=96?= =?UTF-8?q?=E8=BE=91=20=E6=96=B0=E8=AE=AE=E9=A2=98=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E3=80=81=E5=BB=BA=E8=AE=AE=E8=A6=86=E7=9B=96=E5=8E=9F=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IssueServiceImpl.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 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 eea0084af3..2d49c923bc 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 @@ -366,22 +366,20 @@ public class IssueServiceImpl extends BaseServiceImpl imp if(!isStaffAudition) if(StringUtils.equals(ModuleConstants.ISSUE_APPLICATION_STATUS_UNDER_AUDITING,applicationList.iterator().next().getApplyStatus())) ifRepeat = true; - + applyIds.addAll(applicationList.stream().map(IssueApplicationDTO::getId).collect(Collectors.toList())); } if(!ifRepeat) { applicationList.forEach(apply -> { IssueApplicationDTO carrier = new IssueApplicationDTO(); carrier.setId(apply.getId()); carrier.setApplyStatus(defaultStatusUnderAuditing); - carrier.setSuggestion(!isStaffAudition ? apply.getSuggestion() : param.getSuggestion()); - carrier.setIssueTitle(!isStaffAudition ? apply.getIssueTitle() : param.getIssueTitle()); + carrier.setSuggestion(isStaffAudition ? apply.getSuggestion() : param.getSuggestion()); + carrier.setIssueTitle(isStaffAudition ? apply.getIssueTitle() : param.getIssueTitle()); carrier.setPassedReason(isStaffAudition ? StringUtils.equals(ModuleConstants.AUDITION_TYPE_APPROVAL,param.getAudition().getActionType()) ? param.getAudition().getReason() :null : null); - carrier.setIssueId(isStaffAudition ? param.getIssueId() : null); + carrier.setIssueId(isStaffAudition ? StringUtils.equals(ModuleConstants.AUDITION_TYPE_APPROVAL,param.getAudition().getActionType()) ? param.getIssueId() : null : null); carrier.setUpdatedTime(param.getCreatedTime()); carrier.setUpdatedBy(param.getUserId()); applicationService.update(carrier); - - applyIds.add(apply.getId()); }); @@ -409,7 +407,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp }); } - result.setIssueApplicationId(applyIds.iterator().next()); + result.setIssueApplicationId(applyIds.get(NumConstant.ZERO)); //只有当审核开关关闭 或 工作端人员审核通过时才生成议题