opt:优化任务显示

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java

@@ -38,10 +38,6 @@ public class TaskController {
     @ApiOperation("查询任务")
     //@PreAuthorize("@el.check('task:list')")
     public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
-//        return new ResponseEntity<>(taskService.queryAllByCache(whereJson, page), HttpStatus.OK);
-        if(ObjectUtil.isEmpty(whereJson.get("status"))) {
-            whereJson.put("status", "1");
-        }
         return new ResponseEntity<>(taskService.queryAll(whereJson, page), HttpStatus.OK);
     }
 

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java

@@ -203,31 +203,37 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
         String status = (String) whereJson.get("status");
         String point_code = (String) whereJson.get("point_code");
         String is_over = (String) whereJson.get("is_over");
+        String task_type = (String) whereJson.get("task_type");
 
         IPage<Task> queryPage = PageUtil.toMybatisPage(page);
         LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<>();
-        if (!StrUtil.isEmpty(task_code)) {
+        if (StrUtil.isNotEmpty(task_code)) {
             wrapper.eq(Task::getTask_code,task_code);
         }
-        if (!StrUtil.isEmpty(vehicle_code)) {
+        if (StrUtil.isNotEmpty(vehicle_code)) {
             wrapper.eq(Task::getVehicle_code,vehicle_code);
         }
-        if (!StrUtil.isEmpty(material_type)) {
+        if (StrUtil.isNotEmpty(material_type)) {
             wrapper.eq(Task::getMaterial,material_type);
         }
-        if (!StrUtil.isEmpty(status)) {
+        if (StrUtil.isNotEmpty(status)) {
             wrapper.eq(Task::getTask_status,status);
         }
-        if (!StrUtil.isEmpty(point_code)) {
+        if (StrUtil.isNotEmpty(point_code)) {
             wrapper.and(task -> task.like(Task::getStart_point_code,point_code).or().like(Task::getNext_point_code,point_code));
         }
-        if (!StrUtil.isEmpty(is_over)) {
+        if (StrUtil.isNotEmpty(task_type)) {
+            wrapper.eq(Task::getTask_type, task_type);
+        }
+        if (StrUtil.isNotEmpty(is_over)) {
             if (StrUtil.equals(is_over,"1")){
                 wrapper.ge(Task::getTask_status,2);
             }else{
                 wrapper.lt(Task::getTask_status,2);
             }
         }
+        wrapper.le(Task::getTask_status, 1);
+        wrapper.orderByDesc(Task::getCreate_time);
         IPage<Task> taskPage = taskMapper.selectPage(queryPage,wrapper);
         final JSONObject json = (JSONObject) JSON.toJSON(ConvertUtil.convertPage(taskPage, TaskDto.class));
         return json;