From fe185a5eb4669e925af908153bdf21778551fdb4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 20 八月 2025 20:23:36 +0800
Subject: [PATCH] 增加固化流程文件内容比对接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 113 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 96 insertions(+), 17 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
index 5e5fe63..478b0da 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java
@@ -156,7 +156,6 @@
if(ru.isSuccess()) {
flow.setStartUserName(ru.getData().getName());
}
- ;
List<Comment> comments = lastStepComments(task);//taskService.getTaskComments(task.getId());
if(!comments.isEmpty()){
flow.setComment(comments.get(0).getFullMessage());
@@ -203,15 +202,7 @@
return Collections.emptyList();
}
}
- /**
- * 鑾峰彇鍘嗗彶娴佺▼
- *
- * @param processInstanceId 娴佺▼瀹炰緥id
- * @return HistoricProcessInstance
- */
- private HistoricProcessInstance getHistoricProcessInstance(String processInstanceId) {
- return historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
- }
+
public IPage<FlowVO> selectAllTaskPage(IPage<FlowVO> page, String keyword) {
@@ -287,10 +278,9 @@
* @param keyword
* @return
*/
- public IPage<FlowVO> selectSearchPage(IPage<FlowVO> page, LocalDate createTimeBegin, LocalDate createTimeEnd,String processDefinitionKey,String keyword) {
+ public IPage<FlowVO> selectSearchPage(IPage<FlowVO> page,String myProcessName,String keyword, LocalDate createTimeBegin, LocalDate createTimeEnd) {
List<FlowVO> flowList = new LinkedList<>();
- Date now = new Date();
TaskQuery taskQuery = taskService.createTaskQuery().active().includeProcessVariables();
if(Func.isNotEmpty(createTimeBegin)) {
taskQuery.taskCreatedAfter(DateUtil.toDate(createTimeBegin));
@@ -298,8 +288,8 @@
if(Func.isNotEmpty(createTimeEnd)) {
taskQuery.taskCreatedBefore(DateUtil.toDate(createTimeEnd.plusDays(1)));
}
- if(Func.isNotEmpty(processDefinitionKey)) {
- taskQuery.processDefinitionKey(processDefinitionKey);
+ if(Func.isNotEmpty(myProcessName)) {
+ taskQuery.processVariableValueEquals(FlowContants.MY_PROCESS_NAME, myProcessName);
}
addKeywordCondition(taskQuery, keyword);
@@ -332,11 +322,11 @@
* @param keyword 鍏抽敭瀛�
* @return
*/
- public IPage<FlowVO> selectFinishedPage(IPage<FlowVO> page, String processDefinitionKey,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd, String keyword) {
+ public IPage<FlowVO> selectFinishedPage(IPage<FlowVO> page, String myProcessName, String keyword,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd) {
HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().includeProcessVariables();
//.finished() // 鍙煡璇㈠凡瀹屾垚鐨勬祦绋�.unfinished() // 鏌ヨ鏈畬鎴愮殑娴佺▼
- if(Func.isNotEmpty(processDefinitionKey)) {
- query.processDefinitionKey(processDefinitionKey);
+ if(Func.isNotEmpty(myProcessName)) {
+ query.variableValueEquals(FlowContants.MY_PROCESS_NAME, myProcessName);
}
if(createTimeBegin!=null) {
query.startedAfter(DateUtil.toDate(createTimeBegin));
@@ -344,6 +334,21 @@
if(createTimeEnd!=null) {
query.startedBefore(DateUtil.toDate(createTimeEnd));
}
+ if(Func.isNotEmpty(keyword)) {
+ String likeVal = "%" + keyword + "%";
+ query.or();
+ query.variableValueLike(FlowContants.TITLE,likeVal);
+ query.variableValueLike(FlowContants.PROCESS_NO, likeVal);
+ query.variableValueLike(FlowContants.MACHINE_CODE, likeVal);
+ query.variableValueLike(FlowContants.MACHINE_MODE, likeVal);
+ query.variableValueLike(FlowContants.PROCESS_NAME, likeVal);
+ query.variableValueLike(FlowContants.PROCESS_EDITION, likeVal);
+ query.variableValueLike(FlowContants.CRAFT_EDITION, likeVal);
+
+ query.endOr();
+ }
+
+
query.orderByProcessInstanceEndTime().desc(); // 鎸夌粨鏉熸椂闂撮檷搴忔帓鍒�
page.setTotal(query.count());
@@ -363,6 +368,80 @@
vo.setProcessCreateTime(processInstance.getStartTime());
vo.setHistoryTaskEndTime(processInstance.getEndTime());
+ R<User> ru = userClient.userInfoById(Long.valueOf(processInstance.getStartUserId()));
+ if(ru.isSuccess()) {
+ vo.setStartUserName(ru.getData().getName());
+ }
+
+ vo.setFile(getFileString(processInstance.getId()));
+ records.add(vo);
+ }
+
+ page.setRecords(records);
+
+ return page;
+ }
+
+ /**
+ * 寮傚父娴佺▼
+ * @param page
+ * @param myProcessName
+ * @param keyword
+ * @param createTimeBegin
+ * @param createTimeEnd
+ * @return
+ */
+ public IPage<FlowVO> selectExceptionPage(IPage<FlowVO> page, String myProcessName, String keyword,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd) {
+ HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().includeProcessVariables();
+ //.finished() // 鍙煡璇㈠凡瀹屾垚鐨勬祦绋�.unfinished() // 鏌ヨ鏈畬鎴愮殑娴佺▼
+
+ query.variableValueEquals(FlowContants.EXCEPTION, "1");
+ if(Func.isNotEmpty(myProcessName)) {
+ query.variableValueEquals(FlowContants.MY_PROCESS_NAME, myProcessName);
+ }
+ if(createTimeBegin!=null) {
+ query.startedAfter(DateUtil.toDate(createTimeBegin));
+ }
+ if(createTimeEnd!=null) {
+ query.startedBefore(DateUtil.toDate(createTimeEnd));
+ }
+ if(Func.isNotEmpty(keyword)) {
+ String likeVal = "%" + keyword + "%";
+ query.or();
+ query.variableValueLike(FlowContants.TITLE,likeVal);
+ query.variableValueLike(FlowContants.PROCESS_NO, likeVal);
+ query.variableValueLike(FlowContants.MACHINE_CODE, likeVal);
+ query.variableValueLike(FlowContants.MACHINE_MODE, likeVal);
+ query.variableValueLike(FlowContants.PROCESS_NAME, likeVal);
+ query.variableValueLike(FlowContants.PROCESS_EDITION, likeVal);
+ query.variableValueLike(FlowContants.CRAFT_EDITION, likeVal);
+
+ query.endOr();
+ }
+
+
+ query.orderByProcessInstanceEndTime().desc(); // 鎸夌粨鏉熸椂闂撮檷搴忔帓鍒�
+ page.setTotal(query.count());
+
+ long firstResult = (page.getCurrent()-1) * page.getSize();
+ List<HistoricProcessInstance> processes = query
+ .listPage((int)firstResult, (int)page.getSize());
+
+ List<FlowVO> records = new LinkedList<>();
+
+ for(HistoricProcessInstance processInstance : processes) {
+ FlowVO vo = new FlowVO();
+ vo.setProcessDefinitionKey(processInstance.getProcessDefinitionKey());
+ vo.setProcessInstanceId(processInstance.getId());
+ vo.setProcessDefinitionName(processInstance.getProcessDefinitionName());
+ vo.setVariables(processInstance.getProcessVariables());
+
+ vo.setProcessCreateTime(processInstance.getStartTime());
+ vo.setHistoryTaskEndTime(processInstance.getEndTime());
+ R<User> ru = userClient.userInfoById(Long.valueOf(processInstance.getStartUserId()));
+ if(ru.isSuccess()) {
+ vo.setStartUserName(ru.getData().getName());
+ }
vo.setFile(getFileString(processInstance.getId()));
records.add(vo);
}
--
Gitblit v1.9.3