Merge remote-tracking branch 'origin/master'

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

@@ -627,12 +627,6 @@ public class WeightImpl implements IWeight {
             if (null != 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));
-//            }
-//            if (null != deliverState) {
-//                predList.add(criteriaBuilder.equal(root.get("deliverState").as(Integer.class), deliverState));
-//            }
             //
             Predicate[] pred = new Predicate[predList.size()];
             Predicate and = criteriaBuilder.and(predList.toArray(pred));
@@ -643,7 +637,6 @@ public class WeightImpl implements IWeight {
             return criteriaQuery.orderBy(orders).getRestriction();
         };
         Pageable pageable = PageRequest.of(pageNo - 1, pageSize);
-//        return new Result(ResultCode.SUCCESS,applyRepo.listApply(pageable,applyId));
         return new Result(ResultCode.SUCCESS, prodWeightDetailsRepo.findAll(sf, pageable));
     }
 }