From 30aaee523c6e20461d3260c6d88bb1d0e4d4cae5 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Tue, 3 Dec 2024 00:02:30 +0800
Subject: [PATCH] update

---
 .../controller/ExperimentReportController.java       | 12 +++++++++++-
 .../modules/database/entity/ExperimentReport.java    |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
index 24a6fd4..45344a9 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java
@@ -17,6 +17,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.database.constant.*;
 import org.jeecg.modules.database.entity.*;
@@ -67,8 +68,17 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                          HttpServletRequest req) {
+
+        // 自定义duoXuan字段的查询规则为：LIKE_WITH_OR
+        Date createTime = experimentReport.getCreateTime();
+        experimentReport.setCreateTime(null);
+        experimentReport.setStatus(ExperimentReportStatus.PASSED);
         QueryWrapper<ExperimentReport> queryWrapper = QueryGenerator.initQueryWrapper(experimentReport, req.getParameterMap());
-        Page<ExperimentReport> page = new Page<ExperimentReport>(pageNo, pageSize);
+        if (Objects.nonNull(createTime)) {
+            queryWrapper.eq("DATE_FORMAT (create_time,'%Y-%m-%d')",
+                    DateUtils.formatDate(createTime, "yyyy-MM-dd"));
+        }
+        Page<ExperimentReport> page = new Page<>(pageNo, pageSize);
         IPage<ExperimentReport> pageList = experimentReportService.page(page, queryWrapper);
         pageList.getRecords().forEach(v -> {
             ExperimentDoc experimentDoc = experimentDocService.getByExperimentId(v.getExperimentId(), ExperimentDocType.sybg.getType());
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java
index 10559bb..f6a8da7 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java
@@ -41,7 +41,7 @@ public class ExperimentReport implements Serializable {
      * 创建日期
      */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Schema(description = "创建日期")
     private Date   createTime;
     /**