#

luxiaotao1123

2024-09-24 5f49763a34be0d0c839c108c00011e30170d345f

#

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

@@ -165,7 +165,7 @@
                    expandSingle={true}
                    omit={['id', 'uuid', 'startTime', 'endTime', 'errTime', 'emptyMk', 'zpallet',
                        'oriSta', 'oriLoc', 'oriCode', 'destSta', 'destLoc', 'destCode',
                        'updateTime', 'updateBy', 'createTime', 'createBy', 'statusBool', 'memo']}
                        'updateTime', 'updateBy', 'ioTime', 'createBy', 'statusBool', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.task.uuid" />
@@ -195,7 +195,6 @@
                        )} />
                        {/* <TextField source="name" /> */}
                    </ReferenceField>
                    <NumberField source="priority" label="table.field.task.priority" />
                    <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 />
@@ -220,6 +219,7 @@
                    </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" />

 zy-acs-manager/src/main/java/com/zy/acs/manager/common/utils/BusinessSortService.java

@@ -55,12 +55,15 @@
    }

    public String getOrderBySql(Class<? extends DataFieldSortFunc> cls, String fieldName) {
        return getOrderBySql(cls, fieldName, "create_time");
    }

    public String getOrderBySql(Class<? extends DataFieldSortFunc> cls, String fieldName, String timeField) {
        String sql = map.get(cls);
        if (!Cools.isEmpty(sql)) {
            return "ORDER BY FIELD(" + fieldName + ", " + sql + ") ASC, create_time DESC";
            return "ORDER BY FIELD(" + fieldName + ", " + sql + ") ASC, " + timeField + " DESC";
        }
        return "";
    }


}