From a5df301fce6e16534bec1e9a9d55edd19896fe85 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 08 四月 2025 15:10:22 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index 05f445f..f915048 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -41,6 +41,7 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderDesc(Collections.singleton("create_time"));
return R.ok(taskWrkLogService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -57,6 +58,17 @@
}
}
+ @RequestMapping(value = "/taskWrkLog/export/all/auth")
+ @ManagerAuth
+ public R export(){
+ Integer i = taskWrkLogService.selectCount(new EntityWrapper<>());
+ Integer curr = 1;
+ Integer limit = i;
+ EntityWrapper<TaskWrkLog> wrapper = new EntityWrapper<>();
+ wrapper.orderDesc(Collections.singleton("create_time"));
+ return R.ok(taskWrkLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
@RequestMapping(value = "/taskWrkLog/add/auth")
@ManagerAuth
public R add(TaskWrkLog taskWrkLog) {
@@ -67,7 +79,7 @@
@RequestMapping(value = "/taskWrkLog/update/auth")
@ManagerAuth
public R update(TaskWrkLog taskWrkLog){
- if (Cools.isEmpty(taskWrkLog) || null==taskWrkLog.getId()){
+ if (Cools.isEmpty(taskWrkLog)){
return R.error();
}
taskWrkLogService.updateById(taskWrkLog);
@@ -103,8 +115,8 @@
List<Map<String, Object>> result = new ArrayList<>();
for (TaskWrkLog taskWrkLog : page.getRecords()){
Map<String, Object> map = new HashMap<>();
- map.put("id", taskWrkLog.getId());
- map.put("value", taskWrkLog.getId());
+ map.put("id", taskWrkLog.getTaskNo());
+ map.put("value", taskWrkLog.getTaskNo());
result.add(map);
}
return R.ok(result);
--
Gitblit v1.9.1