From 27c2a530b641a1b4e815b79cd9a9fbd73debd627 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 06 九月 2025 14:05:51 +0800
Subject: [PATCH] 已办增加进行中查询条件
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/DoneQueryService.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/DoneQueryService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/DoneQueryService.java
index 1638ab2..389f3cb 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/DoneQueryService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/DoneQueryService.java
@@ -15,6 +15,7 @@
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
+import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
@@ -56,39 +57,32 @@
* @param createTimeEnd
* @param keyword
* @return
- */
- public IPage<FlowVO> selectDonePage(IPage<FlowVO> page, LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
+ */
+ //public IPage<FlowVO> selectDonePage(IPage<FlowVO> page, LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
+ public IPage<FlowVO> selectDonePage(DoneQueryVO queryVO) {
//宸插姙鏂版煡璇�
String userId = "" + AuthUtil.getUserId();
- DoneQueryVO queryVO = new DoneQueryVO();
-
- queryVO.setSize(Long.valueOf(page.getSize()).intValue());
- queryVO.setCurrent(Long.valueOf(page.getCurrent()).intValue());
queryVO.setUserId(userId);
- queryVO.setCreateTimeBegin(createTimeBegin);
- if(createTimeEnd != null){
- createTimeEnd = createTimeEnd.plusDays(1);
+ if(queryVO.getCreateTimeEnd() != null){
+ queryVO.setCreateTimeEnd(queryVO.getCreateTimeEnd().plusDays(1));
}
- queryVO.setCreateTimeEnd(createTimeEnd);
- queryVO.setKeyword(keyword);
-
- IPage<FlowVO> pageDta = doneMapper.pageQuery(page,queryVO);
+ IPage<FlowVO> pageDta = doneMapper.pageQuery(Condition.getPage(queryVO),queryVO);
List<String> instIdList = pageDta.getRecords().stream().map(FlowVO::getProcessInstanceId).toList();
if(!instIdList.isEmpty()) {
List<HistoricProcessInstance> processList = getHistoricProcessInstances(instIdList);
Map<String,Map<String,Object>> varmap = new HashMap<>();
for(HistoricProcessInstance inst : processList) {
-
varmap.put(inst.getId(),inst.getProcessVariables());
}
pageDta.getRecords().forEach(flowVO->{
flowVO.setVariables(varmap.get(flowVO.getProcessInstanceId()));
flowVO.setFile(this.getFileString(flowVO.getProcessInstanceId()));
-
+ /*
boolean active = flowCommonService.isProcessInstanceActive(flowVO.getProcessInstanceId());
flowVO.setProcessIsFinished((Func.toStr(!active)));
- if(active){
+ */
+ if(Func.toBoolean(flowVO.getProcessIsFinished())){
flowVO.setFlag(getCurrentTaskDefKeys(flowVO.getProcessInstanceId()));
}
});
--
Gitblit v1.9.3