From b4d10ff7535002dddb63a0b28ddb37fee7ed1e9d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 03 十二月 2025 16:30:53 +0800
Subject: [PATCH] 增加pdf，xlsx，docx文件预览功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramOnMachineExportService.java | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramOnMachineExportService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramOnMachineExportService.java
index 0416a43..f7b635f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramOnMachineExportService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramOnMachineExportService.java
@@ -8,8 +8,6 @@
import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.springblade.core.tool.utils.DateUtil;
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.flow.constants.FlowConstant;
import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.vo.FlowVO;
@@ -28,8 +26,6 @@
public class ProgramOnMachineExportService {
private final HistoryService historyService;
- private final ParamService paramService;
- private final MachineService machineService;
/**
*
* @param page 鍒嗛〉淇℃伅
@@ -38,27 +34,16 @@
*/
public IPage<FlowVO> finishedPage(IPage<FlowVO> page, ProgramOnMachineQueryVO queryVO) {
//鍥哄寲閲岃矾鏉戝畼
- HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowConstant.CURE_PROCESS_KEY).includeProcessVariables();
+ HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowConstant.TRY_PROCESS_KEY).includeProcessVariables();
//.finished() // 鍙煡璇㈠凡瀹屾垚鐨勬祦绋�.unfinished() // 鏌ヨ鏈畬鎴愮殑娴佺▼
query.variableNotExists(FlowVariableConstant.EXCEPTION);//闈炲紓甯告祦绋�
query.variableValueEquals(FlowVariableConstant.PROGRAM_ON_MACHINE, FlowConstant.Y);//閫夋嫨鐜板満缂栧埗鐨�
- /*
- //杞﹀簥鎴栬�呴�夋嫨鐜板満缂栧埗鐨勭▼搴�
- String turnVal = paramService.turninngValue();
- List<Machine> machines = machineService.lambdaQuery().eq(Machine::getMachineSpec,turnVal).eq(Machine::getStatus,Machine.STATUS_ENABLE).list();
- List<String> turnMachineCodes = machines.stream().map(Machine::getCode).toList();
- query.or();
- for(String mCode : turnMachineCodes){
- query.variableValueEquals(FlowVariableContants.MACHINE_CODE, mCode);
- }
- query.endOr();
- */
if(queryVO.getEndTimeBegin()!=null) {
query.finishedAfter(DateUtil.toDate(queryVO.getEndTimeBegin()));
}
if(queryVO.getEndTimeEnd()!=null) {
- query.finishedBefore(DateUtil.toDate(queryVO.getEndTimeEnd()));
+ query.finishedBefore(DateUtil.plusDays(DateUtil.toDate(queryVO.getEndTimeEnd()),1));
}
if(Func.isNotEmpty(queryVO.getDrawingNo())) {
String likeVal = "%" + queryVO.getDrawingNo() + "%";
@@ -82,7 +67,6 @@
vo.setProcessCreateTime(processInstance.getStartTime());
vo.setHistoryTaskEndTime(processInstance.getEndTime());
-
//vo.setFile(getFileString(processInstance.getId()));
records.add(vo);
--
Gitblit v1.9.3