*

L

18 小时以前 9d7bfe8cf15f1b34a87351560f39662d9e141cce

 src/main/java/com/zy/asrs/controller/TaskWrkLogController.java

@@ -40,6 +40,10 @@
            Integer wrkNo = null;
            String taskNo = null;
            Integer status = null;
            String barcode = null;
            String startPoint = null;
            String targetPoint = null;
            String allField = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
                String val = String.valueOf(entry.getValue());
@@ -56,15 +60,23 @@
                    taskNo = val;
                } else if (entry.getKey().equals("status")) {
                    status = Integer.parseInt(val);
                } else if (entry.getKey().equals("barcode")) {
                    barcode = val;
                } else if (entry.getKey().equals("startPoint")) {
                    startPoint = val;
                } else if (entry.getKey().equals("targetPoint")) {
                    targetPoint = val;
                } else if (entry.getKey().equals("allField")) {
                    allField = val;
                }
            }
            List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
            List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,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);
                taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, 1, limit);
                page = new Page<TaskWrkLog>(1, limit).setRecords(taskWrkList);
            }
            page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
            page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd));
            return R.ok(page);

        } catch (Exception e) {