#

luxiaotao1123

2024-09-29 b95b5437d64089f8cf4cfc1adb20b1e4ea583821

#

 zy-acs-flow/src/page/mission/MissionShow.jsx

@@ -116,7 +116,7 @@
                                    gap={1}
                                >
                                    <Typography variant="body2">
                                        {format(record.sendTime, 'yyyy-MM-dd HH:mm:ss')}
                                        {format(record.sendTime, 'yyyy-MM-dd HH:mm:ss') || '-'}
                                    </Typography>
                                </Stack>
                            </Box>
@@ -129,7 +129,7 @@
                                    Bus No
                                </Typography>
                                <Typography variant="body2">
                                    {record.busNo}
                                    {record.busNo || '-'}
                                </Typography>
                            </Box>

@@ -182,16 +182,16 @@
                            </Box>
                        )}

                        {record.description && (
                        {!!record.codeList?.length && (
                            <Box m={2} sx={{ whiteSpace: 'pre-line' }}>
                                <Typography
                                    color="textSecondary"
                                    variant="caption"
                                >
                                    Description
                                    Run Path
                                </Typography>
                                <Typography variant="body2">
                                    {record.description}
                                    [&nbsp;{record.codeList.join(' , ')}&nbsp;]
                                </Typography>
                            </Box>
                        )}

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java

@@ -38,6 +38,6 @@

    private int actionCount;


    private List<String> codeList = new ArrayList<>();

}

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

@@ -95,6 +95,7 @@
        vo.setBusNo(task.getBusId$());
        vo.setActionCount(actionList.size());
        vo.setTaskIds(list.stream().map(Segment::getTaskId).collect(Collectors.toList()));
        vo.setCodeList(actionList.stream().map(Action::getCode).distinct().collect(Collectors.toList()));
        return vo;
    }

@@ -112,7 +113,7 @@
        }
        Code code = codeService.getById(recentCode);

        List<String> codeList = actionList.stream().map(Action::getCode).collect(Collectors.toList());
        List<String> codeList = actionList.stream().map(Action::getCode).distinct().collect(Collectors.toList());

        int totalCodes = codeList.size();
        int currentIndex = codeList.indexOf(code.getData());