#ZH

野心家

2025-05-26 3d40ce7e16a9e53bad6637bbed824507f06148b4

 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,13 +53,17 @@
                } 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> 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);