pang.jiabao
3 天以前 863ca62ba1a8b021179f1fd8c7a0ee6f06ba99ee
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -1,6 +1,5 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -10,17 +9,12 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.TaskWrkLog;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.TaskWrkLogService;
import com.zy.asrs.service.TaskWrkReportService;
import com.zy.asrs.service.ToWmsService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -53,9 +47,11 @@
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
            wrapper.last("ORDER BY " + humpToLine(orderByField) +
                    ("asc".equals(orderByType) ? " ASC" : " DESC"));
        } else {
            wrapper.last("ORDER BY create_time DESC");
        }
        wrapper.orderDesc(Collections.singleton("create_time"));
        return R.ok(taskWrkLogService.selectPage(new Page<>(curr, limit), wrapper));
    }