From 270aceade15ec4cb7715131055b53cec4ecb7d4e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 18:13:21 +0800
Subject: [PATCH] 增加现场编制查询列表
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/TaskDispatchStatService.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/TaskDispatchStatService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/TaskDispatchStatService.java
index a1b7036..a63d4a4 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/TaskDispatchStatService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/TaskDispatchStatService.java
@@ -2,39 +2,22 @@
package org.springblade.mdm.statreport.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.jetbrains.annotations.NotNull;
+import org.flowable.engine.HistoryService;
+import org.flowable.engine.RuntimeService;
+import org.flowable.engine.history.HistoricProcessInstance;
+import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.mp.support.Condition;
-import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.tool.api.R;
-import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.commons.service.UserCommonService;
-import org.springblade.mdm.flow.constants.FlowContants;
-import org.springblade.mdm.flow.entity.TaskDispatch;
-import org.springblade.mdm.flow.service.ApproveInfoQueryService;
-import org.springblade.mdm.flow.service.FlowProgramProperties;
-import org.springblade.mdm.flow.service.TaskDispatchService;
-import org.springblade.mdm.flow.vo.ApproveTableInfo;
-import org.springblade.mdm.flow.vo.DispathTaskQueryVO;
+import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.statreport.mapper.TaskDispatchStatMapper;
-import org.springblade.mdm.statreport.utils.WordReplaceUtil;
import org.springblade.mdm.statreport.vo.TaskDispatchStatVO;
import org.springblade.mdm.statreport.vo.TaskDispathStatQueryVO;
-import org.springblade.system.feign.IUserClient;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.time.LocalDateTime;
-import java.util.*;
/**
* 瀹℃壒璁板綍锛岀敤浜庢煡璇㈡墽琛岃建杩�
@@ -49,8 +32,9 @@
@Autowired
private MachineService machineService;
@Autowired
- private TaskDispatchService taskDispatchService;
-
+ private HistoryService historyService;
+ @Autowired
+ private RuntimeService runtimeService;
@Autowired
private TaskDispatchStatMapper taskDispatchStatMapper;
@@ -62,6 +46,25 @@
IPage<TaskDispatchStatVO> voPage = taskDispatchStatMapper.pageQuery(Condition.getPage(queryVO),queryVO);
+ voPage.getRecords().forEach(vo ->
+ {
+ HistoricProcessInstance hisInst = historyService.createHistoricProcessInstanceQuery().processInstanceId(vo.getProcessInstanceId()).singleResult();
+ if(hisInst != null){
+ vo.setProgrammerName(userCommonService.getUserNameById(Func.toLong(hisInst.getProcessVariables().get(FlowVariableConstant.PROGRAMMER))));
+ }
+
+
+ if(vo.getCureTime() == null){
+ ProcessInstance runInst = runtimeService.createProcessInstanceQuery().processInstanceId(vo.getProcessInstanceId()).singleResult();
+ if(runInst == null || runInst.isEnded()){
+ vo.setStatus(2);//鍥哄寲涓�
+ }else{
+ vo.setStatus(1);//璇曞垏涓�
+ }
+ }else{
+ vo.setStatus(3);//宸插浐鍖�
+ }
+ });
return voPage;
}
}
--
Gitblit v1.9.3