fix: 适配商城、CRM 和 MES 布尔字段查询

YunaiV
1 parent 925806e6
Showing 4 changed files with 30 additions and 17 deletions
yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsPortraitMapper.xml
yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/product/ProductStatisticsMapper.xml
yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/trade/TradeOrderStatisticsMapper.xml
yudao-module-mes/src/main/resources/mapper/qc/pendinginspect/MesQcPendingInspectMapper.xml
@@ -4,7 +4,8 @@
     <select id="selectSummaryListGroupByAreaId"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.portrait.CrmStatisticCustomerAreaRespVO">
-        SELECT area_id, COUNT(*) AS customerCount, SUM(deal_status) AS dealCount
+        <bind name="trueValue" value="true"/>
+        SELECT area_id, COUNT(*) AS customerCount, SUM(CASE WHEN deal_status = #{trueValue} THEN 1 WHEN deal_status IS NULL THEN NULL ELSE 0 END) AS dealCount
         FROM crm_customer
         WHERE deleted = 0 AND area_id IS NOT NULL
         AND owner_user_id IN
@@ -18,7 +19,8 @@
     <select id="selectCustomerIndustryListGroupByIndustryId"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.portrait.CrmStatisticCustomerIndustryRespVO">
-        SELECT industry_id, COUNT(*) AS customerCount, SUM(deal_status) AS dealCount
+        <bind name="trueValue" value="true"/>
+        SELECT industry_id, COUNT(*) AS customerCount, SUM(CASE WHEN deal_status = #{trueValue} THEN 1 WHEN deal_status IS NULL THEN NULL ELSE 0 END) AS dealCount
         FROM crm_customer
         WHERE deleted = 0 AND industry_id IS NOT NULL
         AND owner_user_id IN
@@ -32,7 +34,8 @@
     <select id="selectCustomerSourceListGroupBySource"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.portrait.CrmStatisticCustomerSourceRespVO">
-        SELECT source, COUNT(*) AS customerCount, SUM(deal_status) AS dealCount
+        <bind name="trueValue" value="true"/>
+        SELECT source, COUNT(*) AS customerCount, SUM(CASE WHEN deal_status = #{trueValue} THEN 1 WHEN deal_status IS NULL THEN NULL ELSE 0 END) AS dealCount
         FROM crm_customer
         WHERE deleted = 0 AND source IS NOT NULL
         AND owner_user_id IN
@@ -46,7 +49,8 @@
     <select id="selectCustomerLevelListGroupByLevel"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.portrait.CrmStatisticCustomerLevelRespVO">
-        SELECT level, COUNT(*) AS customerCount, SUM(deal_status) AS dealCount
+        <bind name="trueValue" value="true"/>
+        SELECT level, COUNT(*) AS customerCount, SUM(CASE WHEN deal_status = #{trueValue} THEN 1 WHEN deal_status IS NULL THEN NULL ELSE 0 END) AS dealCount
         FROM crm_customer
         WHERE deleted = 0 AND level IS NOT NULL
         AND owner_user_id IN
@@ -4,6 +4,7 @@
     <select id="selectStatisticsResultPageByTimeBetween"
             resultType="cn.iocoder.yudao.module.statistics.dal.dataobject.product.ProductStatisticsDO">
+        <bind name="trueValue" value="true"/>
         SELECT spu.id                                                       AS spuId
              -- 浏览量：一个用户可以有多次
              , (SELECT COUNT(1)
@@ -55,7 +56,7 @@
                 FROM trade_order_item item
                          JOIN trade_order o ON item.order_id = o.id
                 WHERE spu_id = spu.id
-                  AND o.pay_status = TRUE
+                  AND o.pay_status = #{trueValue}
                   AND item.create_time BETWEEN #{beginTime} AND #{endTime}
                 <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
                     AND item.tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
@@ -67,7 +68,7 @@
                 FROM trade_order_item item
                          JOIN trade_order o ON item.order_id = o.id
                 WHERE spu_id = spu.id
-                  AND o.pay_status = TRUE
+                  AND o.pay_status = #{trueValue}
                   AND item.create_time BETWEEN #{beginTime} AND #{endTime}
                 <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
                     AND item.tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
@@ -4,6 +4,7 @@
     <select id="selectSummaryListByAreaId"
             resultType="cn.iocoder.yudao.module.statistics.service.member.bo.MemberAreaStatisticsRespBO">
+        <bind name="trueValue" value="true"/>
         SELECT receiver_area_id                                AS areaId,
                (SELECT COUNT(DISTINCT s.user_id)
                 FROM trade_order s
@@ -15,7 +16,7 @@
                (SELECT COUNT(DISTINCT s.user_id)
                 FROM trade_order s
                 WHERE s.receiver_area_id = m.receiver_area_id
-                  AND s.pay_status = TRUE
+                  AND s.pay_status = #{trueValue}
                   AND s.deleted = 0
                 <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
                     AND s.tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
@@ -24,7 +25,7 @@
                (SELECT SUM(s.pay_price)
                 FROM trade_order s
                 WHERE s.receiver_area_id = m.receiver_area_id
-                  AND s.pay_status = TRUE
+                  AND s.pay_status = #{trueValue}
                   AND s.deleted = 0
                 <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
                     AND s.tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
@@ -49,10 +50,11 @@
     </select>
     <select id="selectUserCountByPayTimeBetween" resultType="java.lang.Integer">
+        <bind name="trueValue" value="true"/>
         SELECT COUNT(DISTINCT (user_id))
         FROM trade_order
         WHERE pay_time BETWEEN #{beginTime} AND #{endTime}
-          AND pay_status = TRUE
+          AND pay_status = #{trueValue}
           AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
@@ -70,9 +72,10 @@
     </select>
     <select id="selectCountByPayTimeBetween" resultType="java.lang.Integer">
+        <bind name="trueValue" value="true"/>
         SELECT COUNT(1)
         FROM trade_order
-        WHERE pay_status = TRUE
+        WHERE pay_status = #{trueValue}
           AND create_time BETWEEN #{beginTime} AND #{endTime}
           AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
@@ -81,9 +84,10 @@
     </select>
     <select id="selectSummaryPriceByPayTimeBetween" resultType="java.lang.Integer">
+        <bind name="trueValue" value="true"/>
         SELECT SUM(pay_price)
         FROM trade_order s
-        WHERE s.pay_status = TRUE
+        WHERE s.pay_status = #{trueValue}
           AND deleted = 0
           AND create_time BETWEEN #{beginTime} AND #{endTime}
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
@@ -99,11 +103,12 @@
     </resultMap>
     <select id="selectListByPayTimeBetweenAndGroupByDay" resultMap="TradeOrderTrendRespVOMap">
+        <bind name="trueValue" value="true"/>
         SELECT ${@cn.iocoder.yudao.framework.mybatis.core.util.SqlDialectUtils@castDateText('pay_time')} AS statDate,
                COUNT(1)                          AS order_pay_count,
                SUM(pay_price)                    AS order_pay_price
         FROM trade_order
-        WHERE pay_status = TRUE
+        WHERE pay_status = #{trueValue}
           AND create_time BETWEEN #{beginTime} AND #{endTime}
           AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
@@ -114,11 +119,12 @@
     </select>
     <select id="selectListByPayTimeBetweenAndGroupByMonth" resultMap="TradeOrderTrendRespVOMap">
+        <bind name="trueValue" value="true"/>
         SELECT ${@cn.iocoder.yudao.framework.mybatis.core.util.SqlDialectUtils@formatYearDashMonth('pay_time')} AS statDate,
                COUNT(1)                       AS order_pay_count,
                SUM(pay_price)                 AS order_pay_price
         FROM trade_order
-        WHERE pay_status = TRUE
+        WHERE pay_status = #{trueValue}
           AND create_time BETWEEN #{beginTime} AND #{endTime}
           AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
@@ -10,9 +10,11 @@
         4. 销售出库单（OQC）：单据状态=CONFIRMED(1)，行的 oqc_check_flag=1 且 oqc_id 为空
         5. 生产退料单（RQC）：单据状态=CONFIRMED(1)，行的 rqc_check_flag=1 且 rqc_id 为空 且 quality_status=0(待检)
         6. 销售退货单（RQC）：单据状态=CONFIRMED(1)，行的 rqc_check_flag=1 且 rqc_id 为空 且 quality_status=0(待检)
+        IQC、RQC 的检验标记为 bit(1) 布尔列，使用绑定的 Boolean true 比较；OQC 的 oqc_check_flag 为 tinyint(1)，保持数值 1 比较
         注意：各分支无值的 ID 列使用 CASE WHEN 1 = 0 THEN 本分支 bigint 列 END 产生“带类型的 NULL”，避免 UNION 中裸 NULL 的类型推断差异
     -->
     <select id="selectQcPendingPage" resultType="cn.iocoder.yudao.module.mes.controller.admin.qc.pendinginspect.vo.MesQcPendingInspectRespVO">
+        <bind name="trueValue" value="true"/>
         SELECT * FROM (
             <!-- 1. IQC 来源：到货通知单 -->
             SELECT
@@ -32,7 +34,7 @@
             FROM mes_wm_arrival_notice n
                 JOIN mes_wm_arrival_notice_line l ON n.id = l.notice_id
             WHERE n.status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmArrivalNoticeStatusEnum@PENDING_QC.status}
-              AND l.iqc_check_flag = 1
+              AND l.iqc_check_flag = #{trueValue}
               AND l.iqc_id IS NULL
               AND n.deleted = 0
               AND l.deleted = 0
@@ -57,7 +59,7 @@
             FROM mes_wm_outsource_receipt r
                 JOIN mes_wm_outsource_receipt_line rl ON r.id = rl.receipt_id
             WHERE r.status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmOutsourceReceiptStatusEnum@CONFIRMED.status}
-              AND rl.iqc_check_flag = 1
+              AND rl.iqc_check_flag = #{trueValue}
               AND rl.iqc_id IS NULL
               AND r.deleted = 0
               AND rl.deleted = 0
@@ -132,7 +134,7 @@
             FROM mes_wm_return_issue ri
                 JOIN mes_wm_return_issue_line ril ON ri.id = ril.issue_id
             WHERE ri.status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnIssueStatusEnum@CONFIRMED.status}
-              AND ril.rqc_check_flag = 1
+              AND ril.rqc_check_flag = #{trueValue}
               AND ril.rqc_id IS NULL
               AND ril.quality_status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum@PENDING.status}
               AND ri.deleted = 0
@@ -158,7 +160,7 @@
             FROM mes_wm_return_sales r
                 JOIN mes_wm_return_sales_line rl ON r.id = rl.return_id
             WHERE r.status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmReturnSalesStatusEnum@CONFIRMED.status}
-              AND rl.rqc_check_flag = 1
+              AND rl.rqc_check_flag = #{trueValue}
               AND rl.rqc_id IS NULL
               AND rl.quality_status = ${@cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum@PENDING.status}
               AND r.deleted = 0