🔥 移除毛利分析价格缺失统计

bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcProfitReportProductRow.java

@@ -43,6 +43,4 @@ public class PrcProfitReportProductRow implements Serializable
     @Excel(name = "未计算提成订单数", width = 20)
     private Long commissionMissingOrderCount;
     */
-    @Excel(name = "产品价或价格缺失订单数", width = 22)
-    private Long incompleteOrderCount;
 }

bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcProfitReportQuery.java

@@ -35,6 +35,4 @@ public class PrcProfitReportQuery extends BaseEntity
     private String arBillStatus;
     /** 是否按产品维度分组值下钻订单明细，允许分组字段为空。 */
     private Boolean productDrilldown;
-    /** 订单明细弹窗的筛选类型：ALL、INCOMPLETE；COMMISSION_MISSING 暂停使用。 */
-    private String detailType;
 }

bms-back/bms-system/src/main/java/com/bms/price/domain/vo/PrcProfitReportSummary.java

@@ -11,7 +11,6 @@ public class PrcProfitReportSummary implements Serializable
     private static final long serialVersionUID = 1L;
 
     private Long orderCount;
-    private Long incompleteOrderCount;
     private String currency;
     private BigDecimal costAmount;
     private BigDecimal redlineAmount;

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

@@ -98,12 +98,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="commissionAmount" column="commission_amount"/>
         <result property="commissionMissingOrderCount" column="commission_missing_order_count"/>
         -->
-        <result property="incompleteOrderCount" column="incomplete_order_count"/>
     </resultMap>
 
     <resultMap type="PrcProfitReportSummary" id="PrcProfitReportSummaryResult">
         <result property="orderCount" column="order_count"/>
-        <result property="incompleteOrderCount" column="incomplete_order_count"/>
         <result property="currency" column="currency"/>
         <result property="costAmount" column="cost_amount"/>
         <result property="redlineAmount" column="redline_amount"/>
@@ -193,16 +191,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     </if>
                 </otherwise>
             </choose>
-            <choose>
-                <!-- 提成未计算订单下钻暂停使用。
-                <when test="detailType == 'COMMISSION_MISSING'">
-                    and (cr.commission_rate is null or i.product_amount is null or i.sales_amount is null)
-                </when>
-                -->
-                <when test="detailType == 'INCOMPLETE'">
-                    and (i.product_amount is null or i.redline_amount is null or i.sales_amount is null)
-                </when>
-            </choose>
         </where>
     </sql>
 
@@ -271,15 +259,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                  then i.sales_amount - i.product_amount else null end) * 100 /
                         sum(case when i.product_amount is not null and i.sales_amount is not null
                                  then i.sales_amount else null end), 4)
-               end as sales_gross_margin_rate,
+               end as sales_gross_margin_rate
                <!-- 提成金额与未计算订单数暂停使用。
                sum(case when cr.commission_rate is not null and i.product_amount is not null and i.sales_amount is not null
                         then (i.sales_amount - i.product_amount) * cr.commission_rate / 100 else null end) as commission_amount,
                sum(case when cr.commission_rate is null or i.product_amount is null or i.sales_amount is null
                         then 1 else 0 end) as commission_missing_order_count,
                -->
-               sum(case when i.product_amount is null or i.redline_amount is null or i.sales_amount is null
-                        then 1 else 0 end) as incomplete_order_count
         <include refid="profitReportFromAndWhere"/>
         group by p.product_code, p.product_name, p.country_code, p.country_name, i.currency
         order by p.product_code, p.country_code, i.currency
@@ -287,8 +273,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectSummary" resultMap="PrcProfitReportSummaryResult">
         select i.currency, count(*) as order_count,
-               sum(case when i.product_amount is null or i.redline_amount is null or i.sales_amount is null
-                        then 1 else 0 end) as incomplete_order_count,
                sum(i.product_amount) as cost_amount,
                sum(i.redline_amount) as redline_amount,
                sum(case when i.product_amount is not null and i.redline_amount is not null