From 51d66199b101ea16bc14041568ea61ab69111cda Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 03 六月 2024 15:47:35 +0800
Subject: [PATCH] update 优化 去除请假案例无用调用
---
/dev/null | 71 -----------------------------------
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java | 7 ---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java | 21 ++--------
3 files changed, 4 insertions(+), 95 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/BusinessInstanceDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/BusinessInstanceDTO.java
deleted file mode 100644
index ecf83cf..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/BusinessInstanceDTO.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.dromara.common.core.domain.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 涓氬姟涓庢祦绋嬪疄渚嬪叧鑱斿璞�
- *
- * @author may
- */
-@Data
-@NoArgsConstructor
-public class BusinessInstanceDTO implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 娴佺▼瀹炰緥id
- */
- private String id;
-
- /**
- * 娴佺▼瀹氫箟id
- */
- private String processDefinitionId;
-
- /**
- * 娴佺▼瀹氫箟鍚嶇О
- */
- private String name;
-
- /**
- * 涓氬姟id
- */
- private String businessKey;
-
- /**
- * 绉熸埛id
- */
- private String tenantId;
-
- /**
- * 鍚姩鏃堕棿
- */
- private Date startTime;
-
- /**
- * 缁撴潫鏃堕棿
- */
- private Date endTime;
-
- /**
- * 鍚姩浜篿d
- */
- private String startUserId;
-
- /**
- * 娴佺▼鐘舵��
- */
- private String businessStatus;
-
- /**
- * 娴佺▼鐘舵��
- */
- private String businessStatusName;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java
index a1dc2bc..47886d7 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java
@@ -4,7 +4,6 @@
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
-import org.dromara.common.core.domain.dto.BusinessInstanceDTO;
import org.dromara.workflow.domain.TestLeave;
import java.io.Serial;
@@ -67,11 +66,5 @@
*/
@ExcelProperty(value = "鐘舵��")
private String status;
-
- /**
- * 涓氬姟涓庢祦绋嬪疄渚嬪叧鑱斿璞�
- */
- private BusinessInstanceDTO businessInstanceDTO;
-
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
index 2ae88ad..6431b3f 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
@@ -1,6 +1,5 @@
package org.dromara.workflow.service.impl;
-import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -47,9 +46,7 @@
*/
@Override
public TestLeaveVo queryById(Long id) {
- TestLeaveVo testLeaveVo = baseMapper.selectVoById(id);
- workflowService.setBusinessInstanceDTO(testLeaveVo, String.valueOf(id));
- return testLeaveVo;
+ return baseMapper.selectVoById(id);
}
/**
@@ -59,13 +56,7 @@
public TableDataInfo<TestLeaveVo> queryPageList(TestLeaveBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TestLeave> lqw = buildQueryWrapper(bo);
Page<TestLeaveVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
- TableDataInfo<TestLeaveVo> build = TableDataInfo.build(result);
- List<TestLeaveVo> rows = build.getRows();
- if (CollUtil.isNotEmpty(rows)) {
- List<String> ids = StreamUtils.toList(rows, e -> String.valueOf(e.getId()));
- workflowService.setBusinessInstanceListDTO(rows, ids, "id");
- }
- return build;
+ return TableDataInfo.build(result);
}
/**
@@ -99,9 +90,7 @@
if (flag) {
bo.setId(add.getId());
}
- TestLeaveVo testLeaveVo = MapstructUtils.convert(add, TestLeaveVo.class);
- workflowService.setBusinessInstanceDTO(testLeaveVo, String.valueOf(add.getId()));
- return testLeaveVo;
+ return MapstructUtils.convert(add, TestLeaveVo.class);
}
/**
@@ -111,9 +100,7 @@
public TestLeaveVo updateByBo(TestLeaveBo bo) {
TestLeave update = MapstructUtils.convert(bo, TestLeave.class);
baseMapper.updateById(update);
- TestLeaveVo testLeaveVo = MapstructUtils.convert(update, TestLeaveVo.class);
- workflowService.setBusinessInstanceDTO(testLeaveVo, String.valueOf(update.getId()));
- return testLeaveVo;
+ return MapstructUtils.convert(update, TestLeaveVo.class);
}
/**
--
Gitblit v1.9.3