Browse Source

feat:禁闭添加录入时间

master
buaixuexideshitongxue 1 month ago
parent
commit
46fd8d204f
  1. 11
      src/main/java/com/biutag/supervision/pojo/entity/Confinement.java
  2. 5
      src/main/java/com/biutag/supervision/pojo/param/ConfinementQueryParam.java
  3. 6
      src/main/java/com/biutag/supervision/pojo/vo/ConfinementVo.java
  4. 10
      src/main/java/com/biutag/supervision/service/ConfinementService.java

11
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;
}

5
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;

6
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;
}

10
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()) {

Loading…
Cancel
Save