From ddc0f14384619b9618f26a3f363f679833a68b3d Mon Sep 17 00:00:00 2001
From: yangbin <yangbin@qq.com>
Date: 星期三, 16 四月 2025 09:51:32 +0800
Subject: [PATCH] 自动化产线集成模块添加数据查询
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java
index ce39c92..793799f 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/service/impl/FlowMyBusinessServiceImpl.java
@@ -14,7 +14,6 @@
import org.jeecg.modules.flowable.util.TimeUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
@@ -58,13 +57,10 @@
return null;
}
- @Transactional(isolation = Isolation.READ_COMMITTED) // 闄嶄綆闅旂绾у埆
+ @Transactional // 闄嶄綆闅旂绾у埆
public FlowMyBusiness getByDataId(String dataId) {
- LambdaQueryWrapper<FlowMyBusiness> flowMyBusinessLambdaQueryWrapper = new LambdaQueryWrapper<>();
- flowMyBusinessLambdaQueryWrapper.eq(FlowMyBusiness::getDataId,dataId)
- ;
//濡傛灉淇濆瓨鏁版嵁鍓嶆湭璋冪敤蹇呰皟鐨凢lowCommonService.initActBusiness鏂规硶锛屽氨浼氭湁闂
- FlowMyBusiness business = this.getOne(flowMyBusinessLambdaQueryWrapper);
+ FlowMyBusiness business = flowMyBusinessMapper.selectByDataId(dataId);
return business;
}
@@ -81,11 +77,10 @@
/**
* 娴佺▼-鎴戠殑宸插姙
* @param flowMyBusinessDto
- * @param page
* @return
*/
- public IPage<FlowTaskDto> getPageListMyBusiness(Page page, FlowMyBusinessDto flowMyBusinessDto){
- return flowMyBusinessMapper.PageListMyBusiness(page,flowMyBusinessDto);
+ public List<FlowTaskDto> ListMyBusiness(FlowMyBusinessDto flowMyBusinessDto){
+ return flowMyBusinessMapper.ListMyBusiness(flowMyBusinessDto);
}
/**
@@ -102,23 +97,30 @@
item.setPreNode(historicActivityInstance.getActivityName());
}
}
- if (item.getDoneUsers() == null){
- item.setDoneUsers("");
- }else {
- //鍘婚櫎[]
- item.setDoneUsers(item.getDoneUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
- item.setDoneUsers(item.getDoneUsers().replaceAll("\"", ""));
- }
- //璁＄畻澶勭悊鏃堕暱
- Date kssj=item.getStartTime();
- Date jssj;
- if (item.getEndTime() != null){
- jssj=item.getEndTime();
- }else {
- jssj=new Date();
- }
- item.setDuration(TimeUtil.howLong(kssj, jssj,2));
+ if (item.getTodoUsers() == null){
+ item.setTodoUsers("");
+ }else {
+ //鍘婚櫎[]
+ item.setTodoUsers(item.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
+ item.setTodoUsers(item.getTodoUsers().replaceAll("\"", ""));
+ }
+ if (item.getDoneUsers() == null){
+ item.setDoneUsers("");
+ }else {
+ //鍘婚櫎[]
+ item.setDoneUsers(item.getDoneUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
+ item.setDoneUsers(item.getDoneUsers().replaceAll("\"", ""));
+ }
+ //璁＄畻澶勭悊鏃堕暱
+ Date kssj=item.getStartTime();
+ Date jssj;
+ if (item.getEndTime() != null){
+ jssj=item.getEndTime();
+ }else {
+ jssj=new Date();
+ }
+ item.setDuration(TimeUtil.howLong(kssj, jssj,2));
});
return flowMyBusinessDtoIPage;
}
--
Gitblit v1.9.3