Merge branch 'test'

bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java

@@ -7,7 +7,6 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 // 提成功能暂停使用：import org.springframework.transaction.annotation.Transactional;
-import com.bms.common.annotation.DataScope;
 import com.bms.common.exception.ServiceException;
 import com.bms.common.utils.SecurityUtils;
 // 提成功能暂停使用：import com.bms.price.domain.PrcProfitCommissionRate;
@@ -35,7 +34,6 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
     */
 
     @Override
-    @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "su", userField = "user_id", permission = "report:profit:list")
     public List<PrcProfitReportOrderRow> selectOrderRows(PrcProfitReportQuery query)
     {
         normalizeMultiValueFilters(query);
@@ -43,7 +41,6 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
     }
 
     @Override
-    @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "su", userField = "user_id", permission = "report:profit:list")
     public List<PrcProfitReportProductRow> selectProductRows(PrcProfitReportQuery query)
     {
         normalizeMultiValueFilters(query);
@@ -51,7 +48,6 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
     }
 
     @Override
-    @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "su", userField = "user_id", permission = "report:profit:list")
     public List<PrcProfitReportSummary> selectSummary(PrcProfitReportQuery query)
     {
         normalizeMultiValueFilters(query);

bms-back/bms-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml

@@ -616,8 +616,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </sql>
 
+    <!-- 仅指定上游订单状态可参与应收账单生成，预览、合计与实际生成共用。 -->
+    <sql id="arBillSourceOrderStatusCondition">
+          and p.order_status in (3, 4, 5, 6, 7, 8, 11)
+    </sql>
+
     <!-- 有未出账费用的订单，或尚未纳入有效账单的无费用计费失败订单。 -->
     <sql id="arBillEligibleSourceCondition">
+        <include refid="arBillSourceOrderStatusCondition"/>
           and (
               exists (
                   select 1 from prc_income_bill_fee f
@@ -704,6 +710,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         inner join prc_income_bill_fee f on f.bill_id = p.bill_id
             and f.ar_bill_status = #{feeArBillStatus}
         where p.customer_id = #{customerId}
+        <include refid="arBillSourceOrderStatusCondition"/>
         <if test="customerCode != null and customerCode != ''">
           and p.customer_code like concat('%', #{customerCode}, '%')
         </if>

bms-back/bms-system/src/main/resources/mapper/price/PrcProfitReportMapper.xml

@@ -203,23 +203,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and (i.product_amount is null or i.redline_amount is null or i.sales_amount is null)
                 </when>
             </choose>
-            <if test="params != null and params.dataScope != null and params.dataScope != ''">
-                and exists (
-                    select 1
-                    from sys_user su
-                    where su.del_flag = '0'
-                      and (
-                          (p.belong_saler_code is not null and p.belong_saler_code != ''
-                           and (su.user_name = p.belong_saler_code collate utf8mb4_general_ci
-                                or su.user_id = p.belong_saler_code + 0))
-                          or
-                          (p.settlement_man_code is not null and p.settlement_man_code != ''
-                           and (su.user_name = p.settlement_man_code collate utf8mb4_general_ci
-                                or su.user_id = p.settlement_man_code + 0))
-                      )
-                      ${params.dataScope}
-                )
-            </if>
         </where>
     </sql>