From e08e404b66e623a5cf6483f2899e6e71423783dc Mon Sep 17 00:00:00 2001 From: Donghuang Date: Sun, 10 Oct 2021 15:04:16 +0800 Subject: [PATCH] opt calling list summary --- .../pudonghot/yo/cms/controller/CallingListController.java | 1 + .../com/pudonghot/yo/mapper/CallingListPreparedMapper.xml | 3 ++- .../pudonghot/yo/mapper/CallingListPreparedMapperTest.java | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/CallingListController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/CallingListController.java index 158101a2..2aa34859 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/controller/CallingListController.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/CallingListController.java @@ -97,6 +97,7 @@ public class CallingListController @RequestParam("campaignId") final Integer campaignId) { val vm = new ViewModel>(((CallingListService) queryService).summary(campaignId)); + vm.attr("campaign", campaignService.find(campaignId)); vm.setAttr("preparedList", callingListPreparedService.summary(campaignId)); vm.setAttr("historicalList", callingListHistoricalService.summary(campaignId)); return vm; diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListPreparedMapper.xml b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListPreparedMapper.xml index 52dae507..aceea91b 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListPreparedMapper.xml +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListPreparedMapper.xml @@ -17,7 +17,8 @@ count(if(export_batch_key is not null, 1, null)) exported, count(if(export_batch_key is null, 1, null)) ready from br_calling_list_prepared - where campaign_id = #{campaignId} + where added_time > date(now() - interval 31 day) + and campaign_id = #{campaignId} group by insert_batch_key order by added_time desc limit 9 diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListPreparedMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListPreparedMapperTest.java index 751ebe8f..5c220f42 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListPreparedMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListPreparedMapperTest.java @@ -5,8 +5,8 @@ import org.junit.Test; import lombok.extern.slf4j.Slf4j; import org.junit.runner.RunWith; import me.chyxion.tigon.mybatis.Search; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** @@ -15,14 +15,14 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; */ @Slf4j @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration("classpath*:spring/spring-*.xml") +@SpringBootTest(classes = TestDriver.class) public class CallingListPreparedMapperTest { @Autowired private CallingListPreparedMapper mapper; @Test public void testSummary() { - val summary = mapper.summary(6); + val summary = mapper.summary(4); log.info("Summary [{}].", summary); }