From 1007e0b552accd3288e7da6b47d8cc49a03bdf62 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期日, 27 四月 2025 11:06:35 +0800
Subject: [PATCH] art: 从沃克项目迁移设备管理代码到航宇
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/AssignStreamFlowController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/AssignStreamFlowController.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/AssignStreamFlowController.java
index 68278b0..d41ab56 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/AssignStreamFlowController.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/AssignStreamFlowController.java
@@ -1,7 +1,12 @@
package org.jeecg.modules.flowable.controller;
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
@@ -15,9 +20,11 @@
import org.flowable.image.ProcessDiagramGenerator;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto;
import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
import org.jeecg.modules.flowable.domain.dto.FlowTaskDto;
+import org.jeecg.modules.flowable.domain.vo.FlowHistoricalVo;
import org.jeecg.modules.flowable.domain.vo.FlowMy;
import org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo;
import org.jeecg.modules.flowable.service.IFlowTaskService;
@@ -35,8 +42,10 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+@Api(tags = "宸ヤ綔娴侀�氱敤涓氬姟鎺ュ彛")
@RestController
@RequestMapping("assign/flow")
@Slf4j
@@ -55,6 +64,10 @@
private HistoryService historyService;
@Autowired
private ProcessEngine processEngine;
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
@ApiOperation(value = "鑾峰彇鎬诲彴璐�", response = FlowTaskDto.class)
@GetMapping(value = "/list")
@@ -97,10 +110,26 @@
return flowTaskService.finishedList(pageNo, pageSize,flowMyBusinessDto);
}
+
@ApiOperation(value = "鑾峰彇宸ヤ綔娴佸巻鍙蹭换鍔�", response = FlowTaskDto.class)
@GetMapping(value = "/queryHisTaskList")
public Result<?> queryHisTaskList(@RequestParam(name = "procInstId") String procInstId) {
- return Result.OK(hisWorkTaskService.queryHisTaskByProcInstId(procInstId));
+ List<FlowHistoricalVo> flowHistoricalVos = hisWorkTaskService.queryHisTaskByProcInstId(procInstId);
+ if(CollectionUtil.isEmpty(flowHistoricalVos)) {
+ return Result.OK(Collections.emptyList());
+ }
+ List<JSONObject> items = new ArrayList<>();
+ try {
+ for(FlowHistoricalVo vo : flowHistoricalVos) {
+ String json = objectMapper.writeValueAsString(vo);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("assignee", vo.getAssignee(), item, "sys_user,realname,username");
+ items.add(item);
+ }
+ return Result.OK(items);
+ }catch (Exception e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
@ApiOperation(value = "瀹℃壒浠诲姟-鏌ョ湅娴佺▼鍥�")
--
Gitblit v1.9.3