From 289f8d1336274dbc12105503044f190df2e25513 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 2 Dec 2020 13:39:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E5=80=92=E5=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IssueApplicationHistoryDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml index 33da8566ba..46c6878c8e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationHistoryDao.xml @@ -32,6 +32,7 @@ WHERE iah.DEL_FLAG = '0' AND ia.DEL_FLAG = '0' AND ia.ISSUE_ID = #{issueId} + ORDER BY iah.CREATED_TIME DESC \ No newline at end of file From a31083a567e9288a91d71ad499febee1d926249a Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 2 Dec 2020 13:46:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BD=93=E8=AE=AE=E9=A2=98=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=AC=AC=E4=B8=80=E6=AC=A1=E8=A2=AB=E6=8B=92=E7=BB=9D?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E5=B0=86=E8=AE=AE=E9=A2=98=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E5=85=B3=E9=97=AD=EF=BC=8C=E4=BA=8C=E6=AC=A1=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=90=8E=E7=94=9F=E6=88=90=E7=9A=84=E4=B8=A4=E6=9D=A1=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=8E=86=E5=8F=B21=E3=80=81under=5Fauditing=202?= =?UTF-8?q?=E3=80=81auto=5Fpassed=E5=85=88=E5=90=8E=E4=B9=8B=E9=97=B4?= =?UTF-8?q?=E7=9A=84createdTime=E8=A6=81=E7=9B=B8=E5=B7=AE=E4=B8=80?= =?UTF-8?q?=E7=A7=92=EF=BC=8C=E4=BF=9D=E8=AF=81=E8=AE=AE=E9=A2=98=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=8E=86=E5=8F=B2=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E7=9A=84=E6=AD=A3=E7=A1=AE=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IssueServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 534810e8b9..afa7f9782f 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 @@ -403,9 +403,12 @@ public class IssueServiceImpl extends BaseServiceImpl imp historyService.save(history); if (!ifOpen) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(param.getCreatedTime()); + calendar.add(Calendar.SECOND,NumConstant.ONE_NEG); IssueApplicationHistoryDTO repeatApplyRecord = new IssueApplicationHistoryDTO(); repeatApplyRecord.setActionType(ModuleConstants.ISSUE_APPLICATION_STATUS_UNDER_AUDITING); - repeatApplyRecord.setCreatedTime(param.getCreatedTime()); + repeatApplyRecord.setCreatedTime(calendar.getTime()); repeatApplyRecord.setCustomerId(param.getCustomerId()); repeatApplyRecord.setIssueApplicationId(id); From 9b92449d62814674a76560fd8aac38dd6f1ce7de Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 2 Dec 2020 14:08:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=85=B3?= =?UTF-8?q?=E4=BA=8E=E5=8E=86=E5=8F=B2=E5=B0=8F=E7=BB=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E7=94=9F=E6=88=90=E5=B0=8F=E7=BB=84=E6=B5=B7?= =?UTF-8?q?=E6=8A=A5=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/ResiGroupCodeServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java index b77e271163..6615ca4bb1 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java @@ -290,6 +290,7 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl Date: Wed, 2 Dec 2020 14:15:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E8=AE=AE=E9=A2=98-?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=AE=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/service/impl/GroupIssueServiceImpl.java | 10 ++++++++++ 1 file changed, 10 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 669f1a2edb..cb5852ebfd 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 @@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -174,6 +175,9 @@ public class GroupIssueServiceImpl implements GroupIssueService { public List votingList(AllIssueFormDTO formDTO) { //查找小组内所有话题ID List topicIds = resiTopicService.getTopicIdsByGroup(formDTO.getGroupId()); + if (CollectionUtils.isEmpty(topicIds)) { + return Collections.emptyList(); + } formDTO.setTopicIds(topicIds); Result> result = govIssueOpenFeignClient.getVotingListByGroup(formDTO); if(!result.success()) { @@ -194,6 +198,9 @@ public class GroupIssueServiceImpl implements GroupIssueService { public List shiftProjectList(AllIssueFormDTO formDTO) { //查找小组内所有话题ID List topicIds = resiTopicService.getTopicIdsByGroup(formDTO.getGroupId()); + if (CollectionUtils.isEmpty(topicIds)) { + return Collections.emptyList(); + } formDTO.setTopicIds(topicIds); Result> result = govIssueOpenFeignClient.getShiftProjectListByGroup(formDTO); if(!result.success()) { @@ -214,6 +221,9 @@ public class GroupIssueServiceImpl implements GroupIssueService { public List closedList(AllIssueFormDTO formDTO) { //查找小组内所有话题ID List topicIds = resiTopicService.getTopicIdsByGroup(formDTO.getGroupId()); + if (CollectionUtils.isEmpty(topicIds)) { + return Collections.emptyList(); + } formDTO.setTopicIds(topicIds); Result> result = govIssueOpenFeignClient.getClosedListByGroup(formDTO); if(!result.success()) {