From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledSettingV1InnerServiceSMOImpl.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledSettingV1InnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledSettingV1InnerServiceSMOImpl.java
index 90e802e7..46a799b 100644
--- a/service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledSettingV1InnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/OwnerSettledSettingV1InnerServiceSMOImpl.java
@@ -16,13 +16,14 @@
package com.java110.user.smo.impl;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
import com.java110.user.dao.IOwnerSettledSettingV1ServiceDao;
import com.java110.intf.user.IOwnerSettledSettingV1InnerServiceSMO;
-import com.java110.dto.ownerSettledSetting.OwnerSettledSettingDto;
-import com.java110.po.ownerSettledSetting.OwnerSettledSettingPo;
+import com.java110.dto.owner.OwnerSettledSettingDto;
+import com.java110.po.owner.OwnerSettledSettingPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
import com.java110.dto.PageDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -44,6 +45,9 @@
@Autowired
private IOwnerSettledSettingV1ServiceDao ownerSettledSettingV1ServiceDaoImpl;
+
+ @Autowired
+ private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
@Override
@@ -77,10 +81,37 @@
}
List<OwnerSettledSettingDto> ownerSettledSettings = BeanConvertUtil.covertBeanList(ownerSettledSettingV1ServiceDaoImpl.getOwnerSettledSettingInfo(BeanConvertUtil.beanCovertMap(ownerSettledSettingDto)), OwnerSettledSettingDto.class);
-
+ refreshWorkflow(ownerSettledSettings);
return ownerSettledSettings;
}
+ /**
+ * 鏌ヨ宸ヤ綔娴佷俊鎭�
+ *
+ * @param ownerSettledSettings
+ */
+ private void refreshWorkflow(List<OwnerSettledSettingDto> ownerSettledSettings) {
+ if(ownerSettledSettings == null || ownerSettledSettings.size()< 1){
+ return ;
+ }
+ List<String> flowIds = new ArrayList<>();
+ for (OwnerSettledSettingDto visitSettingDto : ownerSettledSettings) {
+ flowIds.add(visitSettingDto.getFlowId());
+ }
+
+ OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+ oaWorkflowDto.setFlowIds(flowIds.toArray(new String[flowIds.size()]));
+ List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+ for (OwnerSettledSettingDto visitSettingDto : ownerSettledSettings) {
+ for (OaWorkflowDto tmpOaWorkflowDto : oaWorkflowDtos) {
+ if (visitSettingDto.getFlowId().equals(tmpOaWorkflowDto.getFlowId())) {
+ BeanConvertUtil.covertBean(tmpOaWorkflowDto, visitSettingDto);
+ }
+ }
+ }
+ }
+
+
@Override
public int queryOwnerSettledSettingsCount(@RequestBody OwnerSettledSettingDto ownerSettledSettingDto) {
--
Gitblit v1.8.0