发货单管理筛选条件修改

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PreparationMoneyMapper.xml

@@ -38,8 +38,11 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
             <if test="dto.flag != null and dto.flag != ''">
                 and hygf_preparation_money.delivery_state != '已作废' and hygf_preparation_money.delivery_state != '待发货'
             </if>
-            <if test="dto.deliveryTimeStart != null and dto.deliveryTimeEnd != ''">
-                and hygf_preparation_money.delivery_time between #{dto.deliveryTimeStart} and #{dto.deliveryTimeEnd}
+            <if test="dto.deliveryTimeStart != null and dto.deliveryTimeStart != ''">
+                and hygf_preparation_money.delivery_time &gt;= #{dto.deliveryTimeEnd}
+            </if>
+            <if test="dto.deliveryTimeEnd != null and dto.deliveryTimeEnd != ''">
+                and hygf_preparation_money.delivery_time &lt;= > #{dto.deliveryTimeEnd}
             </if>
         </where>
         ORDER BY hygf_preparation_money.sequence_nbr DESC

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

@@ -120,11 +120,6 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 //      qw.eq(StringUtils.isNotEmpty(dto.getAmosUnitId()), PreparationMoney::getAmosUnitId, dto.getAmosUnitId());
 //      qw.ne(StringUtils.isNotEmpty(dto.getFlag()),PreparationMoney::getDeliveryState,DeliveryStateeEnum.已作废.getCode());
 
-        if (dto.getDeliveryTime() != null && !dto.getDeliveryTime().get(0).equals("")) {
-//            qw.between(dto.getDeliveryTime()!=null, PreparationMoney::getDeliveryTime, dto.getDeliveryTime().get(0), dto.getDeliveryTime().get(1));
-            dto.setDeliveryTimeStart(dto.getDeliveryTime().get(0) + " 00:00:00");
-            dto.setDeliveryTimeEnd(dto.getDeliveryTime().get(1)+" 23:59:59");
-        }
 //        qw.orderBy(Boolean.TRUE, Boolean.FALSE, PreparationMoney::getOrderTime);
         PreparationDto preparationDto = new PreparationDto();
         BeanUtils.copyProperties(dto, preparationDto);