#

luxiaotao1123

2024-09-27 6df1b6a36e02657c6e91ead1a5c9de4a95fd548d

#

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

@@ -18,11 +18,7 @@
    );
};

export const MissionCardContent = ({
    provided,
    snapshot,
    mission,
}) => {
export const MissionCardContent = ({ provided, snapshot, mission, }) => {
    const redirect = useRedirect();
    const handleClick = () => {
        redirect(`/mission/${mission.id}/show`, undefined, undefined, undefined, {
@@ -58,7 +54,7 @@
                            {mission.groupNo}
                        </Typography>
                        <Typography variant="caption" color="textSecondary">
                            1
                            {mission.posType}
                        </Typography>
                    </Box>
                </Box>

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

@@ -24,15 +24,14 @@
        >
            <Stack alignItems="center">
                <Typography variant="subtitle1">
                    1
                    {/* {findDealLabel(dealStages, stage)} */}
                    {stage}
                </Typography>
                <Typography
                    variant="subtitle1"
                    color="text.secondary"
                    fontSize="small"
                >
                    2
                    {missions.length}
                </Typography>
            </Stack>
            <Droppable droppableId={stage}>

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

@@ -1,18 +1,45 @@
import { useEffect, useState } from 'react';
import { DragDropContext } from '@hello-pangea/dnd';
import { Box } from '@mui/material';
import isEqual from 'lodash/isEqual';
import { useEffect, useState } from 'react';
import { useDataProvider, useListContext } from 'react-admin';

import {
    useDataProvider,
    useListContext,
    useNotify,
    useRefresh,
    useTranslate,
} from 'react-admin';
import { MissionColumn } from './MissionColumn';
import request from '@/utils/request';

export const MissionListContent = () => {
    const translate = useTranslate();
    const notify = useNotify();
    const refresh = useRefresh();
    const { data, isPending, refetch } = useListContext();
    const dataProvider = useDataProvider();

    const [stages, setStages] = useState([]);

    // const [dealsByStage, setDealsByStage] = useState(
    //     getDealsByStage([], dealStages)
    // );

    useEffect(() => {
        const httpStages = async () => {
            request.post('/mission/posType/list').then(res => {
                const { code, msg, data } = res.data;
                if (code === 200) {
                    setStages(data);
                } else {
                    notify(msg || 'common.response.fail', { type: 'error', messageArgs: { _: msg } });
                }
            }).catch(error => {
                notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
            })
        }
        httpStages();
    }, []);

    useEffect(() => {
        // if (data) {
@@ -66,16 +93,14 @@
        // });
    };

    const columns = ['a', 'b']

    return (
        <DragDropContext onDragEnd={onDragEnd}>
            <Box display="flex">
                {columns.map(column => (
                {stages.map(stage => (
                    <MissionColumn
                        stage={column}
                        missions={data}
                        key={column}
                        key={stage}
                        stage={stage}
                        missions={data.filter(item => item.posType === stage)}
                    />
                ))}
            </Box>

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java

@@ -2,6 +2,7 @@

import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.core.domain.TaskPosDto;
import com.zy.acs.manager.manager.service.MissionService;
import com.zy.acs.manager.manager.service.SegmentService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -12,6 +13,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

/**
@@ -32,4 +35,14 @@
        return R.ok().add(Cools.add("total", Integer.MAX_VALUE).add("records", missionService.getList()));
    }

    @PreAuthorize("hasAuthority('manager:mission:list')")
    @PostMapping("/mission/posType/list")
    public R posTypeList() {
        List<String> list = new ArrayList<>();
        for (TaskPosDto.PosType value : TaskPosDto.PosType.values()) {
            list.add(value.toString());
        }
        return R.ok().add(list);
    }

}

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

@@ -10,6 +10,8 @@

    private Long id;

    String groupNo;
    private String groupNo;

    private String posType;

}

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

@@ -42,9 +42,12 @@
            return null;
        }
        Segment segment = list.get(0);

        MissionVo vo = new MissionVo();
        vo.setGroupNo(groupNo);
        vo.setId(segment.getId());
        vo.setPosType(segment.getPosType());

        return vo;
    }