From ed839069a1df066d9559263129e999de7e9c2ccc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 19 三月 2025 13:40:58 +0800
Subject: [PATCH] 修改产品结构树，修改指派程序至设备
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java
index a991f2d..c4f0052 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java
@@ -10,10 +10,8 @@
import org.flowable.engine.*;
import org.flowable.engine.history.HistoricActivityInstance;
import org.flowable.image.ProcessDiagramGenerator;
-import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.dncFlow.entity.HisWorkTask;
import org.jeecg.modules.dncFlow.entity.WorkTaskData;
import org.jeecg.modules.dncFlow.entity.WorkTaskDataVo;
import org.jeecg.modules.dncFlow.service.IAssignFileStreamService;
@@ -72,11 +70,20 @@
Page page = new Page(pageNo, pageSize);
IPage<FlowMyBusinessDto> pageList = flowMyBusinessService.getPageList(page, flowMyBusinessDto);
pageList.getRecords().forEach(item -> {
- //鍘婚櫎[]
- item.setTodoUsers(item.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
- item.setTodoUsers(item.getTodoUsers().replaceAll("\"", ""));
- item.setDoneUsers(item.getDoneUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
- item.setDoneUsers(item.getDoneUsers().replaceAll("\"", ""));
+ if (item.getTodoUsers() == null){
+ item.setTodoUsers("");
+ }else{
+ //鍘婚櫎[]
+ item.setTodoUsers(item.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
+ item.setTodoUsers(item.getTodoUsers().replaceAll("\"", ""));
+ }
+ if (item.getDoneUsers() == null){
+ item.setDoneUsers("");
+ }else {
+ //鍘婚櫎[]
+ item.setDoneUsers(item.getDoneUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
+ item.setDoneUsers(item.getDoneUsers().replaceAll("\"", ""));
+ }
});
return Result.OK(pageList);
}
@@ -111,25 +118,26 @@
@ApiOperation(value = "鑾峰彇宸插姙浠诲姟", response = FlowTaskDto.class)
@GetMapping(value = "/finishedList")
- public Result finishedList(@ApiParam(value = "褰撳墠椤电爜", required = true) @RequestParam Integer pageNo,
- @ApiParam(value = "姣忛〉鏉℃暟", required = true) @RequestParam Integer pageSize) {
- return flowTaskService.finishedList(pageNo, pageSize);
+ public Result<?> finishedList(@ApiParam(value = "褰撳墠椤电爜", required = true) @RequestParam Integer pageNo,
+ @ApiParam(value = "姣忛〉鏉℃暟", required = true) @RequestParam Integer pageSize,
+ FlowMyBusinessDto flowMyBusinessDto) {
+ return flowTaskService.finishedList(pageNo, pageSize,flowMyBusinessDto);
}
@ApiOperation(value = "鑾峰彇宸ヤ綔娴佸巻鍙蹭换鍔�", response = FlowTaskDto.class)
@GetMapping(value = "/queryHisTaskList")
- public Result<List<HisWorkTask>> queryHisTaskList(@RequestParam(name = "drapprovedataId") String drapprovedataId) {
+ public Result<?> queryHisTaskList(@RequestParam(name = "drapprovedataId") String drapprovedataId) {
return Result.OK(hisWorkTaskService.queryHisTaskList(drapprovedataId));
}
@ApiOperation(value = "瀹℃壒浠诲姟-鏌ョ湅娴佺▼鍥�")
@GetMapping("/diagramView")
- public void showImages(@RequestParam(name = "taskId") String taskId, HttpServletResponse response) throws IOException {
- Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
- String processDefinitionId = task.getProcessDefinitionId();
+ public void showImages(@RequestParam(name = "processDefinitionId") String processDefinitionId,
+ @RequestParam(name = "processInstanceId") String processInstanceId,
+ @RequestParam(name = "TaskDefinitionKey") String TaskDefinitionKey,
+ HttpServletResponse response) throws IOException {
BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
- String processInstanceId = task.getProcessInstanceId();
List<HistoricActivityInstance> historyProcess = historyService.createHistoricActivityInstanceQuery()
.processInstanceId(processInstanceId)
.finished()
@@ -146,7 +154,7 @@
activityIds.add(hi.getActivityId());
}
}
- activityIds.add(task.getTaskDefinitionKey());
+ activityIds.add(TaskDefinitionKey);
ProcessEngineConfiguration engConf = processEngine.getProcessEngineConfiguration();
ProcessDiagramGenerator processDiagramGenerator = engConf.getProcessDiagramGenerator();
--
Gitblit v1.9.3