更新地磅称重查询逻辑

huimv-farm-produce/src/main/java/com/huimv/produce/produce/service/impl/WeightImpl.java

@@ -596,22 +596,23 @@ public class WeightImpl implements IWeight {
                 predList.add(criteriaBuilder.equal(root.get("poundType").as(String.class), poundType));
             }
             if (null != carNumber) {
-                predList.add(criteriaBuilder.equal(root.get("poundType").as(String.class), carNumber));
+//                predList.add(criteriaBuilder.equal(root.get("carNumber").as(String.class), carNumber));
+                predList.add(criteriaBuilder.like(root.get("carNumber").as(String.class), "%"+carNumber+"%"));
             }
             if (null != consigner) {
-                predList.add(criteriaBuilder.equal(root.get("consigner").as(String.class), consigner));
+                predList.add(criteriaBuilder.like(root.get("consigner").as(String.class), "%"+consigner+"%"));
             }
             if (null != consignee) {
-                predList.add(criteriaBuilder.equal(root.get("consignee").as(String.class), consignee));
+                predList.add(criteriaBuilder.like(root.get("consignee").as(String.class), "%"+consignee+"%"));
             }
             if (null != variety) {
-                predList.add(criteriaBuilder.equal(root.get("variety").as(String.class), variety));
+                predList.add(criteriaBuilder.like(root.get("variety").as(String.class), "%"+variety+"%"));
             }
             if (null != startDate) {
-                predList.add(criteriaBuilder.greaterThanOrEqualTo(root.get("startDate").as(Date.class), startDate));
+                predList.add(criteriaBuilder.greaterThanOrEqualTo(root.get("weighingTime").as(Date.class), startDate));
             }
             if (null != endDate) {
-                predList.add(criteriaBuilder.lessThanOrEqualTo(root.get("endDate").as(Date.class), endDate));
+                predList.add(criteriaBuilder.lessThanOrEqualTo(root.get("weighingTime").as(Date.class), endDate));
             }
 //            if (null != returnState) {
 //                predList.add(criteriaBuilder.equal(root.get("returnState").as(Integer.class), returnState));
@@ -619,6 +620,7 @@ public class WeightImpl implements IWeight {
 //            if (null != deliverState) {
 //                predList.add(criteriaBuilder.equal(root.get("deliverState").as(Integer.class), deliverState));
 //            }
+            System.out.println("predList.size()="+predList.size());
             //
             Predicate[] pred = new Predicate[predList.size()];
             Predicate and = criteriaBuilder.and(predList.toArray(pred));