添加审签逻辑，移动flow通用代码，添加根据角色查询用户，新增时间工具类，修改指派设备bug

lyh

2025-03-31 bc263d8bed5d1405f275bb8638a9bec9eaf06585

 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/AssignStreamFlowController.java

ÎļþÃû´Ó lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.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 = "审批任务-查看流程图")