From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/communitySpace/ListCommunitySpacePersonCmd.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/communitySpace/ListCommunitySpacePersonCmd.java b/service-community/src/main/java/com/java110/community/cmd/communitySpace/ListCommunitySpacePersonCmd.java
index 42a61b8..9a40b32 100644
--- a/service-community/src/main/java/com/java110/community/cmd/communitySpace/ListCommunitySpacePersonCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/communitySpace/ListCommunitySpacePersonCmd.java
@@ -20,8 +20,13 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.communitySpace.CommunitySpaceDto;
+import com.java110.dto.communitySpaceOpenTime.CommunitySpaceOpenTimeDto;
import com.java110.dto.communitySpacePerson.CommunitySpacePersonDto;
+import com.java110.dto.communitySpacePersonTime.CommunitySpacePersonTimeDto;
+import com.java110.intf.community.ICommunitySpacePersonTimeV1InnerServiceSMO;
import com.java110.intf.community.ICommunitySpacePersonV1InnerServiceSMO;
+import com.java110.po.communitySpacePersonTime.CommunitySpacePersonTimePo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
@@ -52,6 +57,9 @@
@Autowired
private ICommunitySpacePersonV1InnerServiceSMO communitySpacePersonV1InnerServiceSMOImpl;
+ @Autowired
+ private ICommunitySpacePersonTimeV1InnerServiceSMO communitySpacePersonTimeV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
@@ -68,6 +76,7 @@
if (count > 0) {
communitySpacePersonDtos = communitySpacePersonV1InnerServiceSMOImpl.queryCommunitySpacePersons(communitySpacePersonDto);
+ refreshOpenTimes(communitySpacePersonDtos);
} else {
communitySpacePersonDtos = new ArrayList<>();
}
@@ -78,4 +87,38 @@
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+
+ private void refreshOpenTimes(List<CommunitySpacePersonDto> communitySpacePersonDtos) {
+
+ if (communitySpacePersonDtos == null || communitySpacePersonDtos.size() < 1) {
+ return;
+ }
+
+ List<String> cspIds = new ArrayList<>();
+
+ for (CommunitySpacePersonDto communitySpaceDto : communitySpacePersonDtos) {
+ cspIds.add(communitySpaceDto.getCspId());
+ }
+
+ CommunitySpacePersonTimeDto communitySpaceOpenTimeDto = new CommunitySpacePersonTimeDto();
+ communitySpaceOpenTimeDto.setCspIds(cspIds.toArray(new String[cspIds.size()]));
+ communitySpaceOpenTimeDto.setStates(new String[]{
+ CommunitySpacePersonTimeDto.STATE_WAIT_CONFIRM,
+ CommunitySpacePersonTimeDto.STATE_FINISH
+ });
+ List<CommunitySpacePersonTimeDto> communitySpacePersonTimeDtos
+ = communitySpacePersonTimeV1InnerServiceSMOImpl.queryCommunitySpacePersonTimes(communitySpaceOpenTimeDto);
+
+ List<CommunitySpacePersonTimeDto> tmpCommunitySpaceOpenTimeDtos = null;
+ for (CommunitySpacePersonDto communitySpaceDto : communitySpacePersonDtos) {
+ tmpCommunitySpaceOpenTimeDtos = new ArrayList<>();
+ for (CommunitySpacePersonTimeDto tmpCommunitySpacePersonTimeDto : communitySpacePersonTimeDtos) {
+ if (tmpCommunitySpacePersonTimeDto.getCspId().equals(communitySpaceDto.getCspId())) {
+ tmpCommunitySpaceOpenTimeDtos.add(tmpCommunitySpacePersonTimeDto);
+ }
+ }
+ communitySpaceDto.setTimes(tmpCommunitySpaceOpenTimeDtos);
+ }
+
+ }
}
--
Gitblit v1.8.0