考勤

src/main/java/com/gogirl/application/market/coupon/impl/CouponCustomerRelevanceServiceImpl.java

@@ -68,9 +68,8 @@ public class CouponCustomerRelevanceServiceImpl extends ServiceImpl<CouponCustom
                     List<Integer> canUserServeIds = couponCustomerRelevanceMapper.queryCouponCustomerServeRelevance(couponCustomerRelevance.getCouponId());
                     //订单的服务id
                     List<Integer> orderServeIds = orderServeList.stream().map(OrderServe::getServeId).collect(Collectors.toList());
-                    //retail
-                    List<Integer> retainIds = ListUtil.retainAll(canUserServeIds, orderServeIds);
-                    return ListUtil.isNotEmpty(retainIds);
+                    canUserServeIds.retainAll(orderServeIds);
+                    return ListUtil.isNotEmpty(canUserServeIds);
                 })
                 .peek(couponCustomerRelevance -> {
                     //卡券作用的服务id (mybatis 缓存)

src/main/resources/mapper/store/TakeLeaveEventMapper.xml

@@ -5,7 +5,7 @@
         SELECT *
         from take_leave_event
         where ((start_time <= #{endTime} and end_time >= #{endTime})
-            or (start_time < #{startTime} and start_time > #{startTime})
+            or (start_time <= #{startTime} and start_time >= #{startTime})
             or (start_time >= #{startTime} and end_time <= #{endTime}))
           and apply_technician_id = #{applyTechnicianId}
           and `status` != 3