Merge branch 'master_after0506' into mater_procurement

@@ -2,6 +2,7 @@ package com.lframework.xingyun.sc.impl.statistics;
 
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -40,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.math.RoundingMode;
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
 
 
 @Service
 @Service
@@ -68,15 +70,25 @@ public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailR
         Assert.greaterThanZero(pageSize);
         Assert.greaterThanZero(pageSize);
 
 
         PageHelperUtil.startPage(pageIndex, pageSize);
         PageHelperUtil.startPage(pageIndex, pageSize);
-        List<OrderDetailReport> datas = getBaseMapper().authQuery(vo);
+        List<String> ids = getBaseMapper().authQueryPageIds(vo);
+        PageInfo<String> idPageInfo = new PageInfo<>(ids);
+        List<OrderDetailReport> datas = CollectionUtils.isEmpty(ids)
+                ? Collections.emptyList()
+                : getBaseMapper().queryByIds(ids);
 
 
-        return PageResultUtil.convert(new PageInfo<>(datas));
+        Page<OrderDetailReport> page = new Page<>(idPageInfo.getPageNum(), idPageInfo.getPageSize(), false);
+        page.setTotal(idPageInfo.getTotal());
+        page.addAll(datas);
+        return PageResultUtil.convert(new PageInfo<>(page));
     }
     }
 
 
     @Override
     @Override
     public List<OrderDetailReport> query(QueryOrderDetailReportVo vo) {
     public List<OrderDetailReport> query(QueryOrderDetailReportVo vo) {
-
-        return getBaseMapper().query(vo);
+        List<String> ids = getBaseMapper().queryPageIds(vo);
+        if (CollectionUtils.isEmpty(ids)) {
+            return Collections.emptyList();
+        }
+        return getBaseMapper().queryByIds(ids);
     }
     }
 
 
     @Override
     @Override

@@ -19,24 +19,32 @@ import java.util.List;
 public interface OrderDetailReportMapper extends BaseMapper<OrderDetailReport> {
 public interface OrderDetailReportMapper extends BaseMapper<OrderDetailReport> {
 
 
     /**
     /**
-     * 查询列表
+     * 查询列表ID
      *
      *
      * @param vo
      * @param vo
      * @return
      * @return
      */
      */
-    List<OrderDetailReport> query(@Param("vo") QueryOrderDetailReportVo vo);
+    List<String> queryPageIds(@Param("vo") QueryOrderDetailReportVo vo);
 
 
     /**
     /**
-     * 查询列表
+     * 查询列表ID
      * 开启权限控制
      * 开启权限控制
      *
      *
      * @param vo    查询条件
      * @param vo    查询条件
-     * @return      List<OrderDetailReport>
+     * @return      List<String>
      */
      */
     @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
     @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
-            @DataPermission(template = "order", alias = "t")
+            @DataPermission(template = "order", alias = "tb")
     })
     })
