From bc263d8bed5d1405f275bb8638a9bec9eaf06585 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 31 三月 2025 09:42:00 +0800
Subject: [PATCH] 添加审签逻辑，移动flow通用代码，添加根据角色查询用户，新增时间工具类，修改指派设备bug
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/AssignStreamFlowController.java | 63 +++++++------------------------
1 files changed, 15 insertions(+), 48 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/AssignStreamFlowController.java
similarity index 72%
rename from lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java
rename to lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/AssignStreamFlowController.java
index c4f0052..19c20a9 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/AssignStreamFlowController.java
@@ -1,4 +1,4 @@
-package org.jeecg.modules.dncFlow.controller;
+package org.jeecg.modules.flowable.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,22 +7,22 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.flowable.bpmn.model.BpmnModel;
-import org.flowable.engine.*;
+import org.flowable.engine.HistoryService;
+import org.flowable.engine.ProcessEngine;
+import org.flowable.engine.ProcessEngineConfiguration;
+import org.flowable.engine.RepositoryService;
import org.flowable.engine.history.HistoricActivityInstance;
import org.flowable.image.ProcessDiagramGenerator;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.dncFlow.entity.WorkTaskData;
-import org.jeecg.modules.dncFlow.entity.WorkTaskDataVo;
-import org.jeecg.modules.dncFlow.service.IAssignFileStreamService;
-import org.jeecg.modules.dncFlow.service.IHisWorkTaskService;
-import org.jeecg.modules.dncFlow.service.IWorkTaskService;
-import org.jeecg.modules.dncFlow.service.IWorkTaskServiceVo;
-import org.jeecg.modules.dncFlow.vo.FlowMy;
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.FlowMy;
+import org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo;
import org.jeecg.modules.flowable.service.IFlowTaskService;
+import org.jeecg.modules.flowable.service.IHisWorkTaskService;
+import org.jeecg.modules.flowable.service.IWorkTaskServiceVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,13 +38,11 @@
import java.util.List;
@RestController
-@RequestMapping("/nc/assign/flow")
+@RequestMapping("assign/flow")
@Slf4j
-public class AssignFileStreamFlowController {
+public class AssignStreamFlowController {
@Autowired
FlowMyBusinessServiceImpl flowMyBusinessService;
- @Autowired
- IWorkTaskService workTaskService;
@Autowired
IFlowTaskService flowTaskService;
@Autowired
@@ -52,16 +50,13 @@
@Autowired
IHisWorkTaskService hisWorkTaskService;
@Autowired
- private TaskService taskService;
- @Autowired
private RepositoryService repositoryService;
@Autowired
private HistoryService historyService;
@Autowired
private ProcessEngine processEngine;
- @Autowired
- private IAssignFileStreamService assignFileStreamService;
+ @ApiOperation(value = "鑾峰彇鎬诲彴璐�", response = FlowTaskDto.class)
@GetMapping(value = "/list")
public Result<IPage<FlowMyBusinessDto>> queryPageList(FlowMyBusinessDto flowMyBusinessDto,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -69,37 +64,9 @@
HttpServletRequest req) {
Page page = new Page(pageNo, pageSize);
IPage<FlowMyBusinessDto> pageList = flowMyBusinessService.getPageList(page, flowMyBusinessDto);
- pageList.getRecords().forEach(item -> {
- 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);
}
- /*
- * 鑾峰彇鎵�鏈変换鍔″垪琛�
- * */
- @GetMapping(value = "/workTasklist")
- public Result<IPage<WorkTaskData>> queryTaskPageList(WorkTaskData workTaskData,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- List<WorkTaskData> list = workTaskService.queryAllworkTask();
- IPage<WorkTaskData> pageList = new Page<>(pageNo, pageSize, list.size());
- pageList.setRecords(list);
- return Result.OK(pageList);
- }
+
@ApiOperation(value = "鑾峰彇寰呭姙鍒楄〃", response = FlowTaskDto.class)
@GetMapping(value = "/todoList")
public Result todoList(@ApiParam(value = "褰撳墠椤电爜", required = true) @RequestParam (name="pageNum", defaultValue="1") Integer pageNum,
@@ -127,8 +94,8 @@
@ApiOperation(value = "鑾峰彇宸ヤ綔娴佸巻鍙蹭换鍔�", response = FlowTaskDto.class)
@GetMapping(value = "/queryHisTaskList")
- public Result<?> queryHisTaskList(@RequestParam(name = "drapprovedataId") String drapprovedataId) {
- return Result.OK(hisWorkTaskService.queryHisTaskList(drapprovedataId));
+ public Result<?> queryHisTaskList(@RequestParam(name = "procInstId") String procInstId) {
+ return Result.OK(hisWorkTaskService.queryHisTaskByProcInstId(procInstId));
}
@ApiOperation(value = "瀹℃壒浠诲姟-鏌ョ湅娴佺▼鍥�")
--
Gitblit v1.9.3