From 46fd8d204f5136d209945341b3f93b6cff96aa5b Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Tue, 19 May 2026 17:34:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=A6=81=E9=97=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biutag/supervision/pojo/entity/Confinement.java   | 11 +++++++++++
 .../supervision/pojo/param/ConfinementQueryParam.java |  5 +++++
 .../com/biutag/supervision/pojo/vo/ConfinementVo.java |  6 ++++++
 .../supervision/service/ConfinementService.java       | 10 ++++++++++
 4 files changed, 32 insertions(+)

diff --git a/src/main/java/com/biutag/supervision/pojo/entity/Confinement.java b/src/main/java/com/biutag/supervision/pojo/entity/Confinement.java
index 5974828..8c8ef5c 100644
--- a/src/main/java/com/biutag/supervision/pojo/entity/Confinement.java
+++ b/src/main/java/com/biutag/supervision/pojo/entity/Confinement.java
@@ -2,6 +2,7 @@ package com.biutag.supervision.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.Getter;
@@ -101,4 +102,14 @@ public class Confinement {
     @TableField("remark")
     private String remark;
 
+
+    @Schema(description = "创建时间")
+    @TableField("create_time")
+    private String createTime;
+
+
+    @Schema(description = "创建人")
+    @TableField("create_by")
+    private String createBy;
+
 }
diff --git a/src/main/java/com/biutag/supervision/pojo/param/ConfinementQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/ConfinementQueryParam.java
index 7d945ba..653e01b 100644
--- a/src/main/java/com/biutag/supervision/pojo/param/ConfinementQueryParam.java
+++ b/src/main/java/com/biutag/supervision/pojo/param/ConfinementQueryParam.java
@@ -27,6 +27,11 @@ public class ConfinementQueryParam extends BasePage {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private List<LocalDateTime> confinementTime;
 
+    // 创建时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private List<LocalDateTime> createTime;
+
 
     // 当前单位及其所有子单位
     private Boolean departBranch;
diff --git a/src/main/java/com/biutag/supervision/pojo/vo/ConfinementVo.java b/src/main/java/com/biutag/supervision/pojo/vo/ConfinementVo.java
index ba232f3..a7c1eea 100644
--- a/src/main/java/com/biutag/supervision/pojo/vo/ConfinementVo.java
+++ b/src/main/java/com/biutag/supervision/pojo/vo/ConfinementVo.java
@@ -95,4 +95,10 @@ public class ConfinementVo {
 
     @Schema(description = "问题ID")
     private String negativeId;
+
+    @Schema(description = "创建时间")
+    private String createTime;
+
+    @Schema(description = "创建人")
+    private String createBy;
 }
diff --git a/src/main/java/com/biutag/supervision/service/ConfinementService.java b/src/main/java/com/biutag/supervision/service/ConfinementService.java
index 1d00c8b..035d69c 100644
--- a/src/main/java/com/biutag/supervision/service/ConfinementService.java
+++ b/src/main/java/com/biutag/supervision/service/ConfinementService.java
@@ -49,6 +49,11 @@ public class ConfinementService extends ServiceImpl<ConfinementMapper, Confineme
             queryWrapper.le("c1.start_time", param.getConfinementTime().get(1))
                     .ge("c1.start_time", param.getConfinementTime().get(0));
         }
+        // 创建时间查询
+        if (CollectionUtils.isNotEmpty(param.getCreateTime())) {
+            queryWrapper.le("c1.create_time", param.getCreateTime().get(1))
+                    .ge("c1.create_time", param.getCreateTime().get(0));
+        }
         //部门的查询条件SELECT COUNT(*) AS total FROM confinement AS c1
         // WHERE (c1.start_time <= '2025-05-01T00:00' AND c1.start_time >= '2025-04-30T00:00')
         //
@@ -121,6 +126,11 @@ public class ConfinementService extends ServiceImpl<ConfinementMapper, Confineme
             queryWrapper.le("c1.end_time", param.getConfinementTime().get(1))
                     .ge("c1.start_time", param.getConfinementTime().get(0));
         }
+        // 创建时间查询
+        if (CollectionUtils.isNotEmpty(param.getCreateTime())) {
+            queryWrapper.le("c1.create_time", param.getCreateTime().get(1))
+                    .ge("c1.create_time", param.getCreateTime().get(0));
+        }
         //部门的查询条件
         if (StrUtil.isNotEmpty(param.getOrgId())) {
             if (param.getDepartBranch()) {