From cedaeeed6d401aefebf93ea6ea21cc9e06d5f5db Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:36:48 +0800
Subject: [PATCH] 新增搜索 模块+同伴+时间
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfLogController.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfLogController.java
index 9b7ade9..d8c4748 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfLogController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfLogController.java
@@ -1,18 +1,27 @@
package com.ruoyi.web.controller.zhang;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.domain.ZfClean;
import com.ruoyi.domain.ZfLog;
import com.ruoyi.service.ZfLogService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
@@ -33,14 +42,35 @@
private ZfLogService zfLogService;
@GetMapping("/list")
- public AjaxResult list(){
+ public AjaxResult list(ZfLog zfLog) throws ParseException {
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
- Page<ZfLog> zfLogPage = new Page<>(pageNum,pageSize);
- Page<ZfLog> page = zfLogService.page(zfLogPage);
- return AjaxResult.success(MapUtils.getResult(page));
+ String st = ServletUtils.getParameter("module");
+ if(st!=null&&!st.equals("")) {
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ LocalDateTime dateTime = LocalDate.parse(st, DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay();
+
+
+ System.out.println("-----------------++++++++++++++++444444444444444444");
+
+
+
+
+
+ return zfLogService.selectDataList(dateTime, pageNum, pageSize);
+ }
+ else
+ {
+ return AjaxResult.success();
+ }
+
+// List<ZfLog> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+// Page<ZfLog> zfLogPage = new Page<>(pageNum,pageSize);
+// Page<ZfLog> page = zfLogService.page(zfLogPage);
+
+ // return AjaxResult.success(MapUtils.getResult(pageResult));
}
--
Gitblit v1.9.1