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()); 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 = "先生/女士"; }