#

luxiaotao1123

2025-04-17 3cd4159326af710c30b3c4ffe19e05d80ee1f405

#

 zy-acs-flow/src/page/segment/SegmentList.jsx

@@ -33,6 +33,7 @@
    FunctionField,
    Count,
    useNotify,
    useRefresh,
} from 'react-admin';
import { Box, Typography, Stack, useMediaQuery, Tabs, Tab, Divider } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -145,6 +146,7 @@
const TabbedDatagrid = () => {
    const translate = useTranslate();
      const notify = useNotify();
    const refresh = useRefresh();
    const { filterValues, setFilters, displayedFilters } = useListContext();
    const isXSmall = useMediaQuery(theme =>
        theme.breakpoints.down('sm')

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java

@@ -131,7 +131,7 @@
        for (Segment seg : segmentList) {
            Task task = taskService.getById(segment.getTaskId());
            if (task != null &&
                    (!task.getTaskSts().equals(TaskStsType.COMPLETE.val()) || !task.getTaskSts().equals(TaskStsType.CANCEL.val()))) {
                    (!task.getTaskSts().equals(TaskStsType.COMPLETE.val()) && !task.getTaskSts().equals(TaskStsType.CANCEL.val()))) {
                throw new CoolException("the task is not finish");
            }
            seg.setState(SegmentStateType.FINISH.toString());