From cb7d99d810f2356096b67fbccd3fac556e638d83 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 22 八月 2024 11:22:56 +0800
Subject: [PATCH] feat：查询条件优化
---
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
index 0207ee6..b85ddb5 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
@@ -5,11 +5,13 @@
import com.ycl.system.domain.group.Add;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotBlank;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.io.IOException;
+import java.util.Date;
import java.util.List;
import org.springframework.validation.annotation.Validated;
import jakarta.validation.constraints.NotEmpty;
@@ -115,8 +117,13 @@
@PostMapping("/import/{unitId}")
@ApiOperation(value = "瀵煎叆鏁版嵁", notes = "瀵煎叆鏁版嵁")
- public Result importData(MultipartFile file, @PathVariable("unitId") Integer unitId) throws IOException {
- return ywPointService.importData(file, unitId);
+ public Result importData(MultipartFile file,
+ @PathVariable("unitId") Integer unitId,
+ @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,
+ @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
+ Boolean provinceTag,
+ Boolean importantCommandImageTag) throws IOException {
+ return ywPointService.importData(file, unitId, startTime, endTime, provinceTag, importantCommandImageTag);
}
}
--
Gitblit v1.8.0