Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/views/integration/applicationForm.vue

@@ -29,6 +29,7 @@
            stateParam: {},
            option: {
                height: "auto",
                tip:false,
                index: true,
                border: true,
                addBtn: false,
@@ -172,4 +173,4 @@
        },
    }
}
</script>
</script>

 Source/UBCS-WEB/src/views/integration/integrationIndex.vue

@@ -47,8 +47,8 @@
                            </template>
                        </avue-crud>
                    </el-card>
                    <el-card :style="{ marginTop: '20px' }">
                        <avue-crud :data="rangeData" :option="optinoRange" ref="crudRange" @row-update="handleUpdate"
                    <el-card :style="{ marginTop: '20px'}">
                        <avue-crud :style="{ marginTop: '-20px'}" :data="rangeData" :option="optinoRange" ref="crudRange" @row-update="handleUpdate"
                            @row-dblclick="handleRowClick">
                        </avue-crud>
                    </el-card>
@@ -439,4 +439,4 @@
::v-deep(.el-transfer-panel) {
    width: 270px;
}
</style>
</style>

 Source/UBCS-WEB/src/views/integration/systemInfo.vue

@@ -46,6 +46,7 @@
            data: [],
            option: {
                height: "auto",
              tip:false,
                border: true,
                align: 'center',
                menuAlign: 'center',
@@ -231,4 +232,4 @@
::v-deep(.avue-crud .el-select) {
    width: 100px !important;
}
</style>
</style>

 Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/business/service/impl/FlowBusinessServiceImpl.java

@@ -181,6 +181,16 @@
                flow.setProcessIsFinished(FlowEngineConstant.STATUS_UNFINISHED);
            }
            flow.setStatus(FlowEngineConstant.STATUS_FINISH);

            //流程变量
            Map<String,Object> variables = historicProcessInstance.getProcessVariables();
            flow.setVariables(variables);

            //businessKey
            if (Func.isNotEmpty(historicProcessInstance)) {
                flow.setBusinessId(businessKey.length>1 && StringUtils.isNotEmpty(businessKey[1])?businessKey[1]:"1");
            }

            flowList.add(flow);
        });


 Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/impl/VCIFlowserviceImpl.java

@@ -159,10 +159,17 @@

        String modelKey = processInstance.getProcessDefinitionKey();
        List<FlowTaskDTO> mis = flowEngineService.getNodeByFlowableKey(modelKey);
        Map<String,String> taskMap = new HashMap<>();
        mis.stream().forEach(e->{
            String taskId = e.getTaskId();
            String taskName = e.getTaskName();
            taskMap.put(taskId,taskName);
        });

        // 输出连线
        List<SequenceFlow> outFlows = flowNode.getOutgoingFlows();
        for (SequenceFlow sequenceFlow : outFlows) {
            String toname = sequenceFlow.getName()==null?"同意":sequenceFlow.getName();
            //当前审批节点
            if (NODE_NOW.equals(node)) {
                FlowElement sourceFlowElement = sequenceFlow.getSourceFlowElement();
@@ -174,9 +181,11 @@
                    FlowTaskDTO flowTaskUserCi = new FlowTaskDTO();
                    //flowTaskUserCi.setConditionKey(null);
                    //flowTaskUserCi.setConditionValue(null);
                    flowTaskUserCi.setToName("同意");
                    flowTaskUserCi.setToName(toname);
                    flowTaskUserCi.setToTaskId(targetFlow.getId());
                    flowTaskUserCi.setToTaskName(targetFlow.getName());
                    String taskName = taskMap.get(targetFlow.getId());
                    flowTaskUserCi.setToTaskName(taskName);
                    flowTaskUserCi.setTaskName(taskName);
                    taskList.add(flowTaskUserCi);
                }

@@ -199,6 +208,7 @@
                        String conditionExpression = nexti.getConditionExpression();//condition
                        String taskId = nexti.getTargetRef();//taskId
                        String name = nexti.getName();//toName,驳回、同意
                        String taskName = taskMap.get(targetFlow.getId());

                        for (FlowTaskDTO flowTaskUserCi:mis){
                            if(taskId.equals(flowTaskUserCi.getTaskId())){
@@ -220,7 +230,8 @@
                                }
                                flowTaskUserCi.setToName(name);
                                flowTaskUserCi.setToTaskId(taskId);
                                flowTaskUserCi.setToTaskName(flowTaskUserCi.getTaskName());
                                flowTaskUserCi.setToTaskName(taskName);
                                flowTaskUserCi.setTaskName(taskName);
                                taskList.add(flowTaskUserCi);
                            }
                        }