日期查询

src/main/java/com/fdkankan/fusion/request/ProjectRequestDto.java

@@ -2,6 +2,7 @@ package com.fdkankan.fusion.request;
 
 import com.fdkankan.fusion.common.RequestBase;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import java.time.LocalDate;
 
@@ -33,7 +34,7 @@ public class ProjectRequestDto extends RequestBase {
     private String organizerUsers;
 
     //@ApiModelProperty(value = "事故日期")
-    private LocalDate accidentDate;
+    private String accidentDate;
 
     //@ApiModelProperty(value = "事故原因")
     private String fireReason;
@@ -47,4 +48,20 @@ public class ProjectRequestDto extends RequestBase {
     //@ApiModelProperty(value = "查血类型：1->非教学栏目查询 , 2->教学类别查询")
     private Integer queryType;
 
+    private String accidentDateStart;
+    private String accidentDateEnd;
+
+    public String getAccidentDateStart() {
+        if(StringUtils.isNotBlank(accidentDate)){
+           return accidentDate +" 00:00:00";
+        }
+        return accidentDateStart;
+    }
+
+    public String getAccidentDateEnd() {
+        if(StringUtils.isNotBlank(accidentDate)){
+            return accidentDate +" 23:59:59";
+        }
+        return accidentDateEnd;
+    }
 }

src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -112,7 +112,8 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
         }
         //事故日期
         if(null != tmProject.getAccidentDate()){
-            wrapper.eq(TmProject::getAccidentDate , tmProject.getAccidentDate());
+            wrapper.ge(TmProject::getAccidentDate,tmProject.getAccidentDateStart());
+            wrapper.le(TmProject::getAccidentDate,tmProject.getAccidentDateEnd());
         }
 
         //起火原因