#

vincentlu

2025-04-18 0d0c4fd1316341b04e1a2b8f29e634d4464f712e

#

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

@@ -203,7 +203,7 @@
                title={"menu.task"}
                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
                filters={filters}
                sort={{ field: "create_time", order: "desc" }}
                sort={{ field: "", order: "" }}
                actions={(
                    <TopToolbar>
                        <FilterButton />
@@ -227,8 +227,8 @@
                        'updateTime', 'updateBy', 'ioTime', 'createBy', 'statusBool', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.task.uuid" />
                    <TextField source="seqNum" label="table.field.task.seqNum" />
                    <TextField source="uuid" label="table.field.task.uuid" sortable={false} />
                    <TextField source="seqNum" label="table.field.task.seqNum" sortable={false} />
                    <ReferenceField source="busId" label="table.field.task.busId" reference="bus" link={false} sortable={false}>
                        <TextField source="busNo" />
                    </ReferenceField>
@@ -254,10 +254,10 @@
                        )} />
                        {/* <TextField source="name" /> */}
                    </ReferenceField>
                    <DateField source="ioTime" label="table.field.task.ioTime" showTime />
                    <DateField source="startTime" label="table.field.task.startTime" showTime />
                    <DateField source="endTime" label="table.field.task.endTime" showTime />
                    <DateField source="errTime" label="table.field.task.errTime" showTime />
                    <DateField source="ioTime" label="table.field.task.ioTime" showTime sortable={false} />
                    <DateField source="startTime" label="table.field.task.startTime" showTime sortable={false} />
                    <DateField source="endTime" label="table.field.task.endTime" showTime sortable={false} />
                    <DateField source="errTime" label="table.field.task.errTime" showTime sortable={false} />
                    <ReferenceField source="oriSta" label="table.field.task.oriSta" reference="sta" link={false} sortable={false}>
                        <TextField source="staNo" />
                    </ReferenceField>
@@ -276,12 +276,12 @@
                    <ReferenceField source="destCode" label="table.field.task.destCode" reference="code" link={false} sortable={false}>
                        <TextField source="data" />
                    </ReferenceField>
                    <TextField source="oriDesc" label="table.field.task.oriDesc" />
                    <TextField source="destDesc" label="table.field.task.destDesc" />
                    <NumberField source="priority" label="table.field.task.priority" />
                    <TextField source="emptyMk" label="table.field.task.emptyMk" />
                    <TextField source="zpallet" label="table.field.task.zpallet" />
                    <TextField source="errDesc" label="table.field.task.errDesc" />
                    <TextField source="oriDesc" label="table.field.task.oriDesc" sortable={false} />
                    <TextField source="destDesc" label="table.field.task.destDesc" sortable={false} />
                    <NumberField source="priority" label="table.field.task.priority" sortable={false} />
                    <TextField source="emptyMk" label="table.field.task.emptyMk" sortable={false} />
                    <TextField source="zpallet" label="table.field.task.zpallet" sortable={false} />
                    <TextField source="errDesc" label="table.field.task.errDesc" sortable={false} />

                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
@@ -290,7 +290,7 @@
                    <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    <DateField source="createTime" label="common.field.createTime" showTime sortable={false} />
                    <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 => (

 zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/BaseParam.java

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

import com.baomidou.mybatisplus.annotation.TableField;
import com.zy.acs.common.utils.Utils;
import com.zy.acs.framework.common.Cools;
import lombok.Data;

import java.io.Serializable;
@@ -50,7 +51,10 @@
            map.remove("pageSize");
        }
        if (null != map.get("orderBy")) {
            this.setOrderBy(Utils.convertToSnakeCaseForOrderByStr(String.valueOf(map.get("orderBy"))));
            String orderBy = String.valueOf(map.get("orderBy"));
            if (!Cools.isEmpty(orderBy.trim())) {
                this.setOrderBy(Utils.convertToSnakeCaseForOrderByStr(orderBy));
            }
            map.remove("orderBy");
        }
        if (null != map.get("timeStart")) {

 zy-acs-manager/src/main/resources/mapper/manager/TaskMapper.xml

@@ -57,7 +57,14 @@
                )
            </if>
        </where>
        ORDER BY FIELD(a.task_sts, 18, 17, 16, 15, 20, 19), io_time DESC
        <choose>
            <when test="param.orderBy != null and param.orderBy != '' ">
                order by a.${param.orderBy}
            </when>
            <otherwise>
                ORDER BY FIELD(a.task_sts, 18, 17, 16, 15, 20, 19), a.io_time DESC
            </otherwise>
        </choose>
    </select>

    <select id="selectStatByLastSevenDays" resultType="java.util.Map">