查询条件修改

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/query/BarcodeQueryCriteria.java

 package com.neotel.smfcore.core.barcode.rest.bean.query;
 package com.neotel.smfcore.core.barcode.rest.bean.query;
 
 
 import com.neotel.smfcore.common.annotation.QueryCondition;
 import com.neotel.smfcore.common.annotation.QueryCondition;
+import com.neotel.smfcore.common.bean.BetweenData;
 import lombok.Data;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 import java.sql.Timestamp;
 import java.sql.Timestamp;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 @Data
 @Data
@@ -11,8 +14,9 @@ public class BarcodeQueryCriteria {
     @QueryCondition(blurry = "partNumber,barcode,batch")
     @QueryCondition(blurry = "partNumber,barcode,batch")
     private String blurry;
     private String blurry;
 
 
-    @QueryCondition(type = QueryCondition.Type.BETWEEN)
-    private List<Timestamp> createTime;
+    @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "updateDate")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private BetweenData<Date> createDate;
 
 
 
 
     @QueryCondition
     @QueryCondition

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/query/ComponentQueryCriteria.java

 package com.neotel.smfcore.core.barcode.rest.bean.query;
 package com.neotel.smfcore.core.barcode.rest.bean.query;
 
 
 import com.neotel.smfcore.common.annotation.QueryCondition;
 import com.neotel.smfcore.common.annotation.QueryCondition;
+import com.neotel.smfcore.common.bean.BetweenData;
 import lombok.Data;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 import java.sql.Timestamp;
 import java.sql.Timestamp;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 @Data
 @Data
 public class ComponentQueryCriteria {
 public class ComponentQueryCriteria {
-    @QueryCondition(blurry = "name,partNumber,model,uid,productionType,encapsulation,description")
+    @QueryCondition(blurry = "name,partNumber,description")
     private String blurry;
     private String blurry;
 
 
-    @QueryCondition(type = QueryCondition.Type.BETWEEN)
-    private List<Timestamp> createTime;
+    @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "updateDate")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private BetweenData<Date> createDate;
 
 
     @QueryCondition
     @QueryCondition
     private String name;
     private String name;