#

luxiaotao1123

2024-09-24 dff45383c24a032b5665e4618cab1b6afac094b7

#

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

@@ -68,8 +68,8 @@
    <DateInput label='common.time.before' source="timeEnd" alwaysOn />,

    // <TextInput source="uuid" label="table.field.task.uuid" />,
    <ReferenceInput source="busId" label="table.field.task.busId" reference="bus">
        <AutocompleteInput label="table.field.task.busId" optionText="seqNum" filterToQuery={(val) => ({ seqNum: val })} />
    <ReferenceInput source="busId" label="table.field.task.busId" reference="bus" >
        <AutocompleteInput label="table.field.task.busId" optionText="busNo" filterToQuery={(val) => ({ seqNum: val })} />
    </ReferenceInput>,
    <TextInput source="seqNum" label="table.field.task.seqNum" />,
    <NumberInput source="priority" label="table.field.task.priority" />,

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

@@ -65,39 +65,16 @@

    }

    public QueryWrapper<T> buildWrapper() {
        return this.buildWrapper(false);
    }

    public QueryWrapper<T> buildWrapper(Consumer<QueryWrapper<T>> consumer) {
        return this.buildWrapper(false, consumer);
    }

    public QueryWrapper<T> buildWrapper(boolean like) {
        return this.buildWrapper(like, null);
        return this.buildWrapper(like, null, "create_time");
    }

    private boolean sortIsSQL(String sort) {
        return sort != null && (sort.contains(",") || sort.trim().contains(" "));
    }

    private List<OrderItem> parseOrderSQL(String orderSQL) {
        List<OrderItem> orders = new ArrayList<>();
        if (!Cools.isEmpty(orderSQL)) {
            for (String item : orderSQL.split(",")) {
                String[] temp = item.trim().split(" ");
                if (!temp[0].isEmpty()) {
                    String column = this.isToUnderlineCase ? Utils.toSymbolCase(temp[0], '_') : temp[0];
                    boolean asc = temp.length == 1 || !temp[temp.length - 1].toLowerCase().equals(ORDER_DESC_VALUE);
                    orders.add(new OrderItem(column, asc));
                }
            }
        }
        return orders;
    public QueryWrapper<T> buildWrapper(boolean like, String timeField) {
        return this.buildWrapper(like, null, timeField);
    }

    @SuppressWarnings("all")
    public QueryWrapper<T> buildWrapper(boolean like, Consumer<QueryWrapper<T>> consumer) {
    public QueryWrapper<T> buildWrapper(boolean like, Consumer<QueryWrapper<T>> consumer, String timeField) {
        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
        Map<String, Object> map = where.getMap();
        for (String key : map.keySet()) {
@@ -134,11 +111,12 @@

        if (!Cools.isEmpty(where.getTimeStart())) {
            Date timeStart = DateUtils.convert(String.valueOf(where.getTimeStart()), DateUtils.yyyyMMdd_F);
            queryWrapper.ge("create_time", timeStart);
            queryWrapper.ge(timeField, timeStart);

        }
        if (!Cools.isEmpty(where.getTimeEnd())) {
            Date timeStart = DateUtils.convert(String.valueOf(where.getTimeEnd()), DateUtils.yyyyMMdd_F);
            queryWrapper.le("create_time", timeStart);
            queryWrapper.le(timeField, timeStart);
        }

        if (!Cools.isEmpty(where.getOrderBy())) {
@@ -184,6 +162,25 @@
        return queryWrapper;
    }

    private boolean sortIsSQL(String sort) {
        return sort != null && (sort.contains(",") || sort.trim().contains(" "));
    }

    private List<OrderItem> parseOrderSQL(String orderSQL) {
        List<OrderItem> orders = new ArrayList<>();
        if (!Cools.isEmpty(orderSQL)) {
            for (String item : orderSQL.split(",")) {
                String[] temp = item.trim().split(" ");
                if (!temp[0].isEmpty()) {
                    String column = this.isToUnderlineCase ? Utils.toSymbolCase(temp[0], '_') : temp[0];
                    boolean asc = temp.length == 1 || !temp[temp.length - 1].toLowerCase().equals(ORDER_DESC_VALUE);
                    orders.add(new OrderItem(column, asc));
                }
            }
        }
        return orders;
    }

    public Map<String, Object> checkoutMap() {
        Map<String, Object> map = where.getMap();
        if (!Cools.isEmpty(where.getOrderBy())) {

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

@@ -36,7 +36,7 @@
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Task, BaseParam> pageParam = new PageParam<>(baseParam, Task.class);
        QueryWrapper<Task> wrapper = pageParam.buildWrapper(true);
        QueryWrapper<Task> wrapper = pageParam.buildWrapper(true, "io_time");
        if (hasCreateTimeDesc(pageParam.getOrders())) {
            wrapper.last(businessSortService.getOrderBySql(TaskStsType.class, "task_sts"));
        }