From 0d61b9bfca526e9c3da2209de8f9f367e76fd013 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 18:09:35 +0800
Subject: [PATCH] 修改constant类名
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramOnMachineExportService.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 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 50225aa..0416a43 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
@@ -6,25 +6,16 @@
import org.flowable.engine.HistoryService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.history.HistoricProcessInstanceQuery;
-import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
-import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
import org.springblade.mdm.commons.service.ParamService;
-import org.springblade.mdm.flow.constants.FlowContants;
-import org.springblade.mdm.flow.constants.FlowVariableContants;
+import org.springblade.mdm.flow.constants.FlowConstant;
+import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.vo.FlowVO;
import org.springblade.mdm.flow.vo.ProgramOnMachineQueryVO;
-import org.springblade.mdm.program.service.NcNodeHisService;
-import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.system.feign.IDictBizClient;
import org.springframework.stereotype.Service;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.*;
/**
@@ -47,10 +38,10 @@
*/
public IPage<FlowVO> finishedPage(IPage<FlowVO> page, ProgramOnMachineQueryVO queryVO) {
//鍥哄寲閲岃矾鏉戝畼
- HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowContants.CURE_PROCESS_KEY).includeProcessVariables();
+ HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowConstant.CURE_PROCESS_KEY).includeProcessVariables();
//.finished() // 鍙煡璇㈠凡瀹屾垚鐨勬祦绋�.unfinished() // 鏌ヨ鏈畬鎴愮殑娴佺▼
- query.variableNotExists(FlowVariableContants.EXCEPTION);//闈炲紓甯告祦绋�
- query.variableValueEquals(FlowVariableContants.PROGRAM_ON_MACHINE,FlowContants.Y);//閫夋嫨鐜板満缂栧埗鐨�
+ query.variableNotExists(FlowVariableConstant.EXCEPTION);//闈炲紓甯告祦绋�
+ query.variableValueEquals(FlowVariableConstant.PROGRAM_ON_MACHINE, FlowConstant.Y);//閫夋嫨鐜板満缂栧埗鐨�
/*
//杞﹀簥鎴栬�呴�夋嫨鐜板満缂栧埗鐨勭▼搴�
String turnVal = paramService.turninngValue();
@@ -71,7 +62,7 @@
}
if(Func.isNotEmpty(queryVO.getDrawingNo())) {
String likeVal = "%" + queryVO.getDrawingNo() + "%";
- query.variableValueLike(FlowVariableContants.DRAWING_NO,likeVal);
+ query.variableValueLike(FlowVariableConstant.DRAWING_NO,likeVal);
}
query.orderByProcessInstanceEndTime().desc(); // 鎸夌粨鏉熸椂闂撮檷搴忔帓鍒�
page.setTotal(query.count());
--
Gitblit v1.9.3