From 145ef6ab95c5546b7979d8ac03c22244432a251c Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 03 四月 2024 10:18:46 +0800
Subject: [PATCH] 报备时间
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java | 6 ++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java | 7 +++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java | 6 ++++++
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 4 ++++
4 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
index a308627..86ada19 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Report.java
@@ -56,5 +56,12 @@
@TableField("error_type")
private String errorType;
+ @ApiModelProperty("鐢熸晥鏃堕棿")
+ @TableField("begin_create_time")
+ private Date beginCreateTime;
+
+ @ApiModelProperty("澶辨晥鏃堕棿")
+ @TableField("end_create_time")
+ private Date endCreateTime;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
index f0e2255..b06fd74 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
@@ -38,6 +38,12 @@
@ApiModelProperty("瀹℃牳鏃堕棿")
private Date auditingTime;
+ @ApiModelProperty("鐢熸晥鏃堕棿")
+ private Date beginCreateTime;
+
+ @ApiModelProperty("澶辨晥鏃堕棿")
+ private Date endCreateTime;
+
@ApiModelProperty("瀹℃牳绫诲瀷")
private String reportType;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
index db59460..4068006 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
@@ -1,6 +1,8 @@
package com.ycl.platform.domain.query;
import com.ycl.platform.base.AbsQuery;
+
+import java.util.Date;
import java.util.List;
import org.springframework.lang.NonNull;
import jakarta.validation.constraints.NotBlank;
@@ -22,5 +24,9 @@
private String reportType;
+ private Date beginCreateTime;
+
+ private Date endCreateTime;
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index 91a7e7c..a18f98b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -52,6 +52,8 @@
*/
@Override
public Result add(ReportForm form) {
+ form.setPeopleId(1);
+ form.setUnitId(2);
Report entity = ReportForm.getEntityByForm(form, null);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
@@ -114,6 +116,8 @@
IPage<Report> page = new LambdaQueryChainWrapper<>(baseMapper)
.eq(StringUtils.isNotBlank(query.getReportType()), Report::getReportType, query.getReportType())
+ .le(Objects.nonNull(query.getBeginCreateTime()), Report::getBeginCreateTime, query.getBeginCreateTime())
+ .ge(Objects.nonNull(query.getEndCreateTime()), Report::getEndCreateTime, query.getEndCreateTime())
.orderByDesc(Report::getCreateTime)
.page(PageUtil.getPage(query, Report.class));
--
Gitblit v1.8.0