From c4ab6a24d2825f11a0de0f165667dc533c458a01 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 10:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java | 63 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 13 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java
index 327e8f2..2a3c314 100644
--- a/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java
@@ -3,22 +3,28 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
+import com.github.pagehelper.PageInfo;
+import com.ycl.domain.dto.FlowProcDefDto;
+import com.ycl.domain.dto.FlowProcDefWithConfigDto;
import com.ycl.domain.entity.ProcessConfigInfo;
+import com.ycl.domain.entity.SysForm;
+import com.ycl.domain.query.ProcessConfigInfoQuery;
+import com.ycl.framework.utils.PageUtil;
+import com.ycl.mapper.FlowDeployMapper;
import com.ycl.mapper.ProcessConfigInfoMapper;
+import com.ycl.service.ISysDeployFormService;
import com.ycl.service.ProcessConfigInfoService;
import com.ycl.common.base.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.domain.form.ProcessConfigInfoForm;
import com.ycl.domain.vo.ProcessConfigInfoVO;
-import com.ycl.domain.query.ProcessConfigInfoQuery;
import org.springframework.stereotype.Service;
import lombok.RequiredArgsConstructor;
-import com.ycl.framework.utils.PageUtil;
import org.springframework.beans.BeanUtils;
-import org.springframework.util.Assert;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
import java.util.stream.Collectors;
/**
@@ -32,6 +38,8 @@
public class ProcessConfigInfoServiceImpl extends ServiceImpl<ProcessConfigInfoMapper, ProcessConfigInfo> implements ProcessConfigInfoService {
private final ProcessConfigInfoMapper processConfigInfoMapper;
+ private final ISysDeployFormService sysDeployFormService;
+ private final FlowDeployMapper flowDeployMapper;
/**
* 娣诲姞
@@ -42,16 +50,16 @@
public Result save(ProcessConfigInfoForm form) {
// 鏍规嵁閮ㄧ讲id鍜岀増鏈彿鏌ヨ鏄惁淇濆瓨杩囷紝鏈夊氨淇敼锛屾病鏈夊氨鏂板
ProcessConfigInfo entity = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(ProcessConfigInfo::getDeployId, form.getDeployId())
- .eq(ProcessConfigInfo::getDeployVersion, form.getDeployVersion())
+ .eq(ProcessConfigInfo::getProcessDefId, form.getProcessDefId())
+ .eq(ProcessConfigInfo::getProcessDefVersion, form.getProcessDefVersion())
.one();
if (Objects.isNull(entity)) {
entity = ProcessConfigInfoForm.getEntityByForm(form, null);
baseMapper.insert(entity);
} else {
new LambdaUpdateChainWrapper<>(baseMapper)
- .eq(ProcessConfigInfo::getDeployId, form.getDeployId())
- .eq(ProcessConfigInfo::getDeployVersion, form.getDeployVersion())
+ .eq(ProcessConfigInfo::getProcessDefId, form.getProcessDefId())
+ .eq(ProcessConfigInfo::getProcessDefVersion, form.getProcessDefVersion())
.set(ProcessConfigInfo::getProjectType, form.getProjectType())
.set(ProcessConfigInfo::getFundType, form.getFundType())
.set(ProcessConfigInfo::getInvestType, form.getInvestType())
@@ -63,14 +71,13 @@
/**
* 鏍规嵁id鏌ユ壘
- * @param deployId
* @return
*/
@Override
- public Result detail(String deployId, Integer deployVersion) {
+ public Result detail(String processDefId, Integer processDefVersion) {
ProcessConfigInfo entity = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(ProcessConfigInfo::getDeployId, deployId)
- .eq(ProcessConfigInfo::getDeployVersion, deployVersion)
+ .eq(ProcessConfigInfo::getProcessDefId, processDefId)
+ .eq(ProcessConfigInfo::getProcessDefVersion, processDefVersion)
.one();
ProcessConfigInfoVO vo = new ProcessConfigInfoVO();
if (Objects.isNull(entity)) {
@@ -81,4 +88,34 @@
return Result.ok().data(vo);
}
+
+ @Override
+ public Result list(ProcessConfigInfoQuery query) {
+ List<FlowProcDefWithConfigDto> dataList = flowDeployMapper.selectDeployListWithConfig(query);
+
+ // 鍔犺浇鎸傝〃鍗�
+ for (FlowProcDefWithConfigDto procDef : dataList) {
+ SysForm sysForm = sysDeployFormService.selectSysDeployFormByDeployId(procDef.getDeploymentId());
+ if (Objects.nonNull(sysForm)) {
+ procDef.setFormName(sysForm.getFormName());
+ procDef.setFormId(sysForm.getFormId());
+ }
+ }
+ return Result.ok().data(dataList);
+ }
+
+ @Override
+ public Result getPage(ProcessConfigInfoQuery query) {
+ IPage<FlowProcDefWithConfigDto> page = PageUtil.getPage(query, FlowProcDefWithConfigDto.class);
+ flowDeployMapper.selectDeployListWithConfigPage(page,query);
+ for (FlowProcDefWithConfigDto procDef : page.getRecords()) {
+ SysForm sysForm = sysDeployFormService.selectSysDeployFormByDeployId(procDef.getDeploymentId());
+ if (Objects.nonNull(sysForm)) {
+ procDef.setFormName(sysForm.getFormName());
+ procDef.setFormId(sysForm.getFormId());
+ }
+ }
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
+
}
--
Gitblit v1.8.0