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/smo/impl/VisitSettingV1InnerServiceSMOImpl.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/smo/impl/VisitSettingV1InnerServiceSMOImpl.java b/service-community/src/main/java/com/java110/community/smo/impl/VisitSettingV1InnerServiceSMOImpl.java
index 76b1ecd..0f0d2e6 100644
--- a/service-community/src/main/java/com/java110/community/smo/impl/VisitSettingV1InnerServiceSMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/smo/impl/VisitSettingV1InnerServiceSMOImpl.java
@@ -17,8 +17,11 @@
import com.java110.community.dao.IVisitSettingV1ServiceDao;
+import com.java110.dto.itemReleaseType.ItemReleaseTypeDto;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
import com.java110.intf.community.IVisitSettingV1InnerServiceSMO;
import com.java110.dto.visitSetting.VisitSettingDto;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
import com.java110.po.visitSetting.VisitSettingPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
@@ -44,7 +47,8 @@
@Autowired
private IVisitSettingV1ServiceDao visitSettingV1ServiceDaoImpl;
-
+ @Autowired
+ private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
@Override
public int saveVisitSetting(@RequestBody VisitSettingPo visitSettingPo) {
@@ -77,10 +81,36 @@
}
List<VisitSettingDto> visitSettings = BeanConvertUtil.covertBeanList(visitSettingV1ServiceDaoImpl.getVisitSettingInfo(BeanConvertUtil.beanCovertMap(visitSettingDto)), VisitSettingDto.class);
-
+ refreshWorkflow(visitSettings);
return visitSettings;
}
+ /**
+ * 鏌ヨ宸ヤ綔娴佷俊鎭�
+ *
+ * @param visitSettings
+ */
+ private void refreshWorkflow(List<VisitSettingDto> visitSettings) {
+ if(visitSettings == null || visitSettings.size()< 1){
+ return ;
+ }
+ List<String> flowIds = new ArrayList<>();
+ for (VisitSettingDto visitSettingDto : visitSettings) {
+ flowIds.add(visitSettingDto.getFlowId());
+ }
+
+ OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+ oaWorkflowDto.setFlowIds(flowIds.toArray(new String[flowIds.size()]));
+ List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+ for (VisitSettingDto visitSettingDto : visitSettings) {
+ for (OaWorkflowDto tmpOaWorkflowDto : oaWorkflowDtos) {
+ if (visitSettingDto.getFlowId().equals(tmpOaWorkflowDto.getFlowId())) {
+ BeanConvertUtil.covertBean(tmpOaWorkflowDto, visitSettingDto);
+ }
+ }
+ }
+ }
+
@Override
public int queryVisitSettingsCount(@RequestBody VisitSettingDto visitSettingDto) {
--
Gitblit v1.8.0