#

luxiaotao1123

2024-09-24 ffe12f98e20ab6cccca164a2d0ce9b266f40c0ac

#

 zy-acs-flow/src/page/task/TaskList.jsx

@@ -137,6 +137,30 @@
    const [createDialog, setCreateDialog] = useState(false);
    const [drawerVal, setDrawerVal] = useState(false);

    const [taskStsByComplete, setTaskStsByComplete] = useState(null);
    const [taskStsByCancel, setTaskStsByCancel] = useState(null);

    useEffect(() => {
        request.post('/taskSts/list', {
            uuid: 'COMPLETE'
        }, {
            headers: {
                'Content-Type': 'application/x-www-form-urlencoded'
            }
        }).then(res => {
            setTaskStsByComplete(res.data.data[0]?.id);
        })
        request.post('/taskSts/list', {
            uuid: '已取消'
        }, {
            headers: {
                'Content-Type': 'application/x-www-form-urlencoded'
            }
        }).then(res => {
            setTaskStsByCancel(res.data.data[0]?.id);
        })
    }, []);

    const onComplete = (taskId) => {
        request.get("/task/complete/" + taskId).then(res => {
            const { code, msg, data } = res.data;
@@ -266,7 +290,7 @@
                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <FunctionField label="common.field.opt" cellClassName="opt" render={record => (
                        (record.taskSts === 15 || true) && (
                        (record.taskSts !== taskStsByComplete && record.taskSts !== taskStsByCancel) && (
                            <>
                                <ConfirmButton
                                    label="common.action.complete"

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

@@ -54,7 +54,7 @@
        PageParam<Bus, BaseParam> pageParam = new PageParam<>(baseParam, Bus.class);
        QueryWrapper<Bus> wrapper = pageParam.buildWrapper(true);
        if (hasCreateTimeDesc(pageParam.getOrders())) {
            wrapper.last(businessSortService.getOrderBySql(BusStsType.class, "bus_sts"));
//            wrapper.last(businessSortService.getOrderBySql(BusStsType.class, "bus_sts"));
        }
        PageParam<Bus, BaseParam> page = busService.page(pageParam, wrapper);


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

@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.entity.TaskSts;
import com.zy.acs.manager.manager.service.TaskStsService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -36,8 +36,12 @@

    @PreAuthorize("hasAuthority('manager:taskSts:list')")
    @PostMapping("/taskSts/list")
    public R list(@RequestBody Map<String, Object> map) {
        return R.ok().add(taskStsService.list());
    public R list(@RequestParam(required = false) String uuid) {
        LambdaQueryWrapper<TaskSts> wrapper = new LambdaQueryWrapper<>();
        if (!Cools.isEmpty(uuid)) {
            wrapper.eq(TaskSts::getUuid, uuid);
        }
        return R.ok().add(taskStsService.list(wrapper));
    }

    @PreAuthorize("hasAuthority('manager:taskSts:list')")