Merge branch 'dev'

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<IssueDao, IssueEntity> 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);
 

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
     </select>
 
 </mapper>

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<GroupVotingListResultDTO> votingList(AllIssueFormDTO formDTO) {
         //查找小组内所有话题ID
         List<String> topicIds =  resiTopicService.getTopicIdsByGroup(formDTO.getGroupId());
+        if (CollectionUtils.isEmpty(topicIds)) {
+            return Collections.emptyList();
+        }
         formDTO.setTopicIds(topicIds);
         Result<List<GroupVotingListResultDTO>> result =  govIssueOpenFeignClient.getVotingListByGroup(formDTO);
         if(!result.success()) {
@@ -194,6 +198,9 @@ public class GroupIssueServiceImpl implements GroupIssueService {
     public List<GroupShiftProjectListResultDTO> shiftProjectList(AllIssueFormDTO formDTO) {
         //查找小组内所有话题ID
         List<String> topicIds =  resiTopicService.getTopicIdsByGroup(formDTO.getGroupId());
+        if (CollectionUtils.isEmpty(topicIds)) {
+            return Collections.emptyList();
+        }
         formDTO.setTopicIds(topicIds);
         Result<List<GroupShiftProjectListResultDTO>> result =  govIssueOpenFeignClient.getShiftProjectListByGroup(formDTO);
         if(!result.success()) {
@@ -214,6 +221,9 @@ public class GroupIssueServiceImpl implements GroupIssueService {
     public List<GroupClosedListResultDTO> closedList(AllIssueFormDTO formDTO) {
         //查找小组内所有话题ID
         List<String> topicIds =  resiTopicService.getTopicIdsByGroup(formDTO.getGroupId());
+        if (CollectionUtils.isEmpty(topicIds)) {
+            return Collections.emptyList();
+        }
         formDTO.setTopicIds(topicIds);
         Result<List<GroupClosedListResultDTO>> result =  govIssueOpenFeignClient.getClosedListByGroup(formDTO);
         if(!result.success()) {

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<ResiGroupCodeDao,
                 logger.error(String.format("生成小组二维码失败，小组Id：%s", formDTO.getGroupId()));
                 throw new RenException("获取小组码基本信息失败");
             }
+            resultDTO.setGroupCodeUrl(url);
         }
         headUrl = resultDTO.getGroupHeadPhoto();
         url = resultDTO.getGroupCodeUrl();