-    List<OrderDetailReport> authQuery(@Param("vo") QueryOrderDetailReportVo vo);
+    List<String> authQueryPageIds(@Param("vo") QueryOrderDetailReportVo vo);
+
+    /**
+     * 根据ID列表查询详情
+     *
+     * @param ids ID列表
+     * @return    List<OrderDetailReport>
+     */
+    List<OrderDetailReport> queryByIds(@Param("ids") List<String> ids);
 
 
     /**
     /**
      * 查询
      * 查询

@@ -141,90 +141,97 @@
 <!--        </where>-->
 <!--        </where>-->
 <!--    </select>-->
 <!--    </select>-->
 
 
-    <select id="findById" resultType="com.lframework.xingyun.sc.entity.OrderDetailReport">
-        <include refid="OrderDetailReport_sql"/>
-        <where>
-            <if test="id != null and id != ''">
-                AND tb.id = #{id}
-            </if>
-        </where>
-    </select>
-
-    <sql id="OrderDetailReport_query_sql">
-        SELECT *
-        FROM (
+    <sql id="OrderDetailReport_detail_select_sql">
         SELECT
         SELECT
-        tb.id,
-        tb.purchase_order_line_id,
-        tb.order_no,
-        tb.order_date,
-        tb.workshop_id,
-        ws.name AS workshop_name,
-        tb.dept_name,
-        tb.region_name,
-        tb.ordering_unit_name,
-        tb.industry,
-        tb.brand,
-        tb.thickness,
-        tb.thickness_tol_pos,
-        tb.thickness_tol_neg,
-        tb.width,
-        tb.width_tol_pos,
-        tb.width_tol_neg,
-        tb.length,
-        tb.length_tol_pos,
-        tb.length_tol_neg,
-        tb.status,
-        tb.quantity,
-        tb.suggested_price,
-        tb.delivery_date,
-        tb.assessment_exceeds_agreement,
-        tb.sales_price,
-        tb.price_list_no,
-        tb.packaging_fee,
-        tb.invoicing_status,
-        tb.piece_weight_header,
-        tb.surface,
-        tb.tolerance,
-        tb.performance,
-        tb.packaging,
-        tb.remarks,
-        tb.shipping_cost,
-        tb.return_shipping_cost,
-        tb.customer_type,
-        tb.quality,
-        tb.contract_type,
-        tb.stock_up_company_name,
-        tb.order_type,
-        tb.show_order,
-        tb.type,
-        tb.production_process,
-        tb.create_by_id,
-        tb.create_by,
-        tb.update_by_id,
-        tb.update_by,
-        tb.create_time,
-        tb.update_time,
-        cs.short_name AS customer_short_name,
-        poi.settlement_terms AS settlement_terms,
-        poi.execution_standard AS execution_standard,
-        poi.execution_standard_remarks AS execution_standard_remarks,
-        CASE
-            WHEN c.type = 'PROCESS_STD_AGMT' THEN pl.product_id
-            ELSE cl.product_id
-        END AS structure_report_used,
-        c.type AS contract_type_code,
-        c.special_terms AS special_requirements,
-        c.create_by AS contract_create_by,
-        MAX(tb.create_time) OVER (PARTITION BY tb.order_no, tb.purchase_order_line_id) AS group_latest_time
-        FROM order_detail_report tb
-        LEFT JOIN base_data_workshop ws ON ws.id = tb.workshop_id
-        LEFT JOIN tbl_purchase_order_line pol ON pol.id = tb.purchase_order_line_id
+            t.id,
+            t.purchase_order_line_id,
+            t.order_no,
+            t.order_date,
+            t.workshop_id,
+            ws.name AS workshop_name,
+            t.dept_name,
+            t.region_name,
+            t.ordering_unit_name,
+            t.industry,
+            t.brand,
+            t.thickness,
+            t.thickness_tol_pos,
+            t.thickness_tol_neg,
+            t.width,
+            t.width_tol_pos,
+            t.width_tol_neg,
+            t.length,
+            t.length_tol_pos,
+            t.length_tol_neg,
+            t.status,
+            t.quantity,
+            t.suggested_price,
+            t.delivery_date,
+            t.assessment_exceeds_agreement,
+            t.sales_price,
+            t.price_list_no,
+            t.packaging_fee,
+            t.invoicing_status,
+            t.piece_weight_header,
+            t.surface,
+            t.tolerance,
+            t.performance,
+            t.packaging,
+            t.remarks,
+            t.shipping_cost,
+            t.return_shipping_cost,
+            t.customer_type,
+            t.quality,
+            t.contract_type,
+            t.stock_up_company_name,
+            t.order_type,
+            t.show_order,
+            t.type,
+            t.production_process,
+            t.create_by_id,
+            t.create_by,
+            t.update_by_id,
+            t.update_by,
+            t.create_time,
+            t.update_time,
+            cs.short_name AS customer_short_name,
+            poi.settlement_terms AS settlement_terms,
+            poi.execution_standard AS execution_standard,
+            poi.execution_standard_remarks AS execution_standard_remarks,
+            CASE
+                WHEN c.type = 'PROCESS_STD_AGMT' THEN pl.product_id
+                ELSE cl.product_id
+            END AS structure_report_used,
+            c.type AS contract_type_code,
+            c.special_terms AS special_requirements,
+            c.create_by AS contract_create_by
+        FROM order_detail_report t
+        LEFT JOIN base_data_workshop ws ON ws.id = t.workshop_id
+        LEFT JOIN tbl_purchase_order_line pol ON pol.id = t.purchase_order_line_id
         LEFT JOIN purchase_order_info poi ON poi.id = pol.purchase_order_id
         LEFT JOIN purchase_order_info poi ON poi.id = pol.purchase_order_id
         LEFT JOIN tbl_contract_distributor_standard c ON c.id = poi.contract_id
         LEFT JOIN tbl_contract_distributor_standard c ON c.id = poi.contract_id
         LEFT JOIN base_data_customer_short cs ON cs.customer_id = poi.ordering_unit
         LEFT JOIN base_data_customer_short cs ON cs.customer_id = poi.ordering_unit
         LEFT JOIN tbl_contract_distributor_line cl ON cl.id = pol.contract_distributor_line_id
         LEFT JOIN tbl_contract_distributor_line cl ON cl.id = pol.contract_distributor_line_id
         LEFT JOIN tbl_contract_std_processing_line pl ON pl.id = pol.contract_distributor_line_id
         LEFT JOIN tbl_contract_std_processing_line pl ON pl.id = pol.contract_distributor_line_id
+    </sql>
+
+    <sql id="OrderDetailReport_page_id_from_sql">
+        FROM order_detail_report tb
+        LEFT JOIN (
+            SELECT
+                order_no,
+                purchase_order_line_id,
+                MAX(create_time) AS group_latest_time
+            FROM order_detail_report
+            GROUP BY order_no, purchase_order_line_id
+        ) grp ON grp.order_no = tb.order_no
+            AND grp.purchase_order_line_id = tb.purchase_order_line_id
+        LEFT JOIN tbl_purchase_order_line pol ON pol.id = tb.purchase_order_line_id
+        LEFT JOIN purchase_order_info poi ON poi.id = pol.purchase_order_id
+        LEFT JOIN tbl_contract_distributor_standard c ON c.id = poi.contract_id
+    </sql>
+
+    <sql id="OrderDetailReport_page_id_where_sql">
         <where>
         <where>
             <if test="vo.ids != null and !vo.ids.isEmpty()">
             <if test="vo.ids != null and !vo.ids.isEmpty()">
                 AND tb.id IN
                 AND tb.id IN
@@ -261,7 +268,7 @@
             </if>
             </if>
             <if test="vo.orderDateEnd != null">
             <if test="vo.orderDateEnd != null">
                 <![CDATA[
                 <![CDATA[
-               AND tb.order_date <= #{vo.orderDateEnd}
+                AND tb.order_date <= #{vo.orderDateEnd}
                 ]]>
                 ]]>
             </if>
             </if>
             <if test="vo.createTimeStart != null">
             <if test="vo.createTimeStart != null">
@@ -269,7 +276,7 @@
             </if>
             </if>
             <if test="vo.createTimeEnd != null">
             <if test="vo.createTimeEnd != null">
                 <![CDATA[
                 <![CDATA[
-               AND tb.create_time <= #{vo.createTimeEnd}
+                AND tb.create_time <= #{vo.createTimeEnd}
                 ]]>
                 ]]>
             </if>
             </if>
             <if test="vo.thickness != null and vo.thickness != ''">
             <if test="vo.thickness != null and vo.thickness != ''">
@@ -282,9 +289,9 @@
                 AND tb.status = #{vo.status}
                 AND tb.status = #{vo.status}
             </if>
             </if>
             <if test="vo.inventoryUnlockedOnly != null and vo.inventoryUnlockedOnly">
             <if test="vo.inventoryUnlockedOnly != null and vo.inventoryUnlockedOnly">
-                AND c.type IN ('DIST_STOCK_CONTRACT','INTL_INVENTORY_AGMT')
-                AND c.status ='FORMAL'
-                AND poi.type='PRODUCTION'
+                AND c.type IN ('DIST_STOCK_CONTRACT', 'INTL_INVENTORY_AGMT')
+                AND c.status = 'FORMAL'
+                AND poi.type = 'PRODUCTION'
                 AND (c.price_spec_locked = 0 OR c.price_spec_locked IS NULL)
                 AND (c.price_spec_locked = 0 OR c.price_spec_locked IS NULL)
             </if>
             </if>
             <if test="vo.excludeInventoryUnlocked != null and vo.excludeInventoryUnlocked">
             <if test="vo.excludeInventoryUnlocked != null and vo.excludeInventoryUnlocked">
@@ -325,19 +332,49 @@
                 </choose>
                 </choose>
             </if>
             </if>
         </where>
         </where>
-        ) t
+    </sql>
+
+    <sql id="OrderDetailReport_page_id_order_sql">
         ORDER BY
         ORDER BY
-        t.group_latest_time DESC,
-        t.order_no ASC,
-        t.purchase_order_line_id ASC,
-        t.show_order ASC
+            grp.group_latest_time DESC,
+            tb.order_no ASC,
+            tb.purchase_order_line_id ASC,
+            tb.show_order ASC
     </sql>
     </sql>
 
 
-    <select id="query" resultMap="OrderDetailReport">
-        <include refid="OrderDetailReport_query_sql"/>
+    <select id="findById" resultMap="OrderDetailReport">
+        <include refid="OrderDetailReport_detail_select_sql"/>
+        <where>
+            <if test="id != null and id != ''">
+                AND t.id = #{id}
+            </if>
+        </where>
+    </select>
+
+    <select id="queryPageIds" resultType="java.lang.String">
+        SELECT tb.id
+        <include refid="OrderDetailReport_page_id_from_sql"/>
+        <include refid="OrderDetailReport_page_id_where_sql"/>
+        <include refid="OrderDetailReport_page_id_order_sql"/>
+    </select>
+
+    <select id="authQueryPageIds" resultType="java.lang.String">
+        SELECT tb.id
+        <include refid="OrderDetailReport_page_id_from_sql"/>
+        <include refid="OrderDetailReport_page_id_where_sql"/>
+        <include refid="OrderDetailReport_page_id_order_sql"/>
     </select>
     </select>
 
 
-    <select id="authQuery" resultMap="OrderDetailReport">
-        <include refid="OrderDetailReport_query_sql"/>
+    <select id="queryByIds" resultMap="OrderDetailReport">
+        <include refid="OrderDetailReport_detail_select_sql"/>
+        WHERE t.id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+        ORDER BY FIELD(t.id,
+        <foreach collection="ids" item="id" separator=",">
+            #{id}
+        </foreach>
+        )
     </select>
     </select>
 </mapper>
 </mapper>