|
|
@@ -295,15 +295,15 @@ class HomeScreenServiceImplTest
|
|
295
|
295
|
}
|
|
296
|
296
|
|
|
297
|
297
|
@Test
|
|
298
|
|
- @DisplayName("DP-SY-UT-033b 合作社明细未传年月默认当前年月")
|
|
299
|
|
- void ut033b_cooperativeDevelopmentsDefaultCurrentYearMonth()
|
|
|
298
|
+ @DisplayName("DP-SY-UT-033b 合作社明细未传年默认当前年，未传月不过滤")
|
|
|
299
|
+ void ut033b_cooperativeDevelopmentsDefaultCurrentYearNoMonth()
|
|
300
|
300
|
{
|
|
301
|
301
|
java.time.YearMonth now = com.ruoyi.web.modules.screen.support.HomeScreenSupport.currentYearMonth();
|
|
302
|
302
|
when(bizCooperativeDevelopmentMapper.selectBizCooperativeDevelopmentList(any(BizCooperativeDevelopment.class)))
|
|
303
|
303
|
.thenAnswer(invocation -> {
|
|
304
|
304
|
BizCooperativeDevelopment q = invocation.getArgument(0);
|
|
305
|
305
|
assertEquals(now.getYear(), q.getStatYear().intValue());
|
|
306
|
|
- assertEquals(now.getMonthValue(), q.getStatMonth().intValue());
|
|
|
306
|
+ assertNull(q.getStatMonth());
|
|
307
|
307
|
return Collections.emptyList();
|
|
308
|
308
|
});
|
|
309
|
309
|
assertEquals(0, service.listCooperativeDevelopments(null, null, null, null).size());
|
|
|
@@ -333,15 +333,15 @@ class HomeScreenServiceImplTest
|
|
333
|
333
|
}
|
|
334
|
334
|
|
|
335
|
335
|
@Test
|
|
336
|
|
- @DisplayName("DP-SY-UT-034b 家庭牧场明细未传年月默认当前年月")
|
|
337
|
|
- void ut034b_familyRanchesDefaultCurrentYearMonth()
|
|
|
336
|
+ @DisplayName("DP-SY-UT-034b 家庭牧场明细未传年默认当前年，未传月不过滤")
|
|
|
337
|
+ void ut034b_familyRanchesDefaultCurrentYearNoMonth()
|
|
338
|
338
|
{
|
|
339
|
339
|
java.time.YearMonth now = com.ruoyi.web.modules.screen.support.HomeScreenSupport.currentYearMonth();
|
|
340
|
340
|
when(bizFamilyRanchMapper.selectBizFamilyRanchList(any(BizFamilyRanch.class)))
|
|
341
|
341
|
.thenAnswer(invocation -> {
|
|
342
|
342
|
BizFamilyRanch q = invocation.getArgument(0);
|
|
343
|
343
|
assertEquals(now.getYear(), q.getStatYear().intValue());
|
|
344
|
|
- assertEquals(now.getMonthValue(), q.getStatMonth().intValue());
|
|
|
344
|
+ assertNull(q.getStatMonth());
|
|
345
|
345
|
return Collections.emptyList();
|
|
346
|
346
|
});
|
|
347
|
347
|
assertEquals(0, service.listFamilyRanches(null, null, null, null).size());
|
|
|
@@ -372,15 +372,15 @@ class HomeScreenServiceImplTest
|
|
372
|
372
|
}
|
|
373
|
373
|
|
|
374
|
374
|
@Test
|
|
375
|
|
- @DisplayName("DP-SY-UT-035b 养殖大户明细未传年月默认当前年月")
|
|
376
|
|
- void ut035b_largeLivestockFarmersDefaultCurrentYearMonth()
|
|
|
375
|
+ @DisplayName("DP-SY-UT-035b 养殖大户明细未传年默认当前年，未传月不过滤")
|
|
|
376
|
+ void ut035b_largeLivestockFarmersDefaultCurrentYearNoMonth()
|
|
377
|
377
|
{
|
|
378
|
378
|
java.time.YearMonth now = com.ruoyi.web.modules.screen.support.HomeScreenSupport.currentYearMonth();
|
|
379
|
379
|
when(bizLargeLivestockFarmerMapper.selectBizLargeLivestockFarmerList(any(BizLargeLivestockFarmer.class)))
|
|
380
|
380
|
.thenAnswer(invocation -> {
|
|
381
|
381
|
BizLargeLivestockFarmer q = invocation.getArgument(0);
|
|
382
|
382
|
assertEquals(now.getYear(), q.getStatYear().intValue());
|
|
383
|
|
- assertEquals(now.getMonthValue(), q.getStatMonth().intValue());
|
|
|
383
|
+ assertNull(q.getStatMonth());
|
|
384
|
384
|
return Collections.emptyList();
|
|
385
|
385
|
});
|
|
386
|
386
|
assertEquals(0, service.listLargeLivestockFarmers(null, null, null, null).size());
|
|
|
@@ -412,15 +412,15 @@ class HomeScreenServiceImplTest
|
|
412
|
412
|
}
|
|
413
|
413
|
|
|
414
|
414
|
@Test
|
|
415
|
|
- @DisplayName("DP-SY-UT-036b 牦牛出栏明细未传年月默认当前年月")
|
|
416
|
|
- void ut036b_yakOutboundReportsDefaultCurrentYearMonth()
|
|
|
415
|
+ @DisplayName("DP-SY-UT-036b 牦牛出栏明细未传年默认当前年，未传月不过滤")
|
|
|
416
|
+ void ut036b_yakOutboundReportsDefaultCurrentYearNoMonth()
|
|
417
|
417
|
{
|
|
418
|
418
|
java.time.YearMonth now = com.ruoyi.web.modules.screen.support.HomeScreenSupport.currentYearMonth();
|
|
419
|
419
|
when(bizYakOutboundReportMapper.selectBizYakOutboundReportList(any(BizYakOutboundReport.class)))
|
|
420
|
420
|
.thenAnswer(invocation -> {
|
|
421
|
421
|
BizYakOutboundReport q = invocation.getArgument(0);
|
|
422
|
422
|
assertEquals(now.getYear(), q.getStatYear().intValue());
|
|
423
|
|
- assertEquals(now.getMonthValue(), q.getStatMonth().intValue());
|
|
|
423
|
+ assertNull(q.getStatMonth());
|
|
424
|
424
|
return Collections.emptyList();
|
|
425
|
425
|
});
|
|
426
|
426
|
assertEquals(0, service.listYakOutboundReports(null, null, null, null).size());
|
|
|
@@ -451,15 +451,15 @@ class HomeScreenServiceImplTest
|
|
451
|
451
|
}
|
|
452
|
452
|
|
|
453
|
453
|
@Test
|
|
454
|
|
- @DisplayName("DP-SY-UT-037b 牦牛存栏明细未传年月默认当前年月")
|
|
455
|
|
- void ut037b_yakHerdInventoriesDefaultCurrentYearMonth()
|
|
|
454
|
+ @DisplayName("DP-SY-UT-037b 牦牛存栏明细未传年默认当前年，未传月不过滤")
|
|
|
455
|
+ void ut037b_yakHerdInventoriesDefaultCurrentYearNoMonth()
|
|
456
|
456
|
{
|
|
457
|
457
|
java.time.YearMonth now = com.ruoyi.web.modules.screen.support.HomeScreenSupport.currentYearMonth();
|
|
458
|
458
|
when(bizYakHerdInventoryMapper.selectBizYakHerdInventoryList(any(BizYakHerdInventory.class)))
|
|
459
|
459
|
.thenAnswer(invocation -> {
|
|
460
|
460
|
BizYakHerdInventory q = invocation.getArgument(0);
|
|
461
|
461
|
assertEquals(now.getYear(), q.getStatYear().intValue());
|
|
462
|
|
- assertEquals(now.getMonthValue(), q.getStatMonth().intValue());
|
|
|
462
|
+ assertNull(q.getStatMonth());
|
|
463
|
463
|
return Collections.emptyList();
|
|
464
|
464
|
});
|
|
465
|
465
|
assertEquals(0, service.listYakHerdInventories(null, null, null, null).size());
|
|
|
@@ -491,8 +491,8 @@ class HomeScreenServiceImplTest
|
|
491
|
491
|
}
|
|
492
|
492
|
|
|
493
|
493
|
@Test
|
|
494
|
|
- @DisplayName("DP-SY-UT-038b 有无畜户明细未传年月默认当前年月")
|
|
495
|
|
- void ut038b_livestockOwnershipHouseholdsDefaultCurrentYearMonth()
|
|
|
494
|
+ @DisplayName("DP-SY-UT-038b 有无畜户明细未传年默认当前年，未传月不过滤")
|
|
|
495
|
+ void ut038b_livestockOwnershipHouseholdsDefaultCurrentYearNoMonth()
|
|
496
|
496
|
{
|
|
497
|
497
|
java.time.YearMonth now = com.ruoyi.web.modules.screen.support.HomeScreenSupport.currentYearMonth();
|
|
498
|
498
|
when(bizLivestockOwnershipHouseholdMapper.selectBizLivestockOwnershipHouseholdList(
|
|
|
@@ -500,7 +500,7 @@ class HomeScreenServiceImplTest
|
|
500
|
500
|
.thenAnswer(invocation -> {
|
|
501
|
501
|
BizLivestockOwnershipHousehold q = invocation.getArgument(0);
|
|
502
|
502
|
assertEquals(now.getYear(), q.getStatYear().intValue());
|
|
503
|
|
- assertEquals(now.getMonthValue(), q.getStatMonth().intValue());
|
|
|
503
|
+ assertNull(q.getStatMonth());
|
|
504
|
504
|
return Collections.emptyList();
|
|
505
|
505
|
});
|
|
506
|
506
|
assertEquals(0, service.listLivestockOwnershipHouseholds(null, null, null, null).size());
|
wwh