From 7bc6712180e8e2bb9966bbf7c1243c37152bec51 Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Thu, 10 Apr 2025 10:13:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0=E5=BA=94?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=B8=A6=E6=97=B6=E5=88=86=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SafetyAccidentRegController.java          |  3 +-
 .../xyt/entity/so/CommonDataPageSo2.java      | 36 +++++++++++++++++++
 .../xyt/service/SafetyAccidentRegService.java |  3 +-
 3 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/gunshi/project/xyt/entity/so/CommonDataPageSo2.java

diff --git a/src/main/java/com/gunshi/project/xyt/controller/SafetyAccidentRegController.java b/src/main/java/com/gunshi/project/xyt/controller/SafetyAccidentRegController.java
index 65c32c8..9937bbf 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/SafetyAccidentRegController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/SafetyAccidentRegController.java
@@ -3,6 +3,7 @@ package com.gunshi.project.xyt.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.core.result.R;
 import com.gunshi.project.xyt.entity.so.CommonDataPageSo;
+import com.gunshi.project.xyt.entity.so.CommonDataPageSo2;
 import com.gunshi.project.xyt.model.SafetyAccidentReg;
 import com.gunshi.project.xyt.service.SafetyAccidentRegService;
 import com.gunshi.project.xyt.validate.markers.Insert;
@@ -51,7 +52,7 @@ public class SafetyAccidentRegController extends AbstractCommonFileController {
 
     @Operation(summary = "分页")
     @PostMapping("/page")
-    public R<Page<SafetyAccidentReg>> page(@RequestBody CommonDataPageSo page) {
+    public R<Page<SafetyAccidentReg>> page(@RequestBody CommonDataPageSo2 page) {
         return R.ok(service.pageQuery(page));
     }
 
diff --git a/src/main/java/com/gunshi/project/xyt/entity/so/CommonDataPageSo2.java b/src/main/java/com/gunshi/project/xyt/entity/so/CommonDataPageSo2.java
new file mode 100644
index 0000000..095f921
--- /dev/null
+++ b/src/main/java/com/gunshi/project/xyt/entity/so/CommonDataPageSo2.java
@@ -0,0 +1,36 @@
+package com.gunshi.project.xyt.entity.so;
+
+import com.gunshi.db.dto.DateRangeSo;
+import com.gunshi.db.dto.DateTimeRangeSo;
+import com.gunshi.db.dto.PageSo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Description:
+ * Created by wanyan on 2024/3/19
+ *
+ * @author wanyan
+ * @version 1.0
+ */
+@Data
+@Schema(description = "分页查询对象")
+public class CommonDataPageSo2 {
+
+    @NotNull(message = "分页参数不能为空")
+    @Schema(description = "分页参数")
+    private PageSo pageSo;
+
+    @Schema(description="名称")
+    private String name;
+
+    @Schema(description = "时间范围")
+    private DateTimeRangeSo dateSo;
+
+    @Schema(description = "类型（1大事记 2调度记录 3维修养护 4安全鉴定 5除险加固 6白蚁普查）")
+    private List<Integer> types;
+
+}
diff --git a/src/main/java/com/gunshi/project/xyt/service/SafetyAccidentRegService.java b/src/main/java/com/gunshi/project/xyt/service/SafetyAccidentRegService.java
index e52c101..810a3b7 100644
--- a/src/main/java/com/gunshi/project/xyt/service/SafetyAccidentRegService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/SafetyAccidentRegService.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gunshi.project.xyt.entity.so.CommonDataPageSo;
+import com.gunshi.project.xyt.entity.so.CommonDataPageSo2;
 import com.gunshi.project.xyt.mapper.SafetyAccidentRegMapper;
 import com.gunshi.project.xyt.model.SafetyAccidentReg;
 import lombok.extern.slf4j.Slf4j;
@@ -31,7 +32,7 @@ public class SafetyAccidentRegService extends ServiceImpl<SafetyAccidentRegMappe
     @Autowired
     private FileAssociationsService fileService;
 
-    public Page<SafetyAccidentReg> pageQuery(CommonDataPageSo page) {
+    public Page<SafetyAccidentReg> pageQuery(CommonDataPageSo2 page) {
         LambdaQueryWrapper<SafetyAccidentReg> query = Wrappers.lambdaQuery();
         if (ObjectUtils.isNotNull(page.getName())) {
             query.like(SafetyAccidentReg::getName, page.getName());