Merge branch 'order_received_statistics' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/CompanyPerformanceBiz.java

@@ -17,6 +17,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
 
 import javax.servlet.ServletOutputStream;
 import java.io.IOException;
@@ -207,14 +208,24 @@ public class CompanyPerformanceBiz {
         pageDataVO.setData(companyPerformanceBos);
 
         if (companyPerformanceFindDTO.getPage() == 1) {
-            OrderReceivedStatistics orderReceivedStatistics = new OrderReceivedStatistics();
+            Example example = new Example(OrderReceivedStatistics.class);
+            Example.Criteria criteria = example.createCriteria();
             if (Objects.nonNull(companyPerformanceFindDTO.getCompanyId())) {
-                orderReceivedStatistics.setCompanyId(companyPerformanceFindDTO.getCompanyId());
+               criteria.andEqualTo("companyId",companyPerformanceFindDTO.getCompanyId());
             }
-            Long totlCount = orderReceivedStatisticsBiz.selectCount(orderReceivedStatistics);
-            long isZero = totlCount % companyPerformanceFindDTO.getLimit();
-            long totalPage = isZero == 0 ? totlCount / companyPerformanceFindDTO.getLimit() : totlCount / companyPerformanceFindDTO.getLimit() + 1;
-            pageDataVO.setTotalCount(totlCount);
+            if (Objects.nonNull(companyPerformanceFindDTO.getStartDate()) && Objects.nonNull(companyPerformanceFindDTO.getEndDate())){
+                criteria.andBetween("date",companyPerformanceFindDTO.getStartDate(),companyPerformanceFindDTO.getEndDate());
+            }
+            if (Objects.nonNull(companyPerformanceFindDTO.getStartDate()) && Objects.isNull(companyPerformanceFindDTO.getEndDate())){
+                criteria.andGreaterThanOrEqualTo("date",companyPerformanceFindDTO.getStartDate());
+            }
+            if (Objects.isNull(companyPerformanceFindDTO.getStartDate()) && Objects.nonNull(companyPerformanceFindDTO.getEndDate())){
+                criteria.andLessThanOrEqualTo("date",companyPerformanceFindDTO.getEndDate());
+            }
+            int totalCount = orderReceivedStatisticsBiz.selectCountByExample(example);
+            long isZero = totalCount % companyPerformanceFindDTO.getLimit();
+            long totalPage = isZero == 0 ? totalCount / companyPerformanceFindDTO.getLimit() : totalCount / companyPerformanceFindDTO.getLimit() + 1;
+            pageDataVO.setTotalCount(Long.valueOf(totalCount));
             pageDataVO.setTotalPage(Integer.valueOf(String.valueOf(totalPage)));
         }
         return pageDataVO;