Newspaper před 1 rokem
rodič
revize
d3aad3529e

+ 8 - 1
huimv-env-admin/src/main/java/com/huimv/env/admin/controller/PortWarningInfoController.java

@@ -30,9 +30,16 @@ public class PortWarningInfoController {
 
     @PostMapping("/page")
     public Result page(@RequestBody WarningPageParam warningPageParam){
+        String startTime = warningPageParam.getStartTime();
+        String endTime = warningPageParam.getEndTime();
+        if (ObjectUtil.isNotEmpty(startTime)){
+            startTime = startTime + " 00:00:00";
+            endTime = endTime + " 23:59:59";
+        }
         Page<PortWarningInfo> page = new Page<>(warningPageParam.getPageNum(),warningPageParam.getPageSize());
         Page<PortWarningInfo> warningInfoPage = portWarningInfoService.page(page, new QueryWrapper<PortWarningInfo>().lambda()
-                .eq(ObjectUtil.isNotEmpty(warningPageParam.getWarningType()), PortWarningInfo::getWarningType, warningPageParam.getWarningType()));
+                .eq(ObjectUtil.isNotEmpty(warningPageParam.getWarningType()), PortWarningInfo::getWarningType, warningPageParam.getWarningType())
+                .between(ObjectUtil.isNotEmpty(startTime),PortWarningInfo::getCreateTime,startTime,endTime));
         return new Result(ResultCode.SUCCESS,warningInfoPage);
     }
 

+ 4 - 0
huimv-env-admin/src/main/java/com/huimv/env/admin/entity/vo/WarningPageParam.java

@@ -8,6 +8,10 @@ import javax.validation.constraints.NotNull;
 public class WarningPageParam {
     private Integer warningType;
 
+    private String startTime;
+
+    private String endTime;
+
     @NotNull(message = "pageNum不能为空")
     private Integer pageNum;