# 更新

src/main/java/com/gogirl/application/store/oa/impl/OverTimeRecordServiceImpl.java

@@ -11,6 +11,8 @@ import com.gogirl.infrastructure.mapper.store.oa.OverTimeRecordMapper;
 import com.gogirl.shared.store.OrderTimeRecordPageQuery;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.time.Month;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -32,7 +34,15 @@ public class OverTimeRecordServiceImpl extends ServiceImpl<OverTimeRecordMapper,
         cale.add(Calendar.MONTH, 0);
         cale.set(Calendar.DAY_OF_MONTH, 1);
         Date firstDay = cale.getTime();
+
         Date paramDate = new Date(firstDay.getTime() - 7 * 24 * 60 * 60 * 1000);
+        if (LocalDateTime.now().getMonth().equals(Month.MARCH) && LocalDateTime.now().getYear() == 2021) {
+            cale.add(Calendar.MONTH, -1);
+            cale.set(Calendar.DAY_OF_MONTH, 1);
+            firstDay = cale.getTime();
+            paramDate = new Date(firstDay.getTime();
+        }
+
         IPage<OverTimeRecord> page = new Page<>();
         page = baseMapper.selectPage(page, new LambdaQueryWrapper<OverTimeRecord>()
                 .eq(OverTimeRecord::getTechnicianId, SessionUtils.getTechnicianId())

src/test/java/com/gogirl/application/user/customer/impl/CustomerBalanceServiceImplTest.java

@@ -46,7 +46,7 @@ public class CustomerBalanceServiceImplTest {
     @org.junit.Test
     public void order() {
         List<OrderManage> orderManageList = orderManageMapper.selectList(new LambdaQueryWrapper<OrderManage>()
-                .in(OrderManage::getOrderNo, Lists.newArrayList("BTD-GZJ-BTD-GZJ-ZJH-210224-0013 ")));
+                .in(OrderManage::getOrderNo, Lists.newArrayList("BTD-GZJ-ZJH-210224-0013")));
         orderManageList.forEach(orderManage -> {
             if (orderManage.getStatus().equals(2)) {
                 orderManage.setStatus(11);