Merge branch 'order_received_statistics' into dev

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

@@ -44,6 +44,8 @@ public class CompanyPerformanceBiz {
      * @param outputStream
      */
     public void exportOrderReceivedStatisticsData(CompanyPerformanceFindDTO companyPerformanceFindDTO, ServletOutputStream outputStream) throws IOException {
+        companyPerformanceFindDTO.setPage(null);
+        companyPerformanceFindDTO.setLimit(null);
         //1.查询数据
         List<CompanyPerformanceBo> companyPerformanceBos = selectCompanyPerformances(companyPerformanceFindDTO);
 

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

@@ -103,7 +103,9 @@
         `company_id` ,
         `year`,
         `date`
-        limit #{startIndex},#{endInex}
+        <if test="page!=null and limit!=null">
+            limit #{startIndex},#{endInex}
+        </if>
         ) AS `ors`
         LEFT JOIN (
         SELECT
@@ -186,7 +188,9 @@
         company_id,
         `year`,
         `month`
-        limit #{startIndex},#{endInex}
+        <if test="page!=null and limit!=null">
+            limit #{startIndex},#{endInex}
+        </if>
         ) AS `ors`
         LEFT JOIN (
         SELECT
@@ -268,7 +272,9 @@
         company_id,
         `year`,
         `week_of_year`
-        limit #{startIndex},#{endInex}
+        <if test="page!=null and limit!=null">
+            limit #{startIndex},#{endInex}
+        </if>
         ) AS `ors`
         LEFT JOIN (
         SELECT