qin 10 mesiacov pred
rodič
commit
d5f161f9be

+ 4 - 4
src/main/java/com/poteviohealth/cgp/statistics/service/impl/OrderServiceImpl.java

@@ -341,11 +341,11 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
     private QueryWrapper getQueryWrapper(GoldSendPage vo) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("d.operator_id", TokenContext.cureOperatorId());
-        if(StringUtils.isNotEmpty(vo.getSendTime())){
-            queryWrapper.eq("d.send_time", vo.getSendTime());
+        if(StringUtils.isNotEmpty(vo.getSendTimeStart())){
+            queryWrapper.between("send_time", vo.getSendTimeStart(),vo.getSendTimeEnd());
         }
-        if(StringUtils.isNotEmpty(vo.getExpectTime())){
-            queryWrapper.eq("d.expect_time", vo.getExpectTime());
+        if(StringUtils.isNotEmpty(vo.getExpectTimeStart())){
+            queryWrapper.between("expect_time", vo.getExpectTimeStart(),vo.getExpectTimeEnd());
         }
         if(StringUtils.isNotEmpty(vo.getIdNumber())){
             queryWrapper.eq("d.id_number", vo.getIdNumber());