From c1ef2d1fc4c0dae2bc8452924dcd77a0ff3a1ef5 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 15:02:52 +0800
Subject: [PATCH] #改造

---
 src/main/java/com/zy/asrs/controller/TaskWrkLogController.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index b705e4e..5ec4bc0 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -38,7 +38,7 @@
                   @RequestParam Map<String, Object> param){
         try{
             Integer wrkNo = null;
-            Integer taskNo = null;
+            String taskNo = null;
             Integer status = null;
             Date modiTimeStart = null, modiTimeEnd = null;
             for (Map.Entry<String, Object> entry : param.entrySet()) {
@@ -53,15 +53,19 @@
                 } else if (entry.getKey().equals("wrk_no")) {
                     wrkNo = Integer.parseInt(val);
                 } else if (entry.getKey().equals("task_no")) {
-                    taskNo = Integer.parseInt(val);
+                    taskNo = val;
                 } else if (entry.getKey().equals("status")) {
                     status = Integer.parseInt(val);
                 }
             }
             List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
-            Page<TaskWrkLog> page1 = new Page<TaskWrkLog>(curr, limit).setRecords(taskWrkList);
-            page1.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
-            return R.ok(page1);
+            Page<TaskWrkLog> page = new Page<TaskWrkLog>(curr, limit).setRecords(taskWrkList);
+            if (page.getRecords().size()==0){
+                taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, 1, limit);
+                page = new Page<TaskWrkLog>(1, limit).setRecords(taskWrkList);
+            }
+            page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
+            return R.ok(page);
 
         } catch (Exception e) {
             return R.error("鏌ヨ澶辫触,璇锋鏌ュ弬鏁�:"+e.getMessage());

--
Gitblit v1.9.1