工作流已办更改

lyh

101 分钟以前 37e3cc168466bbda24c8cd54d5f5b4defde98752

工作流已办更改

 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/apithird/business/mapper/xml/FlowMyBusinessMapper.xml

@@ -47,7 +47,8 @@
    <select id="ListMyBusiness" resultType="org.jeecg.modules.flowable.domain.dto.FlowTaskDto">
        SELECT
        latest_task.ID_ AS 'taskId',
        latest_task.PROC_DEF_ID_ AS 'procInsId',
        latest_task.PROC_DEF_ID_ AS 'procInstId',
        latest_task.PROC_DEF_ID_ AS 'processInstanceId',
        ACT_RE_PROCDEF.CATEGORY_ AS 'category',
        ACT_RE_PROCDEF.NAME_ AS 'procDefName',
        fmb.title AS 'Description',

 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/domain/dto/FlowTaskDto.java

@@ -78,7 +78,7 @@
    private int procDefVersion;

    @ApiModelProperty("流程实例ID")
    private String procInsId;
    private String procInstId;

    @ApiModelProperty("历史流程实例ID")
    private String hisProcInsId;

 lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java

@@ -901,7 +901,7 @@
            FlowTaskDto flowTask = new FlowTaskDto();
            flowTask.setCreateTime(hisIns.getStartTime());
            flowTask.setFinishTime(hisIns.getEndTime());
            flowTask.setProcInsId(hisIns.getId());
            flowTask.setProcInstId(hisIns.getId());

            // 计算耗时
            if (Objects.nonNull(hisIns.getEndTime())) {
@@ -1122,7 +1122,7 @@
            flowTask.setDeployId(pd.getDeploymentId());
            flowTask.setProcDefName(pd.getName());
            flowTask.setProcDefVersion(pd.getVersion());
            flowTask.setProcInsId(task.getProcessInstanceId());
            flowTask.setProcInstId(task.getProcessInstanceId());

            // 流程发起人信息
            HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
@@ -1155,28 +1155,6 @@
        String username = iFlowThirdService.getLoginUser().getUsername();
        flowMyBusinessDto.setCurrentUser(username);
        List<FlowTaskDto> list = flowMyBusinessService.ListMyBusiness(flowMyBusinessDto);
//        list.forEach(flowTaskDto -> {
//            // 流程发起人信息
//            HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
//                    .processInstanceId(flowTaskDto.getProcInsId())
//                    .singleResult();
//            if (historicProcessInstance != null) {
//                SysUser startUser = iFlowThirdService.getUserByUsername(historicProcessInstance.getStartUserId());
//                if (startUser != null) {
//                    flowTaskDto.setStartUserId(startUser.getUsername());
//                    flowTaskDto.setStartUserName(startUser.getRealname());
//                }
//                List<String> departNamesByUsername = iFlowThirdService.getDepartNamesByUsername(historicProcessInstance.getStartUserId());
//                flowTaskDto.setStartDeptName(CollUtil.join(departNamesByUsername, "，"));
//                if (flowTaskDto.getTodoUsers() == null) {
//                    flowTaskDto.setTodoUsers("");
//                } else {
//                    //去除[]
//                    flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\\[", "").replaceAll("\\]", ""));
//                    flowTaskDto.setTodoUsers(flowTaskDto.getTodoUsers().replaceAll("\"", ""));
//                }
//            }
//        });
        IPage<FlowTaskDto> flowTaskDtoIPage = new Page<>();
        flowTaskDtoIPage.setRecords(list);
        flowTaskDtoIPage.setTotal(page.getTotal());