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/visit/QueryFinishVisitCmd.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/visit/QueryFinishVisitCmd.java b/service-community/src/main/java/com/java110/community/cmd/visit/QueryFinishVisitCmd.java
index cd0f87a..88e530f 100644
--- a/service-community/src/main/java/com/java110/community/cmd/visit/QueryFinishVisitCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/visit/QueryFinishVisitCmd.java
@@ -7,6 +7,7 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.itemRelease.ItemReleaseDto;
import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.owner.OwnerDto;
import com.java110.dto.visit.VisitDto;
import com.java110.dto.visitSetting.VisitSettingDto;
import com.java110.dto.workflow.WorkflowDto;
@@ -16,6 +17,7 @@
import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
import com.java110.intf.community.IVisitV1InnerServiceSMO;
import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
+import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
@@ -44,6 +46,9 @@
@Autowired
private IVisitSettingV1InnerServiceSMO visitSettingV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerV1InnerServiceSMO ownerV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -86,6 +91,10 @@
// 杈撳叆flowId
refreshSetting(datas,reqJson);
+
+ //鍒锋柊 涓氫富
+ refreshOwners(datas, reqJson);
+
} else {
datas = new ArrayList<>();
}
@@ -97,6 +106,35 @@
}
+ private void refreshOwners(List<JSONObject> datas, JSONObject reqJson) {
+
+ if(datas == null || datas.size() < 1){
+ return ;
+ }
+
+ List<String> ownerIds = new ArrayList<>();
+ for(JSONObject apiVisitDataVo: datas){
+ ownerIds.add(apiVisitDataVo.getString("ownerId"));
+ }
+
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setOwnerIds(ownerIds.toArray(new String[ownerIds.size()]));
+ ownerDto.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
+ ownerDto.setCommunityId(reqJson.getString("communityId"));
+ List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
+
+ for(JSONObject apiVisitDataVo: datas){
+ for(OwnerDto tmpOwnerDto : ownerDtos){
+ if(!apiVisitDataVo.getString("ownerId").equals(tmpOwnerDto.getOwnerId())){
+ continue;
+ }
+ apiVisitDataVo.put("ownerName",tmpOwnerDto.getName());
+ apiVisitDataVo.put("ownerTel",tmpOwnerDto.getLink());
+ }
+ }
+
+ }
+
private void refreshFormData(List<JSONObject> datas, JSONObject paramIn) {
List<String> ids = new ArrayList<>();
--
Gitblit v1.8.0