From 178b4ee9f38a8b38b1cb5321fee25a6038b39df9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 19 二月 2025 11:05:28 +0800
Subject: [PATCH] 中标单位id设为null
---
business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 5d39aaf..d16c1be 100644
--- a/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProcessConfigInfoServiceImpl.java
@@ -1,5 +1,6 @@
package com.ycl.service.impl;
+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;
@@ -8,6 +9,7 @@
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;
@@ -91,23 +93,28 @@
public Result list(ProcessConfigInfoQuery query) {
List<FlowProcDefWithConfigDto> dataList = flowDeployMapper.selectDeployListWithConfig(query);
- // 鏍规嵁 processDefId 鍒嗙粍锛屽苟鍙栨瘡缁勪腑 鐗堟湰鍙� 鏈�澶х殑閭ｄ竴涓�
- Map<String, FlowProcDefWithConfigDto> groupedByProcessDefId = dataList.stream()
- .collect(Collectors.toMap(
- FlowProcDefWithConfigDto::getProcessDefId, // keyMapper: 鎻愬彇 processDefId 浣滀负閿�
- Function.identity(), // valueMapper: 鐩存帴浣跨敤瀵硅薄浣滀负鍊�
- BinaryOperator.maxBy(Comparator.comparingInt(FlowProcDefWithConfigDto::getProcessDefVersion)) // mergeFunction: 姣旇緝 processDefVersion锛屽彇鏈�澶х殑
- ));
- List<FlowProcDefWithConfigDto> resultList = new ArrayList<>(groupedByProcessDefId.values());
-
// 鍔犺浇鎸傝〃鍗�
- for (FlowProcDefWithConfigDto procDef : resultList) {
+ 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(resultList);
+ 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