Merge branch 'order_received_statistics' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/CompanyPerformanceFindDTO.java

@@ -32,4 +32,15 @@ public class CompanyPerformanceFindDTO extends PageParam {
     private String companyName;
     private Integer companyId;
 
+    private long startIndex;
+
+    private long endInex;
+
+    public long getStartIndex() {
+        return getPage()==null?0:getPage()==0?0:(getPage()-1)*getLimit();
+    }
+
+    public long getEndInex() {
+        return getLimit()==null?20:getLimit()==0?20:(getStartIndex()+getLimit());
+    }
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.order.bo.CompanyPerformanceBo;
 import com.xxfc.platform.order.contant.enumerate.ReceivedStatisticsEnum;
+import com.xxfc.platform.order.entity.OrderReceivedStatistics;
 import com.xxfc.platform.order.pojo.dto.CompanyPerformanceFindDTO;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.RequiredArgsConstructor;
@@ -204,6 +205,18 @@ public class CompanyPerformanceBiz {
         }
         List<CompanyPerformanceBo> companyPerformanceBos = wrapCompanyPermanceBo(data, companyMap, companyPerformanceFindDTO.getStatisticalWay());
         pageDataVO.setData(companyPerformanceBos);
+
+        if (companyPerformanceFindDTO.getPage() == 1) {
+            OrderReceivedStatistics orderReceivedStatistics = new OrderReceivedStatistics();
+            if (Objects.nonNull(companyPerformanceFindDTO.getCompanyId())) {
+                orderReceivedStatistics.setCompanyId(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);
+            pageDataVO.setTotalPage(Integer.valueOf(String.valueOf(totalPage)));
+        }
         return pageDataVO;
     }
 

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

@@ -60,8 +60,12 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
      * @return
      */
     public PageDataVO<CompanyPerformanceBo> selectCompanyPerformanceWithDayPage(CompanyPerformanceFindDTO companyPerformanceFindDTO) {
-        return PageDataVO.pageInfo(companyPerformanceFindDTO.getPage(), companyPerformanceFindDTO.getLimit(),
-                () -> mapper.selectCompanyPerformanceWithDay(companyPerformanceFindDTO));
+        List<CompanyPerformanceBo> companyPerformanceBos = mapper.selectCompanyPerformanceWithDay(companyPerformanceFindDTO);
+        PageDataVO<CompanyPerformanceBo> pageDataVO = new PageDataVO<>();
+        pageDataVO.setData(companyPerformanceBos);
+        return pageDataVO;
+       /* return PageDataVO.pageInfo(companyPerformanceFindDTO.getPage(), companyPerformanceFindDTO.getLimit(),
+                () -> mapper.selectCompanyPerformanceWithDay(companyPerformanceFindDTO));*/
     }
 
     public List<CompanyPerformanceBo> selectCompanyPerformanceWithDay(CompanyPerformanceFindDTO companyPerformanceFindDTO) {
@@ -76,8 +80,12 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
      * @return
      */
     public PageDataVO<CompanyPerformanceBo> selectCompanyPerformanceWithMonthPage(CompanyPerformanceFindDTO companyPerformanceFindDTO) {
-        return PageDataVO.pageInfo(companyPerformanceFindDTO.getPage(), companyPerformanceFindDTO.getLimit(),
-                () -> mapper.selectCompanyPerformanceWithMonth(companyPerformanceFindDTO));
+   /*     return PageDataVO.pageInfo(companyPerformanceFindDTO.getPage(), companyPerformanceFindDTO.getLimit(),
+                () -> mapper.selectCompanyPerformanceWithMonth(companyPerformanceFindDTO));*/
+        List<CompanyPerformanceBo> companyPerformanceBos = mapper.selectCompanyPerformanceWithMonth(companyPerformanceFindDTO);
+        PageDataVO<CompanyPerformanceBo> pageDataVO = new PageDataVO<>();
+        pageDataVO.setData(companyPerformanceBos);
+        return pageDataVO;
     }
 
     public List<CompanyPerformanceBo> selectCompanyPerformanceWithMonth(CompanyPerformanceFindDTO companyPerformanceFindDTO) {
@@ -91,8 +99,12 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
      * @return
      */
     public PageDataVO<CompanyPerformanceBo> selectCompanyPerformanceWithWeekPage(CompanyPerformanceFindDTO companyPerformanceFindDTO) {
-        return PageDataVO.pageInfo(companyPerformanceFindDTO.getPage(), companyPerformanceFindDTO.getLimit(),
-                () -> mapper.selectCompanyPerformanceWithWeek(companyPerformanceFindDTO));
+        /*return PageDataVO.pageInfo(companyPerformanceFindDTO.getPage(), companyPerformanceFindDTO.getLimit(),
+                () -> mapper.selectCompanyPerformanceWithWeek(companyPerformanceFindDTO));*/
+        List<CompanyPerformanceBo> companyPerformanceBos = mapper.selectCompanyPerformanceWithWeek(companyPerformanceFindDTO);
+        PageDataVO<CompanyPerformanceBo> pageDataVO = new PageDataVO<>();
+        pageDataVO.setData(companyPerformanceBos);
+        return pageDataVO;
     }
 
     public List<CompanyPerformanceBo> selectCompanyPerformanceWithWeek(CompanyPerformanceFindDTO companyPerformanceFindDTO) {

xx-order/xx-order-server/src/main/resources/mapper/OrderReceivedStatisticsMapper.xml

@@ -103,6 +103,7 @@
         `company_id` ,
         `year`,
         `date`
+        limit #{startIndex},#{endInex}
         ) AS `ors`
         LEFT JOIN (
         SELECT
@@ -134,9 +135,10 @@
         `company_id`,
         `count_year`,
         `count_date`
+        limit #{startIndex},#{endInex}
         ) AS `ovss` ON ovss.cyid = ors.companyId
         AND ovss.count_date = ors.date
-        order by ors.rentVehilceAmount desc,ors.memberAmount desc,ors.travelAmount desc,ors.depositAmount desc,ors.noDeductibleAmount desc ,rentDays desc,departureNum desc, arrivalNum desc
+       <!-- order by ors.rentVehilceAmount desc,ors.memberAmount desc,ors.travelAmount desc,ors.depositAmount desc,ors.noDeductibleAmount desc ,rentDays desc,departureNum desc, arrivalNum desc-->
     </select>
 
     <!--按月统计-->
@@ -185,6 +187,7 @@
         company_id,
         `year`,
         `month`
+        limit #{startIndex},#{endInex}
         ) AS `ors`
         LEFT JOIN (
         SELECT
@@ -216,9 +219,10 @@
         `company_id`,
         `count_year`,
         `count_month`
+        limit #{startIndex},#{endInex}
         ) AS `ovss` ON ovss.cyid = ors.companyId
         AND ovss.count_month = ors.month
-        order by ors.rentVehilceAmount desc,ors.memberAmount desc,ors.travelAmount desc,ors.depositAmount desc,ors.noDeductibleAmount desc ,rentDays desc,departureNum desc, arrivalNum desc
+        <!--order by ors.rentVehilceAmount desc,ors.memberAmount desc,ors.travelAmount desc,ors.depositAmount desc,ors.noDeductibleAmount desc ,rentDays desc,departureNum desc, arrivalNum desc-->
     </select>
 
     <!--按周统计-->
@@ -266,6 +270,7 @@
         company_id,
         `year`,
         `week_of_year`
+        limit #{startIndex},#{endInex}
         ) AS `ors`
         LEFT JOIN (
         SELECT
@@ -298,9 +303,10 @@
         `company_id`,
         `count_year`,
         `count_week`
+        limit #{startIndex},#{endInex}
         ) AS `ovss` ON ovss.cyid = ors.companyId
         AND ovss.count_week = ors.weekOfYear
-        order by ors.rentVehilceAmount desc,ors.memberAmount desc,ors.travelAmount desc,ors.depositAmount desc,ors.noDeductibleAmount desc ,rentDays desc,departureNum desc, arrivalNum desc
+    <!-- order by ors.rentVehilceAmount desc,ors.memberAmount desc,ors.travelAmount desc,ors.depositAmount desc,ors.noDeductibleAmount desc ,rentDays desc,departureNum desc, arrivalNum desc-->
     </select>
 
 </mapper>
\ No newline at end of file