From 5f483565ed19359ab1692afd79f64c0235af4c90 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 23 Nov 2020 14:17:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=88=E7=94=9F/=E5=A5=B3=E5=A3=AB=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/GroupIssueServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java index 82117b6a86..34b172e372 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/GroupIssueServiceImpl.java @@ -116,10 +116,13 @@ public class GroupIssueServiceImpl implements GroupIssueService { switch (gender){ case "1": result = "先生"; + break; case "2": result = "女士"; + break; case "0": result = "先生/女士"; + break; default: result = "先生/女士"; } From 3d38a2837aad23693e7c34c8436f639e0e0fa6b7 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 23 Nov 2020 14:34:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IssueServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 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 2bc157531b..8522ac03a5 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 @@ -359,9 +359,13 @@ public class IssueServiceImpl extends BaseServiceImpl imp } } else { //重新提交 或 工作端审核议题 更新application - if(!isStaffAudition) ifRepeat = true; - if (applicationList.size() > NumConstant.ONE) + if (applicationList.size() > NumConstant.ONE) { + applicationList.sort(Comparator.comparing(IssueApplicationDTO::getUpdatedTime, Collections.reverseOrder())); logger.error("com.epmet.service.impl.IssueServiceImpl.topicShiftedToIssueV2，查出多条转移提提交记录，话题Id：{}", param.getTopicId()); + } + if(!isStaffAudition) + if(StringUtils.equals(ModuleConstants.ISSUE_APPLICATION_STATUS_UNDER_AUDITING,applicationList.iterator().next().getApplyStatus())) + ifRepeat = true; } applicationList.forEach(apply -> { @@ -370,7 +374,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp carrier.setApplyStatus(defaultStatusUnderAuditing); carrier.setSuggestion(!isStaffAudition ? apply.getSuggestion() : param.getSuggestion()); carrier.setIssueTitle(!isStaffAudition ? apply.getIssueTitle() : param.getIssueTitle()); - carrier.setPassedReason(isStaffAudition ? param.getAudition().getReason() : null); + carrier.setPassedReason(isStaffAudition ? StringUtils.equals(ModuleConstants.AUDITION_TYPE_APPROVAL,param.getAudition().getActionType()) ? param.getAudition().getReason() :null : null); carrier.setIssueId(isStaffAudition ? param.getIssueId() : null); carrier.setUpdatedTime(param.getCreatedTime()); carrier.setUpdatedBy(param.getUserId());