fix: 修复首批关系型数据库通用 SQL 兼容问题

YunaiV
1 parent 971c5a65
Showing 38 changed files with 657 additions and 203 deletions
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/jdbc/JdbcExceptionUtils.java
yudao-framework/yudao-common/src/test/java/cn/iocoder/yudao/framework/common/util/jdbc/JdbcExceptionUtilsTest.java
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
yudao-framework/yudao-spring-boot-starter-web/src/test/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandlerTest.java
yudao-module-ai1-springai/src/main/java/cn/iocoder/yudao/module/ai1/dal/mysql/home/Ai1HomeMapper.java
yudao-module-crm/src/main/resources/mapper/permission/CrmOwnerRecordMapper.xml
yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml
yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsFunnelMapper.xml
yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsPerformanceMapper.xml
yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsPerformanceTargetMapper.xml
yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsProductMapper.xml
yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsRankMapper.xml
yudao-module-erp/src/main/resources/mapper/statistics/ErpPurchaseStatisticsMapper.xml
yudao-module-erp/src/main/resources/mapper/statistics/ErpSaleStatisticsMapper.xml
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/statistics/ImStatisticsManagerMapper.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/statistics/ImStatisticsManagerServiceImpl.java
yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/dal/mysql/statistics/ImStatisticsManagerMapperTest.java
yudao-module-im/src/test/java/cn/iocoder/yudao/module/im/service/statistics/ImStatisticsManagerServiceImplTest.java
yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/member/MemberStatisticsMapper.xml
yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/trade/TradeOrderStatisticsMapper.xml
+package cn.iocoder.yudao.framework.common.util.jdbc;
+
+import cn.hutool.core.util.StrUtil;
+
+import java.sql.SQLException;
+import java.util.*;
+
+/**
+ * JDBC 异常工具类
+ *
+ * @author 芋道源码
+ */
+public class JdbcExceptionUtils {
+
+    /**
+     * 表示“表不存在”的 SQLState
+     *
+     * 1. 42S02：ANSI / ODBC 标准，MySQL（1146）、MariaDB、H2、SQL Server（jTDS）等使用
+     * 2. S0002：X/Open 旧标准，SQL Server（208，mssql-jdbc）使用
+     * 3. 42P01：PostgreSQL 的 undefined_table，openGauss、KingbaseES 等 PostgreSQL 兼容数据库同样使用
+     */
+    private static final Set<String> TABLE_NOT_EXISTS_SQL_STATES = new HashSet<>(Arrays.asList("42S02", "S0002", "42P01"));
+
+    /**
+     * Oracle 的“表或视图不存在”错误码：ORA-00942，对应 SQLState 为通用的 42000，需要同时匹配错误码
+     */
+    private static final int ORACLE_TABLE_NOT_EXISTS_ERROR_CODE = 942;
+    private static final String ORACLE_TABLE_NOT_EXISTS_SQL_STATE = "42000";
+
+    /**
+     * 兜底的“表不存在”异常文案，兼容未携带 SQLState 的场景（MySQL 的 Table 'xxx' doesn't exist）
+     */
+    private static final String TABLE_NOT_EXISTS_MESSAGE = "doesn't exist";
+
+    /**
+     * 判断异常是否为“表不存在”
+     *
+     * 沿 cause 链、{@link SQLException#getNextException()} 链查找，优先识别 SQLState、错误码。
+     * 仅在整条链都没有有效 SQLState 时兜底匹配异常文案，避免外层包装信息覆盖明确的数据库错误。
+     * 列不存在、权限不足、语法错误等其它异常，都返回 false，由调用方原样抛出。
+     *
+     * @param throwable 异常
+     * @return 是否表不存在
+     */
+    @SuppressWarnings("PatternVariableCanBeUsed") // 保持 JDK8 兼容性
+    public static boolean isTableNotExists(Throwable throwable) {
+        Set<Throwable> visited = Collections.newSetFromMap(new IdentityHashMap<>());
+        Deque<Throwable> queue = new ArrayDeque<>();
+        if (throwable != null) {
+            queue.add(throwable);
+        }
+        boolean hasSqlState = false;
+        boolean hasLegacyMessage = false;
+        while (!queue.isEmpty()) {
+            Throwable current = queue.poll();
+            if (!visited.add(current)) { // 避免循环引用
+                continue;
+            }
+            if (current instanceof SQLException) {
+                SQLException sqlException = (SQLException) current;
+                if (isTableNotExists(sqlException)) {
+                    return true;
+                }
+                hasSqlState |= StrUtil.isNotBlank(sqlException.getSQLState());
+                addIfNotNull(queue, sqlException.getNextException());
+            }
+            hasLegacyMessage |= StrUtil.contains(current.getMessage(), TABLE_NOT_EXISTS_MESSAGE);
+            addIfNotNull(queue, current.getCause());
+        }
+        return !hasSqlState && hasLegacyMessage;
+    }
+
+    private static boolean isTableNotExists(SQLException sqlException) {
+        String sqlState = sqlException.getSQLState();
+        if (TABLE_NOT_EXISTS_SQL_STATES.contains(sqlState)) {
+            return true;
+        }
+        return sqlException.getErrorCode() == ORACLE_TABLE_NOT_EXISTS_ERROR_CODE
+                && ORACLE_TABLE_NOT_EXISTS_SQL_STATE.equals(sqlState);
+    }
+
+    private static void addIfNotNull(Deque<Throwable> queue, Throwable throwable) {
+        if (throwable != null) {
+            queue.add(throwable);
+        }
+    }
+
+}
+package cn.iocoder.yudao.framework.common.util.jdbc;
+
+import org.junit.jupiter.api.Test;
+
+import java.sql.SQLException;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * {@link JdbcExceptionUtils} 的单元测试
+ *
+ * @author 芋道源码
+ */
+public class JdbcExceptionUtilsTest {
+
+    // ========== 表不存在：SQLState、错误码 ==========
+
+    @Test
+    public void testIsTableNotExists_mysql() {
+        assertTrue(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("Table 'ruoyi-vue-pro.bpm_category' doesn't exist", "42S02", 1146)));
+        // SQLState 识别，不依赖文案
+        assertTrue(JdbcExceptionUtils.isTableNotExists(new SQLException("unknown", "42S02", 1146)));
+    }
+
+    @Test
+    public void testIsTableNotExists_postgresql() {
+        assertTrue(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("ERROR: relation \"bpm_category\" does not exist", "42P01")));
+    }
+
+    @Test
+    public void testIsTableNotExists_oracle() {
+        assertTrue(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("ORA-00942: table or view does not exist\n", "42000", 942)));
+    }
+
+    @Test
+    public void testIsTableNotExists_sqlServer() {
+        // mssql-jdbc
+        assertTrue(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("Invalid object name 'bpm_category'.", "S0002", 208)));
+        // jTDS
+        assertTrue(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("Invalid object name 'bpm_category'.", "42S02", 208)));
+    }
+
+    @Test
+    public void testIsTableNotExists_messageFallback() {
+        // 未携带 SQLState 时，兜底匹配 MySQL 文案
+        assertTrue(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("Table 'ruoyi-vue-pro.mp_account' doesn't exist")));
+        assertTrue(JdbcExceptionUtils.isTableNotExists(
+                new RuntimeException("### Cause: Table 'ruoyi-vue-pro.mp_account' doesn't exist")));
+    }
+
+    // ========== 表不存在：异常链 ==========
+
+    @Test
+    public void testIsTableNotExists_causeChain() {
+        SQLException sqlException = new SQLException("ERROR: relation \"mp_account\" does not exist", "42P01");
+        // 外层包装的文案不包含“表不存在”，需要沿 cause 链查找
+        assertTrue(JdbcExceptionUtils.isTableNotExists(
+                new RuntimeException("nested exception", new IllegalStateException(sqlException))));
+    }
+
+    @Test
+    public void testIsTableNotExists_nextExceptionChain() {
+        SQLException batchException = new SQLException("Batch entry 0 was aborted", "25P02");
+        batchException.setNextException(new SQLException("ERROR: relation \"mp_account\" does not exist", "42P01"));
+        assertTrue(JdbcExceptionUtils.isTableNotExists(new RuntimeException(batchException)));
+    }
+
+    // ========== 非表不存在：原样返回 false ==========
+
+    @Test
+    public void testIsTableNotExists_columnNotExists() {
+        // MySQL
+        assertFalse(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("Unknown column 'xxx' in 'field list'", "42S22", 1054)));
+        // PostgreSQL
+        assertFalse(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("ERROR: column \"xxx\" does not exist", "42703")));
+        // Oracle
+        assertFalse(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("ORA-00904: \"XXX\": invalid identifier\n", "42000", 904)));
+        // SQL Server
+        assertFalse(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("Invalid column name 'xxx'.", "S0001", 207)));
+    }
+
+    @Test
+    public void testIsTableNotExists_permissionDenied() {
+        // MySQL
+        assertFalse(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("SELECT command denied to user 'u'@'localhost' for table 'bpm_category'", "42000", 1142)));
+        // PostgreSQL
+        assertFalse(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("ERROR: permission denied for table bpm_category", "42501")));
+        // Oracle
+        assertFalse(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("ORA-01031: insufficient privileges\n", "42000", 1031)));
+    }
+
+    @Test
+    public void testIsTableNotExists_sqlStateTakesPrecedenceOverLegacyMessage() {
+        // 用户名或外层包装信息可能包含旧文案，明确的权限/列错误仍应保留。
+        assertFalse(JdbcExceptionUtils.isTableNotExists(new SQLException(
+                "SELECT command denied to user 'doesn't exist'@'localhost' for table 'erp_product'",
+                "42000", 1142)));
+        assertFalse(JdbcExceptionUtils.isTableNotExists(new RuntimeException(
+                "Previous lookup: Table 'erp_product' doesn't exist",
+                new SQLException("column missing", "42703"))));
+    }
+
+    @Test
+    public void testIsTableNotExists_otherErrors() {
+        // 语法错误：与 Oracle ORA-00942 同为 42000，但错误码不同
+        assertFalse(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("You have an error in your SQL syntax", "42000", 1064)));
+        assertFalse(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("ERROR: syntax error at or near \"FROM\"", "42601")));
+        // 错误码相同，但 SQLState 不是“表不存在”：Oracle ORA-01146、SQL Server 942
+        assertFalse(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("ORA-01146: cannot start online backup", "72000", 1146)));
+        assertFalse(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("Database 'xxx' cannot be opened because it is offline.", "S0001", 942)));
+        // 唯一键冲突、连接异常
+        assertFalse(JdbcExceptionUtils.isTableNotExists(
+                new SQLException("Duplicate entry '1' for key 'PRIMARY'", "23000", 1062)));
+        assertFalse(JdbcExceptionUtils.isTableNotExists(new SQLException("Connection refused", "08001")));
+        // 非 MySQL 文案的“does not exist”，且无 SQLState
+        assertFalse(JdbcExceptionUtils.isTableNotExists(new RuntimeException("Table does not exist")));
+    }
+
+    @Test
+    public void testIsTableNotExists_nullAndEmpty() {
+        assertFalse(JdbcExceptionUtils.isTableNotExists(null));
+        assertFalse(JdbcExceptionUtils.isTableNotExists(new RuntimeException((String) null)));
+        assertFalse(JdbcExceptionUtils.isTableNotExists(new SQLException((String) null)));
+        assertFalse(JdbcExceptionUtils.isTableNotExists(
+                new RuntimeException(null, new SQLException(null, null, 0))));
+    }
+
+    @Test
+    public void testIsTableNotExists_cycle() {
+        // cause 链循环
+        RuntimeException a = new RuntimeException("a");
+        RuntimeException b = new RuntimeException("b", a);
+        a.initCause(b);
+        assertFalse(JdbcExceptionUtils.isTableNotExists(a));
+
+        // nextException 链循环
+        SQLException s1 = new SQLException("s1", "HY000", 1);
+        SQLException s2 = new SQLException("s2", "HY000", 2);
+        s1.setNextException(s2);
+        s2.setNextException(s1);
+        assertFalse(JdbcExceptionUtils.isTableNotExists(s1));
+
+        // 循环链中存在“表不存在”时，仍可识别
+        SQLException s3 = new SQLException("s3", "HY000", 3);
+        SQLException s4 = new SQLException("ERROR: relation \"mp_account\" does not exist", "42P01");
+        s3.setNextException(s4);
+        s4.setNextException(s3);
+        assertTrue(JdbcExceptionUtils.isTableNotExists(s4));
+        assertTrue(JdbcExceptionUtils.isTableNotExists(s3));
+    }
+
+}
@@ -11,6 +11,7 @@ import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
+import cn.iocoder.yudao.framework.common.util.jdbc.JdbcExceptionUtils;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.framework.common.util.monitor.TracerUtils;
 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
@@ -396,10 +397,10 @@ public class GlobalExceptionHandler {
      * @return 如果是 Table 不存在的异常，则返回对应的 CommonResult
      */
     private CommonResult<?> handleTableNotExists(Throwable ex) {
-        String message = ExceptionUtil.getRootCauseMessage(ex);
-        if (!message.contains("doesn't exist")) {
+        if (!JdbcExceptionUtils.isTableNotExists(ex)) {
             return null;
         }
+        String message = StrUtil.nullToEmpty(ExceptionUtil.getRootCauseMessage(ex));
         // 1. 工作流
         if (message.contains("bpm_")) {
             log.error("[工作流模块 yudao-module-bpm - 表结构未导入][参考 https://cloud.iocoder.cn/bpm/ 开启]");
+package cn.iocoder.yudao.framework.web.core.handler;
+
+import cn.iocoder.yudao.framework.common.biz.infra.logger.ApiErrorLogCommonApi;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import jakarta.servlet.http.HttpServletRequest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.sql.SQLException;
+
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
+import static cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants.NOT_IMPLEMENTED;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+
+/**
+ * {@link GlobalExceptionHandler} 的单元测试
+ *
+ * 重点验证“表不存在”的识别：按 SQLState / 错误码识别多种数据库，其它 SQL 异常不会被当作表不存在
+ *
+ * @author 芋道源码
+ */
+public class GlobalExceptionHandlerTest {
+
+    private GlobalExceptionHandler globalExceptionHandler;
+
+    private HttpServletRequest request;
+
+    @BeforeEach
+    public void setUp() {
+        globalExceptionHandler = new GlobalExceptionHandler("test", mock(ApiErrorLogCommonApi.class));
+        request = mock(HttpServletRequest.class);
+    }
+
+    @Test
+    public void testDefaultExceptionHandler_tableNotExists_mysql() {
+        // 准备参数
+        Exception ex = new RuntimeException("nested exception",
+                new SQLException("Table 'ruoyi-vue-pro.erp_product' doesn't exist", "42S02", 1146));
+
+        // 调用
+        CommonResult<?> result = globalExceptionHandler.defaultExceptionHandler(request, ex);
+        // 断言
+        assertEquals(NOT_IMPLEMENTED.getCode(), result.getCode());
+        assertTrue(result.getMsg().contains("yudao-module-erp"));
+    }
+
+    @Test
+    public void testDefaultExceptionHandler_tableNotExists_postgresql() {
+        // 准备参数：PostgreSQL 的文案不包含 doesn't exist，通过 SQLState 42P01 识别
+        Exception ex = new RuntimeException("nested exception",
+                new SQLException("ERROR: relation \"bpm_category\" does not exist", "42P01"));
+
+        // 调用
+        CommonResult<?> result = globalExceptionHandler.defaultExceptionHandler(request, ex);
+        // 断言
+        assertEquals(NOT_IMPLEMENTED.getCode(), result.getCode());
+        assertTrue(result.getMsg().contains("yudao-module-bpm"));
+    }
+
+    @Test
+    public void testDefaultExceptionHandler_tableNotExists_noPrefixMatched() {
+        // 准备参数：Oracle 的文案不包含表名，无法匹配模块前缀，按系统异常处理
+        Exception ex = new RuntimeException("nested exception",
+                new SQLException("ORA-00942: table or view does not exist\n", "42000", 942));
+
+        // 调用
+        CommonResult<?> result = globalExceptionHandler.defaultExceptionHandler(request, ex);
+        // 断言
+        assertEquals(INTERNAL_SERVER_ERROR.getCode(), result.getCode());
+    }
+
+    @Test
+    public void testDefaultExceptionHandler_columnNotExists() {
+        // 准备参数：列不存在，即使文案包含模块前缀，也不是表不存在
+        Exception ex = new RuntimeException("nested exception",
+                new SQLException("ERROR: column \"xxx\" of relation \"bpm_category\" does not exist", "42703"));
+
+        // 调用
+        CommonResult<?> result = globalExceptionHandler.defaultExceptionHandler(request, ex);
+        // 断言
+        assertEquals(INTERNAL_SERVER_ERROR.getCode(), result.getCode());
+    }
+
+    @Test
+    public void testDefaultExceptionHandler_permissionDenied() {
+        // 准备参数：权限不足，不是表不存在
+        Exception ex = new RuntimeException("nested exception",
+                new SQLException("SELECT command denied to user 'u'@'localhost' for table 'erp_product'", "42000", 1142));
+
+        // 调用
+        CommonResult<?> result = globalExceptionHandler.defaultExceptionHandler(request, ex);
+        // 断言
+        assertEquals(INTERNAL_SERVER_ERROR.getCode(), result.getCode());
+    }
+
+    @Test
+    public void testDefaultExceptionHandler_permissionDeniedWithLegacyPhrase() {
+        Exception ex = new RuntimeException("nested exception", new SQLException(
+                "SELECT command denied to user 'doesn't exist'@'localhost' for table 'erp_product'",
+                "42000", 1142));
+
+        CommonResult<?> result = globalExceptionHandler.defaultExceptionHandler(request, ex);
+
+        assertEquals(INTERNAL_SERVER_ERROR.getCode(), result.getCode());
+    }
+
+    @Test
+    public void testDefaultExceptionHandler_nullMessage() {
+        // 调用
+        CommonResult<?> result = globalExceptionHandler.defaultExceptionHandler(request,
+                new RuntimeException((String) null));
+        // 断言
+        assertEquals(INTERNAL_SERVER_ERROR.getCode(), result.getCode());
+    }
+
+}
@@ -5,6 +5,8 @@ import cn.iocoder.yudao.module.ai1.controller.admin.home.vo.Ai1HomeMessageSummar
 import cn.iocoder.yudao.module.ai1.controller.admin.home.vo.Ai1HomeSummaryRespVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.Select;
 import java.time.LocalDateTime;
@@ -18,32 +20,36 @@ import java.util.List;
 @Mapper
 public interface Ai1HomeMapper {
-    @Select("SELECT (SELECT COUNT(1) FROM ai1_agent WHERE deleted = FALSE) AS agentCount, " +
-            "(SELECT COUNT(1) FROM ai1_skill WHERE deleted = FALSE) AS skillCount, " +
-            "(SELECT COUNT(1) FROM ai1_mcp WHERE deleted = FALSE) AS mcpCount, " +
-            "(SELECT COUNT(1) FROM ai1_model WHERE deleted = FALSE) AS modelCount")
+    @Select("SELECT (SELECT COUNT(1) FROM ai1_agent WHERE deleted = 0) AS agentCount, " +
+            "(SELECT COUNT(1) FROM ai1_skill WHERE deleted = 0) AS skillCount, " +
+            "(SELECT COUNT(1) FROM ai1_mcp WHERE deleted = 0) AS mcpCount, " +
+            "(SELECT COUNT(1) FROM ai1_model WHERE deleted = 0) AS modelCount")
     Ai1HomeSummaryRespVO selectSummary();
     /**
      * 按天统计消息数量，仅返回有消息的日期；使用 CAST AS DATE 兼容 MySQL 与 H2
      */
-    @Select("SELECT CAST(create_time AS DATE) AS `date`, COUNT(1) AS `count` " +
+    @Select("SELECT CAST(create_time AS DATE) AS statDate, COUNT(1) AS count " +
             "FROM ai1_session_message " +
-            "WHERE create_time BETWEEN #{beginTime} AND #{endTime} AND deleted = FALSE " +
+            "WHERE create_time BETWEEN #{beginTime} AND #{endTime} AND deleted = 0 " +
             "GROUP BY CAST(create_time AS DATE) " +
-            "ORDER BY `date`")
+            "ORDER BY statDate")
+    @Results({
+            @Result(column = "statDate", property = "date"),
+            @Result(column = "count", property = "count")
+    })
     List<Ai1HomeMessageSummaryByDateRespVO> selectMessageSummaryListByCreateTimeBetweenGroupByDate(
             @Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime);
     /**
      * 按 Agent 统计消息数量，按数量倒序，数量相同按 Agent 编号升序；已删除会话下的消息不计入
      */
-    @Select("SELECT c.agent_id AS agentId, COUNT(1) AS `count` " +
+    @Select("SELECT c.agent_id AS agentId, COUNT(1) AS count " +
             "FROM ai1_session_message m " +
-            "INNER JOIN ai1_session c ON m.session_id = c.id AND c.deleted = FALSE " +
-            "WHERE m.create_time BETWEEN #{beginTime} AND #{endTime} AND m.deleted = FALSE " +
+            "INNER JOIN ai1_session c ON m.session_id = c.id AND c.deleted = 0 " +
+            "WHERE m.create_time BETWEEN #{beginTime} AND #{endTime} AND m.deleted = 0 " +
             "GROUP BY c.agent_id " +
-            "ORDER BY `count` DESC, c.agent_id")
+            "ORDER BY count DESC, c.agent_id")
     List<Ai1HomeMessageSummaryByAgentRespVO> selectMessageSummaryListByCreateTimeBetweenGroupByAgentId(
             @Param("beginTime") LocalDateTime beginTime, @Param("endTime") LocalDateTime endTime);
@@ -16,7 +16,7 @@
                 </foreach>
            AND post_owner_user_id IS NULL
            AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
-         GROUP BY time
+         GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')
     </select>
     <select id="selectPoolCustomerTakeCountByDate"
@@ -32,7 +32,7 @@
                     #{userId}
                 </foreach>
            AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
-         GROUP BY time
+         GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')
     </select>
     <select id="selectPoolCustomerPutCountByUser"
@@ -13,15 +13,15 @@
                     #{userId}
                 </foreach>
            AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
-         GROUP BY time
+         GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')
     </select>
     <select id="selectCustomerDealCountGroupByDate"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByDateRespVO">
         SELECT DATE_FORMAT(customer.create_time, '%Y-%m-%d')    AS time,
                COUNT(DISTINCT customer.id)                      AS customer_deal_count
-          FROM crm_customer AS customer
-                LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
+          FROM crm_customer customer
+                LEFT JOIN crm_contract contract ON contract.customer_id = customer.id
          WHERE customer.deleted = 0
            AND contract.deleted = 0
            AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
@@ -30,7 +30,7 @@
                     #{userId}
                 </foreach>
            AND customer.create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
-         GROUP BY time
+         GROUP BY DATE_FORMAT(customer.create_time, '%Y-%m-%d')
     </select>
     <select id="selectCustomerCreateCountGroupByUser"
@@ -51,8 +51,8 @@
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByUserRespVO">
         SELECT customer.owner_user_id,
                COUNT(DISTINCT customer.id) AS customer_deal_count
-          FROM crm_customer AS customer
-                LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
+          FROM crm_customer customer
+                LEFT JOIN crm_contract contract ON contract.customer_id = customer.id
          WHERE customer.deleted = 0
            AND contract.deleted = 0
            AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
@@ -67,7 +67,7 @@
     <select id="selectContractPriceGroupByUser"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByUserRespVO">
         SELECT owner_user_id,
-               IFNULL(SUM(total_price), 0) AS contract_price
+               COALESCE(SUM(total_price), 0) AS contract_price
           FROM crm_contract
          WHERE deleted = 0
            AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
@@ -82,7 +82,7 @@
     <select id="selectReceivablePriceGroupByUser"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerSummaryByUserRespVO">
         SELECT owner_user_id,
-               IFNULL(SUM(price), 0) AS receivable_price
+               COALESCE(SUM(price), 0) AS receivable_price
           FROM crm_receivable
          WHERE deleted = 0
            AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
@@ -105,7 +105,7 @@
                 </foreach>
            AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
            AND biz_type = ${@cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum@CRM_CUSTOMER.type}
-         GROUP BY time
+         GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')
     </select>
     <select id="selectFollowUpCustomerCountGroupByDate"
@@ -119,7 +119,7 @@
                 </foreach>
            AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
            AND biz_type = ${@cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum@CRM_CUSTOMER.type}
-         GROUP BY time
+         GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')
     </select>
     <select id="selectFollowUpRecordCountGroupByUser"
@@ -162,7 +162,7 @@
                 </foreach>
            AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
            AND biz_type = ${@cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum@CRM_CUSTOMER.type}
-         GROUP BY follow_up_type
+         GROUP BY type
     </select>
     <select id="selectContractSummary"
@@ -176,10 +176,10 @@
                contract.name AS contract_name,
                contract.total_price,
                contract.order_date,
-               IFNULL(receivable.price, 0) AS receivable_price
-          FROM crm_customer AS customer
-                INNER JOIN crm_contract AS contract ON customer.id = contract.customer_id
-                LEFT JOIN crm_receivable AS receivable ON contract.id = receivable.contract_id
+               COALESCE(receivable.price, 0) AS receivable_price
+          FROM crm_customer customer
+                INNER JOIN crm_contract contract ON customer.id = contract.customer_id
+                LEFT JOIN crm_receivable receivable ON contract.id = receivable.contract_id
          WHERE customer.deleted = 0 AND contract.deleted = 0 AND receivable.deleted = 0
            AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
            AND customer.owner_user_id IN
@@ -193,9 +193,9 @@
     <select id="selectCustomerDealCycleGroupByDate"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByDateRespVO">
         SELECT DATE_FORMAT(contract.order_date, '%Y-%m-%d') AS time,
-               IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle
-          FROM crm_customer AS customer
-                LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
+               COALESCE(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle
+          FROM crm_customer customer
+                LEFT JOIN crm_contract contract ON contract.customer_id = customer.id
          WHERE customer.deleted = 0 AND contract.deleted = 0
            AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
            AND customer.owner_user_id IN
@@ -203,15 +203,15 @@
                     #{userId}
                 </foreach>
            AND customer.create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
-         GROUP BY time
+         GROUP BY DATE_FORMAT(contract.order_date, '%Y-%m-%d')
     </select>
     <select id="selectCustomerDealCycleGroupByUser"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByUserRespVO">
         SELECT customer.owner_user_id,
-               IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle
-          FROM crm_customer AS customer
-                LEFT JOIN crm_contract AS contract ON contract.customer_id = customer.id
+               COALESCE(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle
+          FROM crm_customer customer
+                LEFT JOIN crm_contract contract ON contract.customer_id = customer.id
          WHERE customer.deleted = 0 AND contract.deleted = 0
            AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
            AND customer.owner_user_id IN
@@ -225,10 +225,10 @@
     <select id="selectCustomerDealCycleGroupByAreaId"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByAreaRespVO">
         SELECT customer.area_id AS area_id,
-               IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle,
+               COALESCE(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0) AS customer_deal_cycle,
                COUNT(DISTINCT customer.id) AS customer_deal_count
-        FROM crm_customer AS customer
-                LEFT JOIN crm_contract AS contract ON customer.id = contract.customer_id
+        FROM crm_customer customer
+                LEFT JOIN crm_contract contract ON customer.id = contract.customer_id
         WHERE customer.deleted = 0
           AND contract.deleted = 0
           AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
@@ -244,12 +244,12 @@
     <select id="selectCustomerDealCycleGroupByProductId"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.customer.CrmStatisticsCustomerDealCycleByProductRespVO">
         SELECT product.name                                                                                 AS product_name,
-               IFNULL(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0)   AS customer_deal_cycle,
+               COALESCE(TRUNCATE(AVG(TIMESTAMPDIFF(DAY, customer.create_time, contract.order_date)), 1), 0)   AS customer_deal_cycle,
                COUNT(DISTINCT customer.id)                                                                  AS customer_deal_count
-          FROM crm_customer AS customer
-                LEFT JOIN crm_contract AS contract ON customer.id = contract.customer_id
-                LEFT JOIN crm_contract_product AS contract_product ON contract_product.contract_id = contract.id
-                LEFT JOIN crm_product AS product ON contract_product.product_id = product.id
+          FROM crm_customer customer
+                LEFT JOIN crm_contract contract ON customer.id = contract.customer_id
+                LEFT JOIN crm_contract_product contract_product ON contract_product.contract_id = contract.id
+                LEFT JOIN crm_product product ON contract_product.product_id = product.id
          WHERE customer.deleted = 0
            AND contract.deleted = 0
            AND contract_product.deleted = 0
@@ -260,7 +260,7 @@
                      #{userId}
                  </foreach>
            AND customer.create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
-        GROUP BY product.id
+        GROUP BY product.id, product.name
     </select>
 </mapper>
@@ -41,7 +41,7 @@
         SELECT
             end_status AS endStatus,
             COUNT(*) AS businessCount,
-            IFNULL(SUM(total_price), 0) AS totalPrice
+            COALESCE(SUM(total_price), 0) AS totalPrice
         FROM crm_business
         WHERE deleted = 0 AND end_status IS NOT NULL
         <if test="statusTypeId != null">
@@ -64,7 +64,7 @@
             status.percent AS statusPercent,
             status.sort AS sort,
             COUNT(business.id) AS businessCount,
-            IFNULL(SUM(business.total_price), 0) AS totalPrice
+            COALESCE(SUM(business.total_price), 0) AS totalPrice
         FROM crm_business_status status
         LEFT JOIN crm_business business ON business.status_id = status.id
             AND business.deleted = 0
@@ -88,7 +88,7 @@
         SELECT
             DATE_FORMAT(create_time, '%Y-%m-%d') AS time,
             COUNT(*) AS businessCreateCount,
-            IFNULL(SUM(total_price), 0) AS totalPrice
+            COALESCE(SUM(total_price), 0) AS totalPrice
         FROM crm_business
         WHERE deleted = 0
         <if test="statusTypeId != null">
@@ -100,7 +100,7 @@
         </foreach>
         AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND
         #{times[1],javaType=java.time.LocalDateTime}
-        GROUP BY time
+        GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')
     </select>
     <select id="selectBusinessInversionRateSummaryByDate"
@@ -108,7 +108,7 @@
         SELECT
             DATE_FORMAT(create_time, '%Y-%m-%d') AS time,
             COUNT(*) AS businessCount,
-            SUM(IF(end_status = 1, 1, 0)) AS businessWinCount
+            SUM(CASE WHEN end_status = 1 THEN 1 ELSE 0 END) AS businessWinCount
         FROM crm_business
         WHERE deleted = 0
         <if test="statusTypeId != null">
@@ -120,7 +120,7 @@
         </foreach>
         AND create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND
         #{times[1],javaType=java.time.LocalDateTime}
-        GROUP BY time
+        GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')
     </select>
 </mapper>
@@ -16,14 +16,14 @@
             </foreach>
         AND order_date between #{times[0],javaType=java.time.LocalDateTime} and
             #{times[1],javaType=java.time.LocalDateTime}
-        GROUP BY time
+        GROUP BY DATE_FORMAT(order_date, '%Y%m')
     </select>
     <select id="selectContractPricePerformance"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.performance.CrmStatisticsPerformanceRespVO">
         SELECT
             DATE_FORMAT(order_date, '%Y%m') AS time,
-            IFNULL(SUM(total_price), 0) AS currentMonthCount
+            COALESCE(SUM(total_price), 0) AS currentMonthCount
         FROM crm_contract
         WHERE deleted = 0
         AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
@@ -33,14 +33,14 @@
             </foreach>
         AND order_date between #{times[0],javaType=java.time.LocalDateTime} and
             #{times[1],javaType=java.time.LocalDateTime}
-        GROUP BY time
+        GROUP BY DATE_FORMAT(order_date, '%Y%m')
     </select>
     <select id="selectReceivablePricePerformance"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.performance.CrmStatisticsPerformanceRespVO">
         SELECT
             DATE_FORMAT(return_time, '%Y%m') AS time,
-            IFNULL(SUM(price), 0) AS currentMonthCount
+            COALESCE(SUM(price), 0) AS currentMonthCount
         FROM crm_receivable
         WHERE deleted = 0
         AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
@@ -50,25 +50,25 @@
             </foreach>
         AND return_time between #{times[0],javaType=java.time.LocalDateTime} and
             #{times[1],javaType=java.time.LocalDateTime}
-        GROUP BY time
+        GROUP BY DATE_FORMAT(return_time, '%Y%m')
     </select>
     <select id="selectContractSummary"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.performance.CrmStatisticsPerformanceSummaryRespVO">
         SELECT DATE_FORMAT(contract.order_date, '%Y%m') AS time,
                COUNT(DISTINCT contract.id) AS contract_count,
-               IFNULL(SUM(contract.total_price), 0) AS contract_price,
-               IFNULL(SUM(receivable.receivable_price), 0) AS receivable_price,
-               IFNULL(SUM(contract.total_price), 0) - IFNULL(SUM(receivable.receivable_price), 0) AS unreceived_price
-          FROM crm_contract AS contract
+               COALESCE(SUM(contract.total_price), 0) AS contract_price,
+               COALESCE(SUM(receivable.receivable_price), 0) AS receivable_price,
+               COALESCE(SUM(contract.total_price), 0) - COALESCE(SUM(receivable.receivable_price), 0) AS unreceived_price
+          FROM crm_contract contract
                 LEFT JOIN (
                     SELECT contract_id,
-                           IFNULL(SUM(price), 0) AS receivable_price
+                           COALESCE(SUM(price), 0) AS receivable_price
                       FROM crm_receivable
                      WHERE deleted = 0
                        AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
                      GROUP BY contract_id
-                ) AS receivable ON contract.id = receivable.contract_id
+                ) receivable ON contract.id = receivable.contract_id
          WHERE contract.deleted = 0
            AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
            AND contract.owner_user_id in
@@ -77,7 +77,7 @@
                 </foreach>
            AND contract.order_date between #{times[0],javaType=java.time.LocalDateTime} and
                 #{times[1],javaType=java.time.LocalDateTime}
-         GROUP BY time
+         GROUP BY DATE_FORMAT(contract.order_date, '%Y%m')
     </select>
 </mapper>
@@ -11,7 +11,7 @@
     <select id="selectContractActualByMonth"
             resultMap="CrmStatisticsPerformanceTargetActualResultMap">
         SELECT MONTH(order_date) AS month,
-               IFNULL(SUM(total_price), 0) AS current_price
+               COALESCE(SUM(total_price), 0) AS current_price
           FROM crm_contract
          WHERE deleted = 0
            AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
@@ -26,7 +26,7 @@
     <select id="selectReceivableActualByMonth"
             resultMap="CrmStatisticsPerformanceTargetActualResultMap">
         SELECT MONTH(return_time) AS month,
-               IFNULL(SUM(price), 0) AS current_price
+               COALESCE(SUM(price), 0) AS current_price
           FROM crm_receivable
          WHERE deleted = 0
            AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
@@ -26,7 +26,7 @@
     <select id="selectProductSalesList"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.product.CrmStatisticsProductSalesRespVO">
         SELECT category.id AS category_id,
-               IFNULL(category.name, '未分类') AS category_name,
+               COALESCE(category.name, '未分类') AS category_name,
                product.id AS product_id,
                product.name AS product_name,
                contract.id AS contract_id,
@@ -39,12 +39,12 @@
                contract_product.product_price,
                contract_product.count AS product_count,
                contract_product.total_price AS product_total_price
-          FROM crm_contract_product AS contract_product
-                INNER JOIN crm_contract AS contract ON contract_product.contract_id = contract.id
-                INNER JOIN crm_product AS product ON contract_product.product_id = product.id
-                LEFT JOIN crm_product_category AS category ON product.category_id = category.id AND category.deleted = 0
-                LEFT JOIN crm_customer AS customer ON contract.customer_id = customer.id AND customer.deleted = 0
-                LEFT JOIN system_users AS owner ON contract.owner_user_id = owner.id AND owner.deleted = 0
+          FROM crm_contract_product contract_product
+                INNER JOIN crm_contract contract ON contract_product.contract_id = contract.id
+                INNER JOIN crm_product product ON contract_product.product_id = product.id
+                LEFT JOIN crm_product_category category ON product.category_id = category.id AND category.deleted = 0
+                LEFT JOIN crm_customer customer ON contract.customer_id = customer.id AND customer.deleted = 0
+                LEFT JOIN system_users owner ON contract.owner_user_id = owner.id AND owner.deleted = 0
          WHERE <include refid="ProductStatisticsWhere"/>
          ORDER BY category.id ASC, product.id ASC, contract.order_date DESC
     </select>
@@ -52,14 +52,14 @@
     <select id="selectProductCategorySummary"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.product.CrmStatisticsProductCategoryRespVO">
         SELECT category.id AS category_id,
-               IFNULL(category.name, '未分类') AS category_name,
+               COALESCE(category.name, '未分类') AS category_name,
                COUNT(DISTINCT contract.id) AS contract_count,
-               IFNULL(SUM(contract_product.count), 0) AS product_count,
-               IFNULL(SUM(contract_product.total_price), 0) AS product_total_price
-          FROM crm_contract_product AS contract_product
-                INNER JOIN crm_contract AS contract ON contract_product.contract_id = contract.id
-                INNER JOIN crm_product AS product ON contract_product.product_id = product.id
-                LEFT JOIN crm_product_category AS category ON product.category_id = category.id AND category.deleted = 0
+               COALESCE(SUM(contract_product.count), 0) AS product_count,
+               COALESCE(SUM(contract_product.total_price), 0) AS product_total_price
+          FROM crm_contract_product contract_product
+                INNER JOIN crm_contract contract ON contract_product.contract_id = contract.id
+                INNER JOIN crm_product product ON contract_product.product_id = product.id
+                LEFT JOIN crm_product_category category ON product.category_id = category.id AND category.deleted = 0
          WHERE <include refid="ProductStatisticsWhere"/>
          GROUP BY category.id, category.name
          ORDER BY product_count DESC, product_total_price DESC
@@ -4,7 +4,7 @@
     <select id="selectContractPriceRank"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
-        SELECT IFNULL(SUM(total_price), 0) AS count, owner_user_id
+        SELECT COALESCE(SUM(total_price), 0) AS count, owner_user_id
         FROM crm_contract
         WHERE deleted = 0
         AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
@@ -18,7 +18,7 @@
     <select id="selectReceivablePriceRank"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
-        SELECT IFNULL(SUM(price), 0) AS count, owner_user_id
+        SELECT COALESCE(SUM(price), 0) AS count, owner_user_id
         FROM crm_receivable
         WHERE deleted = 0
         AND audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
@@ -88,8 +88,8 @@
     <select id="selectFollowCountRank"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
         SELECT COUNT(1) AS count, cc.owner_user_id
-        FROM crm_follow_up_record AS cfur
-        LEFT JOIN crm_contact AS cc ON FIND_IN_SET(cc.id, cfur.contact_ids)
+        FROM crm_follow_up_record cfur
+        LEFT JOIN crm_contact cc ON FIND_IN_SET(cc.id, cfur.contact_ids)
         WHERE cfur.deleted = 0
         AND cc.deleted = 0
         AND cc.owner_user_id in
@@ -103,8 +103,8 @@
     <select id="selectFollowCustomerCountRank"
             resultType="cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.rank.CrmStatisticsRankRespVO">
         SELECT COUNT(DISTINCT cc.id) AS count, cc.owner_user_id
-        FROM crm_follow_up_record AS cfur
-        LEFT JOIN crm_contact AS cc ON FIND_IN_SET(cc.id, cfur.contact_ids)
+        FROM crm_follow_up_record cfur
+        LEFT JOIN crm_contact cc ON FIND_IN_SET(cc.id, cfur.contact_ids)
         WHERE cfur.deleted = 0
         AND cc.deleted = 0
         AND cc.owner_user_id in
@@ -4,7 +4,7 @@
     <select id="getPurchasePrice" resultType="java.math.BigDecimal">
         SELECT
-            (SELECT IFNULL(SUM(total_price), 0)
+            (SELECT COALESCE(SUM(total_price), 0)
              FROM erp_purchase_in
              WHERE in_time >= #{beginTime}
                <if test="endTime != null">
@@ -15,7 +15,7 @@
                </if>
                AND deleted = 0
                AND status = 20) -
-            (SELECT IFNULL(SUM(total_price), 0)
+            (SELECT COALESCE(SUM(total_price), 0)
                 FROM erp_purchase_return
                 WHERE return_time >= #{beginTime}
                 <if test="endTime != null">
@@ -4,7 +4,7 @@
     <select id="getSalePrice" resultType="java.math.BigDecimal">
         SELECT
-            (SELECT IFNULL(SUM(total_price), 0)
+            (SELECT COALESCE(SUM(total_price), 0)
              FROM erp_sale_out
              WHERE out_time >= #{beginTime}
                <if test="endTime != null">
@@ -15,7 +15,7 @@
                </if>
                AND deleted = 0
                AND status = 20) -
-            (SELECT IFNULL(SUM(total_price), 0)
+            (SELECT COALESCE(SUM(total_price), 0)
                 FROM erp_sale_return
                 WHERE return_time >= #{beginTime}
                 <if test="endTime != null">
@@ -56,9 +56,9 @@ public interface ImStatisticsManagerMapper {
     /**
      * 区间内每日新增用户数（按天分组）
      *
-     * @return [{date: "yyyy-MM-dd", count: 123}, ...]
+     * @return [{statDate: "yyyy-MM-dd", count: 123}, ...]
      */
-    @Select("SELECT DATE(create_time) AS date, COUNT(*) AS count FROM system_users " +
+    @Select("SELECT DATE(create_time) AS statDate, COUNT(*) AS count FROM system_users " +
             "WHERE deleted = 0 AND create_time >= #{beginTime} AND create_time < #{endTime} " +
             "GROUP BY DATE(create_time)")
     @ResultMap(CaseInsensitiveResultMap.RESULT_MAP_ID)
@@ -68,7 +68,7 @@ public interface ImStatisticsManagerMapper {
     /**
      * 区间内每日活跃用户数（按天分组、跨私聊+群聊去重）
      */
-    @Select("SELECT day AS date, COUNT(DISTINCT user_id) AS count FROM (" +
+    @Select("SELECT day AS statDate, COUNT(DISTINCT user_id) AS count FROM (" +
             "  SELECT DATE(send_time) AS day, sender_id AS user_id FROM im_private_message " +
             "  WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION +
             "  AND send_time >= #{beginTime} AND send_time < #{endTime}" +
@@ -98,23 +98,25 @@ public interface ImStatisticsManagerMapper {
     /**
      * 群规模分布（按群成员数分桶）
      *
-     * @return [{range: "1-9 人", count: 123}, ...]
+     * @return [{sizeRange: "1-9 人", count: 123}, ...]
      */
-    @Select("SELECT " +
-            "  CASE " +
-            "    WHEN cnt < 10 THEN '1-9 人' " +
-            "    WHEN cnt < 50 THEN '10-49 人' " +
-            "    WHEN cnt < 200 THEN '50-199 人' " +
-            "    ELSE '200+ 人' " +
-            "  END AS `range`, COUNT(*) AS count " +
-            "FROM (" +
-            "  SELECT g.id, COUNT(m.id) AS cnt " +
-            "  FROM im_group g " +
-            "  LEFT JOIN im_group_member m ON m.group_id = g.id AND m.status = 0 AND m.deleted = 0 " +
-            "  WHERE g.deleted = 0 AND g.status = 0 " +
-            "  GROUP BY g.id" +
-            ") t " +
-            "GROUP BY `range`")
+    @Select("SELECT sizeRange, COUNT(*) AS count FROM (" +
+            "  SELECT " +
+            "    CASE " +
+            "      WHEN cnt < 10 THEN '1-9 人' " +
+            "      WHEN cnt < 50 THEN '10-49 人' " +
+            "      WHEN cnt < 200 THEN '50-199 人' " +
+            "      ELSE '200+ 人' " +
+            "    END AS sizeRange " +
+            "  FROM (" +
+            "    SELECT g.id, COUNT(m.id) AS cnt " +
+            "    FROM im_group g " +
+            "    LEFT JOIN im_group_member m ON m.group_id = g.id AND m.status = 0 AND m.deleted = 0 " +
+            "    WHERE g.deleted = 0 AND g.status = 0 " +
+            "    GROUP BY g.id" +
+            "  ) t0" +
+            ") t1 " +
+            "GROUP BY sizeRange")
     @ResultMap(CaseInsensitiveResultMap.RESULT_MAP_ID)
     List<Map<String, Object>> selectGroupSizeDistribution();
@@ -141,7 +143,7 @@ public interface ImStatisticsManagerMapper {
     /**
      * 区间内每日私聊消息数（按天分组）
      */
-    @Select("SELECT DATE(send_time) AS date, COUNT(*) AS count FROM im_private_message " +
+    @Select("SELECT DATE(send_time) AS statDate, COUNT(*) AS count FROM im_private_message " +
             "WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION +
             " AND send_time >= #{beginTime} AND send_time < #{endTime} " +
             "GROUP BY DATE(send_time)")
@@ -152,7 +154,7 @@ public interface ImStatisticsManagerMapper {
     /**
      * 区间内每日群聊消息数（按天分组）
      */
-    @Select("SELECT DATE(send_time) AS date, COUNT(*) AS count FROM im_group_message " +
+    @Select("SELECT DATE(send_time) AS statDate, COUNT(*) AS count FROM im_group_message " +
             "WHERE deleted = 0 AND " + NORMAL_MESSAGE_CONDITION +
             " AND send_time >= #{beginTime} AND send_time < #{endTime} " +
             "GROUP BY DATE(send_time)")
@@ -70,7 +70,7 @@ public class ImStatisticsManagerServiceImpl implements ImStatisticsManagerServic
     public Map<String, Long> getGroupSizeCountMap() {
         List<Map<String, Object>> rows = statisticsMapper.selectGroupSizeDistribution();
         return convertMap(rows,
-                row -> (String) row.get("range"),
+                row -> (String) row.get("sizeRange"),
                 row -> Convert.toLong(row.get("count")));
     }
@@ -115,11 +115,11 @@ public class ImStatisticsManagerServiceImpl implements ImStatisticsManagerServic
     }
     /**
-     * 把 [{date, count}] 行映射为 {LocalDateTime -> Long}；
+     * 把 [{statDate, count}] 行映射为 {LocalDateTime -> Long}；
      */
     private static Map<LocalDateTime, Long> toDailyCountMap(List<Map<String, Object>> rows) {
         return convertMap(rows,
-                row -> Convert.convert(LocalDate.class, row.get("date")).atStartOfDay(),
+                row -> Convert.convert(LocalDate.class, row.get("statDate")).atStartOfDay(),
                 row -> Convert.toLong(row.get("count")));
     }
@@ -164,7 +164,7 @@ public class ImStatisticsManagerMapperTest extends BaseDbUnitTest {
         // 断言：分桶包含「1-9 人」和「10-49 人」
         Map<Object, Long> byRange = dist.stream().collect(java.util.stream.Collectors.toMap(
-                m -> m.get("range"), m -> ((Number) m.get("count")).longValue()));
+                m -> m.get("sizeRange"), m -> ((Number) m.get("count")).longValue()));
         assertEquals(1L, byRange.get("1-9 人"));
         assertEquals(1L, byRange.get("10-49 人"));
     }
@@ -76,15 +76,15 @@ public class ImStatisticsManagerServiceImplTest extends BaseMockitoUnitTest {
     @Test
     public void testGetNewUserDailyCountMap_dateConvert() {
-        // 准备：date 字段以 SQL Date / String 混入，count 混入多种 Number
+        // 准备：statDate 字段以 SQL Date / String 混入，count 混入多种 Number
         when(statisticsMapper.selectNewUserDailyCount(eq(BEGIN), eq(END))).thenReturn(Arrays.asList(
-                row("date", java.sql.Date.valueOf("2026-01-10"), "count", BigInteger.valueOf(5)),
-                row("date", "2026-01-11", "count", 8)));
+                row("statDate", java.sql.Date.valueOf("2026-01-10"), "count", BigInteger.valueOf(5)),
+                row("statDate", "2026-01-11", "count", 8)));
         // 调用
         Map<LocalDateTime, Long> result = service.getNewUserDailyCountMap(BEGIN, END);
-        // 断言：date → LocalDateTime 起始零点
+        // 断言：statDate → LocalDateTime 起始零点
         assertEquals(2, result.size());
         assertEquals(5L, result.get(LocalDate.of(2026, 1, 10).atStartOfDay()));
         assertEquals(8L, result.get(LocalDate.of(2026, 1, 11).atStartOfDay()));
@@ -93,7 +93,7 @@ public class ImStatisticsManagerServiceImplTest extends BaseMockitoUnitTest {
     @Test
     public void testGetActiveUserDailyCountMap_dateConvert() {
         when(statisticsMapper.selectActiveUserDailyCount(any(), any())).thenReturn(Arrays.asList(
-                row("date", "2026-01-10", "count", 3L)));
+                row("statDate", "2026-01-10", "count", 3L)));
         Map<LocalDateTime, Long> result = service.getActiveUserDailyCountMap(BEGIN, END);
         assertEquals(3L, result.get(LocalDate.of(2026, 1, 10).atStartOfDay()));
@@ -102,7 +102,7 @@ public class ImStatisticsManagerServiceImplTest extends BaseMockitoUnitTest {
     @Test
     public void testGetPrivateMessageDailyCountMap_dateConvert() {
         when(statisticsMapper.selectPrivateMessageDailyCount(any(), any())).thenReturn(Arrays.asList(
-                row("date", "2026-01-10", "count", 7L)));
+                row("statDate", "2026-01-10", "count", 7L)));
         assertEquals(7L, service.getPrivateMessageDailyCountMap(BEGIN, END)
                 .get(LocalDate.of(2026, 1, 10).atStartOfDay()));
     }
@@ -110,7 +110,7 @@ public class ImStatisticsManagerServiceImplTest extends BaseMockitoUnitTest {
     @Test
     public void testGetGroupMessageDailyCountMap_dateConvert() {
         when(statisticsMapper.selectGroupMessageDailyCount(any(), any())).thenReturn(Arrays.asList(
-                row("date", "2026-01-10", "count", 9L)));
+                row("statDate", "2026-01-10", "count", 9L)));
         assertEquals(9L, service.getGroupMessageDailyCountMap(BEGIN, END)
                 .get(LocalDate.of(2026, 1, 10).atStartOfDay()));
     }
@@ -120,8 +120,8 @@ public class ImStatisticsManagerServiceImplTest extends BaseMockitoUnitTest {
     @Test
     public void testGetGroupSizeCountMap() {
         when(statisticsMapper.selectGroupSizeDistribution()).thenReturn(Arrays.asList(
-                row("range", "1-9 人", "count", BigInteger.valueOf(3)),
-                row("range", "10-49 人", "count", 2)));
+                row("sizeRange", "1-9 人", "count", BigInteger.valueOf(3)),
+                row("sizeRange", "10-49 人", "count", 2)));
         Map<String, Long> result = service.getGroupSizeCountMap();
         assertEquals(3L, result.get("1-9 人"));
@@ -50,9 +50,14 @@
         </if>
     </select>
-    <select id="selectListByCreateTimeBetween"
-            resultType="cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberRegisterCountRespVO">
-        SELECT CAST(create_time AS DATE) AS date,
+    <resultMap id="MemberRegisterCountRespVOMap"
+               type="cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberRegisterCountRespVO">
+        <result column="statDate" property="date"/>
+        <result column="count" property="count"/>
+    </resultMap>
+
+    <select id="selectListByCreateTimeBetween" resultMap="MemberRegisterCountRespVOMap">
+        SELECT CAST(create_time AS DATE) AS statDate,
                count(1)                             AS count
         FROM member_user
         WHERE create_time BETWEEN #{beginTime} AND #{endTime}
@@ -60,8 +65,8 @@
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
-        GROUP BY date
-        ORDER BY date
+        GROUP BY CAST(create_time AS DATE)
+        ORDER BY statDate
     </select>
 </mapper>
@@ -6,14 +6,14 @@
             resultType="cn.iocoder.yudao.module.statistics.service.member.bo.MemberAreaStatisticsRespBO">
         SELECT receiver_area_id                                AS areaId,
                (SELECT COUNT(DISTINCT s.user_id)
-                FROM trade_order AS s
+                FROM trade_order s
                 WHERE s.receiver_area_id = m.receiver_area_id
                 <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()}
                 </if>
                 ) AS orderCreateUserCount,
                (SELECT COUNT(DISTINCT s.user_id)
-                FROM trade_order AS s
+                FROM trade_order s
                 WHERE s.receiver_area_id = m.receiver_area_id
                   AND s.pay_status = TRUE
                   AND s.deleted = 0
@@ -22,7 +22,7 @@
                 </if>
                 ) AS orderPayUserCount,
                (SELECT SUM(s.pay_price)
-                FROM trade_order AS s
+                FROM trade_order s
                 WHERE s.receiver_area_id = m.receiver_area_id
                   AND s.pay_status = TRUE
                   AND s.deleted = 0
@@ -82,7 +82,7 @@
     <select id="selectSummaryPriceByPayTimeBetween" resultType="java.lang.Integer">
         SELECT SUM(pay_price)
-        FROM trade_order AS s
+        FROM trade_order s
         WHERE s.pay_status = TRUE
           AND deleted = 0
           AND create_time BETWEEN #{beginTime} AND #{endTime}
@@ -91,11 +91,17 @@
         </if>
     </select>
-    <select id="selectListByPayTimeBetweenAndGroupByDay"
-            resultType="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderTrendRespVO">
-        SELECT CAST(pay_time AS DATE) AS date,
-               COUNT(1)                          AS orderPayCount,
-               SUM(pay_price)                    AS orderPayPrice
+    <resultMap id="TradeOrderTrendRespVOMap"
+               type="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderTrendRespVO">
+        <result column="statDate" property="date"/>
+        <result column="order_pay_count" property="orderPayCount"/>
+        <result column="order_pay_price" property="orderPayPrice"/>
+    </resultMap>
+
+    <select id="selectListByPayTimeBetweenAndGroupByDay" resultMap="TradeOrderTrendRespVOMap">
+        SELECT CAST(pay_time AS DATE) AS statDate,
+               COUNT(1)                          AS order_pay_count,
+               SUM(pay_price)                    AS order_pay_price
         FROM trade_order
         WHERE pay_status = TRUE
           AND create_time BETWEEN #{beginTime} AND #{endTime}
@@ -103,14 +109,13 @@
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
-        GROUP BY date
-        ORDER BY date
+        GROUP BY CAST(pay_time AS DATE)
+        ORDER BY statDate
     </select>
-    <select id="selectListByPayTimeBetweenAndGroupByMonth"
-            resultType="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderTrendRespVO">
+    <select id="selectListByPayTimeBetweenAndGroupByMonth" resultMap="TradeOrderTrendRespVOMap">
         SELECT CONCAT(EXTRACT(YEAR FROM pay_time), '-',
-                      LPAD(CONCAT(EXTRACT(MONTH FROM pay_time)), 2, '0')) AS date,
+                      LPAD(CONCAT(EXTRACT(MONTH FROM pay_time)), 2, '0')) AS statDate,
                COUNT(1)                       AS order_pay_count,
                SUM(pay_price)                 AS order_pay_price
         FROM trade_order
@@ -120,8 +125,9 @@
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
-        GROUP BY date
-        ORDER BY date
+        GROUP BY CONCAT(EXTRACT(YEAR FROM pay_time), '-',
+                        LPAD(CONCAT(EXTRACT(MONTH FROM pay_time)), 2, '0'))
+        ORDER BY statDate
     </select>
     <select id="selectCountByStatusAndDeliveryType" resultType="java.lang.Long">
@@ -80,7 +80,7 @@ public interface BrokerageRecordMapper extends BaseMapperX&lt;BrokerageRecordDO&gt; {
     @Select("SELECT SUM(price) FROM trade_brokerage_record " +
             "WHERE user_id = #{userId} AND biz_type = #{bizType} AND status = #{status} " +
-            "AND unfreeze_time BETWEEN #{beginTime} AND #{endTime} AND deleted = FALSE")
+            "AND unfreeze_time BETWEEN #{beginTime} AND #{endTime} AND deleted = 0")
     Integer selectSummaryPriceByUserIdAndBizTypeAndCreateTimeBetween(@Param("userId") Long userId,
                                                                      @Param("bizType") Integer bizType,
                                                                      @Param("status") Integer status,
@@ -89,7 +89,7 @@ public interface BrokerageRecordMapper extends BaseMapperX&lt;BrokerageRecordDO&gt; {
     // TODO @芋艿：收敛掉 @Select 注解操作，统一成 MyBatis-Plus 的方式，或者 xml
     @Select("SELECT user_id AS id, SUM(price) AS brokeragePrice FROM trade_brokerage_record " +
-            "WHERE biz_type = #{bizType} AND status = #{status} AND deleted = FALSE " +
+            "WHERE biz_type = #{bizType} AND status = #{status} AND deleted = 0 " +
             "AND unfreeze_time BETWEEN #{beginTime} AND #{endTime} " +
             "GROUP BY user_id " +
             "ORDER BY brokeragePrice DESC")
@@ -100,7 +100,7 @@ public interface BrokerageRecordMapper extends BaseMapperX&lt;BrokerageRecordDO&gt; {
                                                                                  @Param("endTime") LocalDateTime endTime);
     @Select("SELECT COUNT(1) FROM trade_brokerage_record " +
-            "WHERE biz_type = #{bizType} AND status = #{status} AND deleted = FALSE " +
+            "WHERE biz_type = #{bizType} AND status = #{status} AND deleted = 0 " +
             "AND unfreeze_time BETWEEN #{beginTime} AND #{endTime} " +
             "GROUP BY user_id HAVING SUM(price) > #{brokeragePrice}")
     Integer selectCountByPriceGt(@Param("brokeragePrice") Integer brokeragePrice,
@@ -128,7 +128,7 @@ public interface BrokerageUserMapper extends BaseMapperX&lt;BrokerageUserDO&gt; {
     }
     @Select("SELECT bind_user_id AS id, COUNT(1) AS brokerageUserCount FROM trade_brokerage_user " +
-            "WHERE bind_user_id IS NOT NULL AND deleted = FALSE " +
+            "WHERE bind_user_id IS NOT NULL AND deleted = 0 " +
             "AND bind_user_time BETWEEN #{beginTime} AND #{endTime} " +
             "GROUP BY bind_user_id " +
             "ORDER BY brokerageUserCount DESC")
@@ -22,7 +22,7 @@
         WHERE r.user_id = bu.id AND biz_type = #{bizType} AND r.status = #{status} AND r.deleted = 0) AS brokerageOrderCount,
         (SELECT COUNT(1) FROM trade_brokerage_user c
         WHERE c.bind_user_id = bu.id AND c.deleted = 0) AS brokerageUserCount
-        FROM trade_brokerage_user AS bu
+        FROM trade_brokerage_user bu
         <where>
             bu.deleted = 0
             <if test="ids != null and ids.size() > 0">
@@ -59,7 +59,7 @@ public interface MesHomeStatisticsMapper {
      *
      * @param beginTime >= 开始时间
      * @param endTime   < 结束时间
-     * @return [{ "date": "2026-04-05", "quantity": 1234, "qualifiedQuantity": 1200, "unqualifiedQuantity": 34 }, ...]
+     * @return [{ "statDate": "2026-04-05", "quantity": 1234, "qualifiedQuantity": 1200, "unqualifiedQuantity": 34 }, ...]
      */
     List<Map<String, Object>> selectDailyFeedbackTrend(@Param("beginTime") LocalDateTime beginTime,
                                                        @Param("endTime") LocalDateTime endTime);
@@ -62,9 +62,9 @@ public interface MesProTaskMapper extends BaseMapperX&lt;MesProTaskDO&gt; {
                                         BigDecimal incrUnqualifyQuantity) {
         update(null, new LambdaUpdateWrapper<MesProTaskDO>()
                 .eq(MesProTaskDO::getId, id)
-                .setSql("produced_quantity = IFNULL(produced_quantity, 0) + " + incrProducedQuantity)
-                .setSql("qualify_quantity = IFNULL(qualify_quantity, 0) + " + incrQualifyQuantity)
-                .setSql("unqualify_quantity = IFNULL(unqualify_quantity, 0) + " + incrUnqualifyQuantity));
+                .setIncrBy(MesProTaskDO::getProducedQuantity, incrProducedQuantity)
+                .setIncrBy(MesProTaskDO::getQualifyQuantity, incrQualifyQuantity)
+                .setIncrBy(MesProTaskDO::getUnqualifyQuantity, incrUnqualifyQuantity));
     }
 }
@@ -38,7 +38,7 @@ public interface MesProWorkOrderMapper extends BaseMapperX&lt;MesProWorkOrderDO&gt; {
     default void updateProducedQuantity(Long id, BigDecimal incrQuantityProduced) {
         update(null, new LambdaUpdateWrapper<MesProWorkOrderDO>()
                 .eq(MesProWorkOrderDO::getId, id)
-                .setSql("quantity_produced = IFNULL(quantity_produced, 0) + " + incrQuantityProduced));
+                .setIncrBy(MesProWorkOrderDO::getQuantityProduced, incrQuantityProduced));
     }
     default Long selectCountByVendorId(Long vendorId) {
@@ -121,7 +121,7 @@ public class MesHomeStatisticsServiceImpl implements MesHomeStatisticsService {
         List<Map<String, Object>> dbData = homeStatisticsMapper.selectDailyFeedbackTrend(beginTime, endTime);
         Map<String, Map<String, Object>> dateMap = new LinkedHashMap<>();
         for (Map<String, Object> row : dbData) {
-            dateMap.put((String) row.get("date"), row);
+            dateMap.put((String) row.get("statDate"), row);
         }
         // 补全所有日期（无数据的日期填 0）
@@ -12,9 +12,9 @@
     <!-- 统计报工产量合计 -->
     <select id="selectFeedbackSummary" resultType="cn.iocoder.yudao.framework.mybatis.core.util.CaseInsensitiveResultMap">
-        SELECT IFNULL(SUM(feedback_quantity), 0)     AS feedbackQuantity,
-               IFNULL(SUM(qualified_quantity), 0)    AS qualifiedQuantity,
-               IFNULL(SUM(unqualified_quantity), 0)  AS unqualifiedQuantity
+        SELECT COALESCE(SUM(feedback_quantity), 0)     AS feedbackQuantity,
+               COALESCE(SUM(qualified_quantity), 0)    AS qualifiedQuantity,
+               COALESCE(SUM(unqualified_quantity), 0)  AS unqualifiedQuantity
         FROM mes_pro_feedback
         WHERE deleted = 0
           AND status = ${@cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum@FINISHED.status}
@@ -52,10 +52,10 @@
     <!-- 按天聚合报工产量 -->
     <select id="selectDailyFeedbackTrend" resultType="cn.iocoder.yudao.framework.mybatis.core.util.CaseInsensitiveResultMap">
-        SELECT DATE_FORMAT(feedback_time, '%Y-%m-%d')    AS date,
-               IFNULL(SUM(feedback_quantity), 0)         AS quantity,
-               IFNULL(SUM(qualified_quantity), 0)        AS qualifiedQuantity,
-               IFNULL(SUM(unqualified_quantity), 0)      AS unqualifiedQuantity
+        SELECT DATE_FORMAT(feedback_time, '%Y-%m-%d')    AS statDate,
+               COALESCE(SUM(feedback_quantity), 0)         AS quantity,
+               COALESCE(SUM(qualified_quantity), 0)        AS qualifiedQuantity,
+               COALESCE(SUM(unqualified_quantity), 0)      AS unqualifiedQuantity
         FROM mes_pro_feedback
         WHERE deleted = 0
           AND status = ${@cn.iocoder.yudao.module.mes.enums.pro.MesProFeedbackStatusEnum@FINISHED.status}
@@ -64,7 +64,7 @@
               AND feedback_time &lt; #{endTime}
           </if>
         GROUP BY DATE_FORMAT(feedback_time, '%Y-%m-%d')
-        ORDER BY date
+        ORDER BY statDate
     </select>
 </mapper>
@@ -10,6 +10,7 @@
         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(待检)
+        注意：各分支无值的 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">
         SELECT * FROM (
@@ -24,10 +25,10 @@
                 l.item_id AS itemId,
                 l.arrival_quantity AS quantity,
                 n.vendor_id AS vendorId,
-                NULL AS workOrderId,
-                NULL AS workstationId,
-                NULL AS taskId,
-                NULL AS clientId
+                CASE WHEN 1 = 0 THEN n.id END AS workOrderId,
+                CASE WHEN 1 = 0 THEN n.id END AS workstationId,
+                CASE WHEN 1 = 0 THEN n.id END AS taskId,
+                CASE WHEN 1 = 0 THEN n.id END AS clientId
             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}
@@ -49,10 +50,10 @@
                 rl.item_id AS itemId,
                 rl.quantity AS quantity,
                 r.vendor_id AS vendorId,
-                NULL AS workOrderId,
-                NULL AS workstationId,
-                NULL AS taskId,
-                NULL AS clientId
+                CASE WHEN 1 = 0 THEN r.id END AS workOrderId,
+                CASE WHEN 1 = 0 THEN r.id END AS workstationId,
+                CASE WHEN 1 = 0 THEN r.id END AS taskId,
+                CASE WHEN 1 = 0 THEN r.id END AS clientId
             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}
@@ -73,11 +74,11 @@
                 ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@IPQC.type} AS qcType,
                 ppl.item_id AS itemId,
                 ppl.quantity AS quantity,
-                NULL AS vendorId,
+                CASE WHEN 1 = 0 THEN pf.id END AS vendorId,
                 pp.work_order_id AS workOrderId,
                 pp.workstation_id AS workstationId,
                 pp.task_id AS taskId,
-                NULL AS clientId
+                CASE WHEN 1 = 0 THEN pf.id END AS clientId
             FROM mes_wm_product_produce_line ppl
                 JOIN mes_wm_product_produce pp ON ppl.produce_id = pp.id
                 JOIN mes_pro_feedback pf ON pp.feedback_id = pf.id
@@ -98,10 +99,10 @@
                 ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@OQC.type} AS qcType,
                 sl.item_id AS itemId,
                 sl.quantity AS quantity,
-                NULL AS vendorId,
-                NULL AS workOrderId,
-                NULL AS workstationId,
-                NULL AS taskId,
+                CASE WHEN 1 = 0 THEN s.id END AS vendorId,
+                CASE WHEN 1 = 0 THEN s.id END AS workOrderId,
+                CASE WHEN 1 = 0 THEN s.id END AS workstationId,
+                CASE WHEN 1 = 0 THEN s.id END AS taskId,
                 s.client_id AS clientId
             FROM mes_wm_product_sales s
                 JOIN mes_wm_product_sales_line sl ON s.id = sl.sales_id
@@ -123,11 +124,11 @@
                 ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@RQC.type} AS qcType,
                 ril.item_id AS itemId,
                 ril.quantity AS quantity,
-                NULL AS vendorId,
+                CASE WHEN 1 = 0 THEN ri.id END AS vendorId,
                 ri.work_order_id AS workOrderId,
                 ri.workstation_id AS workstationId,
-                NULL AS taskId,
-                NULL AS clientId
+                CASE WHEN 1 = 0 THEN ri.id END AS taskId,
+                CASE WHEN 1 = 0 THEN ri.id END AS clientId
             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}
@@ -149,10 +150,10 @@
                 ${@cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum@RQC.type} AS qcType,
                 rl.item_id AS itemId,
                 rl.quantity AS quantity,
-                NULL AS vendorId,
-                NULL AS workOrderId,
-                NULL AS workstationId,
-                NULL AS taskId,
+                CASE WHEN 1 = 0 THEN r.id END AS vendorId,
+                CASE WHEN 1 = 0 THEN r.id END AS workOrderId,
+                CASE WHEN 1 = 0 THEN r.id END AS workstationId,
+                CASE WHEN 1 = 0 THEN r.id END AS taskId,
                 r.client_id AS clientId
             FROM mes_wm_return_sales r
                 JOIN mes_wm_return_sales_line rl ON r.id = rl.return_id
@@ -20,5 +20,6 @@ DELETE FROM &quot;mes_wm_item_receipt_detail&quot;;
 DELETE FROM "mes_wm_batch";
 DELETE FROM "mes_wm_material_stock";
 DELETE FROM "mes_pro_task";
+DELETE FROM "mes_pro_work_order";
 DELETE FROM "mes_pro_route_process";
 DELETE FROM "mes_qc_indicator_result";
@@ -756,9 +756,9 @@ CREATE TABLE IF NOT EXISTS &quot;mes_pro_task&quot; (
     "process_id" bigint DEFAULT NULL,
     "item_id" bigint DEFAULT NULL,
     "quantity" decimal(14,2) DEFAULT NULL,
-    "produced_quantity" decimal(14,2) DEFAULT NULL,
-    "qualify_quantity" decimal(14,2) DEFAULT NULL,
-    "unqualify_quantity" decimal(14,2) DEFAULT NULL,
+    "produced_quantity" decimal(14,2) NOT NULL DEFAULT 0,
+    "qualify_quantity" decimal(14,2) NOT NULL DEFAULT 0,
+    "unqualify_quantity" decimal(14,2) NOT NULL DEFAULT 0,
     "changed_quantity" decimal(14,2) DEFAULT NULL,
     "client_id" bigint DEFAULT NULL,
     "start_time" timestamp DEFAULT NULL,
@@ -779,6 +779,39 @@ CREATE TABLE IF NOT EXISTS &quot;mes_pro_task&quot; (
 );
 -- ----------------------------
+-- MES 生产工单
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS "mes_pro_work_order" (
+    "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+    "code" varchar(64) DEFAULT NULL,
+    "name" varchar(255) DEFAULT NULL,
+    "type" tinyint DEFAULT NULL,
+    "order_source_type" tinyint DEFAULT NULL,
+    "order_source_code" varchar(64) DEFAULT NULL,
+    "product_id" bigint DEFAULT NULL,
+    "quantity" decimal(14,2) NOT NULL DEFAULT 0,
+    "quantity_produced" decimal(14,2) NOT NULL DEFAULT 0,
+    "quantity_changed" decimal(14,2) NOT NULL DEFAULT 0,
+    "quantity_scheduled" decimal(14,2) NOT NULL DEFAULT 0,
+    "client_id" bigint DEFAULT NULL,
+    "vendor_id" bigint DEFAULT NULL,
+    "batch_code" varchar(64) DEFAULT NULL,
+    "request_date" timestamp DEFAULT NULL,
+    "parent_id" bigint NOT NULL DEFAULT 0,
+    "finish_date" timestamp DEFAULT NULL,
+    "cancel_date" timestamp DEFAULT NULL,
+    "status" tinyint NOT NULL DEFAULT 0,
+    "remark" varchar(500) DEFAULT '',
+    "creator" varchar(64) DEFAULT '',
+    "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updater" varchar(64) DEFAULT '',
+    "update_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "deleted" bit NOT NULL DEFAULT FALSE,
+    "tenant_id" bigint NOT NULL DEFAULT 0,
+    PRIMARY KEY ("id")
+);
+
+-- ----------------------------
 -- MES 工艺路线工序
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS "mes_pro_route_process" (
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.jdbc.JdbcExceptionUtils;
 import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
 import cn.iocoder.yudao.module.mp.controller.admin.account.vo.MpAccountCreateReqVO;
 import cn.iocoder.yudao.module.mp.controller.admin.account.vo.MpAccountPageReqVO;
@@ -73,7 +74,7 @@ public class MpAccountServiceImpl implements MpAccountService {
             try {
                 accounts = mpAccountMapper.selectList();
             } catch (Throwable ex) {
-                if (!ex.getMessage().contains("doesn't exist")) {
+                if (!JdbcExceptionUtils.isTableNotExists(ex)) {
                     throw ex;
                 }
                 log.error("[微信公众号 yudao-module-mp - 表结构未导入][参考 https://doc.iocoder.cn/mp/build/ 开启]");
@@ -40,7 +40,7 @@ public interface OaAnnouncementMapper extends BaseMapperX&lt;OaAnnouncementDO&gt; {
                 .selectAll(OaAnnouncementDO.class)
                 .innerJoin(OaAnnouncementReceiverDO.class, OaAnnouncementReceiverDO::getAnnouncementId,OaAnnouncementDO::getId)
                 .eq(OaAnnouncementReceiverDO::getReceiverUserId, receiverUserId)
-                .eq(OaAnnouncementReceiverDO::getDeleted, false)
+                .eq(OaAnnouncementReceiverDO::getDeleted, 0)
                 .eqIfPresent(OaAnnouncementReceiverDO::getReadStatus, pageReqVO.getReadStatus())
                 .likeIfPresent(OaAnnouncementDO::getTitle, pageReqVO.getTitle())
                 .eqIfPresent(OaAnnouncementDO::getType, pageReqVO.getType())
@@ -28,7 +28,7 @@ public interface OaContactShareMapper extends BaseMapperX&lt;OaContactShareDO&gt; {
         MPJLambdaWrapperX<OaContactShareDO> query = new MPJLambdaWrapperX<>();
         query.selectAll(OaContactShareDO.class)
                 .innerJoin(OaContactDO.class, OaContactDO::getId, OaContactShareDO::getContactId)
-                .eq(OaContactDO::getDeleted, false)
+                .eq(OaContactDO::getDeleted, 0)
                 .eq(OaContactShareDO::getCreator, userId.toString())
                 .ne(OaContactShareDO::getUserId, userId)
                 .in(OaContactShareDO::getContactId, contactIds)
@@ -439,6 +439,28 @@ public class OaAnnouncementServiceImplTest extends BaseDbUnitTest {
     }
     @Test
+    public void testGetReceivedAnnouncementPage_excludeDeletedReceiver() {
+        // mock 数据：同一用户的两条接收关系，其中一条被逻辑删除
+        Long userId = randomLongId();
+        OaAnnouncementDO keptAnnouncement = buildAnnouncementDO(randomLongId()).setTitle("保留的公告");
+        announcementMapper.insert(keptAnnouncement);
+        announcementReceiverMapper.insert(buildReceiverDO(keptAnnouncement.getId(), userId, false));
+        OaAnnouncementDO removedAnnouncement = buildAnnouncementDO(randomLongId()).setTitle("已移除的公告");
+        announcementMapper.insert(removedAnnouncement);
+        OaAnnouncementReceiverDO removedReceiver = buildReceiverDO(removedAnnouncement.getId(), userId, true);
+        announcementReceiverMapper.insert(removedReceiver);
+        announcementReceiverMapper.deleteById(removedReceiver.getId());
+
+        // 调用
+        PageResult<OaAnnouncementDO> result = announcementService.getReceivedAnnouncementPage(
+                new OaAnnouncementPageReqVO(), userId);
+
+        // 断言：接收关系 deleted = 0 的条件以整数绑定后，仍只返回未删除的接收关系
+        assertEquals(Collections.singletonList(keptAnnouncement.getId()),
+                convertList(result.getList(), OaAnnouncementDO::getId));
+    }
+
+    @Test
     public void testUpdateAnnouncement_preserveCreateTime() {
         // mock 数据
         Long userId = randomLongId();
@@ -30,7 +30,7 @@ public interface WmsHomeStatisticsMapper {
      * @param beginTime >= 开始时间
      * @param endTime < 结束时间
      * @param warehouseId 仓库编号
-     * @return [{ "date": "2026-05-14", "orderType": 1, "count": 5 }, ...]
+     * @return [{ "statDate": "2026-05-14", "orderType": 1, "count": 5 }, ...]
      */
     List<Map<String, Object>> selectDailyOrderTrend(@Param("beginTime") LocalDateTime beginTime,
                                                     @Param("endTime") LocalDateTime endTime,
@@ -68,7 +68,7 @@ public class WmsHomeStatisticsServiceImpl implements WmsHomeStatisticsService {
         List<Map<String, Object>> dbData = homeStatisticsMapper.selectDailyOrderTrend(beginTime, endTime, warehouseId);
         Map<String, Map<Integer, Long>> dateMap = new LinkedHashMap<>();
         for (Map<String, Object> row : dbData) {
-            String date = MapUtil.getStr(row, "date");
+            String date = MapUtil.getStr(row, "statDate");
             Integer orderType = MapUtil.getInt(row, "orderType");
             Long count = MapUtil.getLong(row, "count", 0L);
             dateMap.computeIfAbsent(date, key -> new HashMap<>()).put(orderType, count);
@@ -52,9 +52,9 @@
     <!-- 按天聚合单据数量 -->
     <select id="selectDailyOrderTrend" resultType="cn.iocoder.yudao.framework.mybatis.core.util.CaseInsensitiveResultMap">
-        SELECT date, orderType, SUM(count) AS count
+        SELECT statDate, orderType, SUM(count) AS count
         FROM (
-            SELECT DATE_FORMAT(order_time, '%Y-%m-%d') AS date,
+            SELECT DATE_FORMAT(order_time, '%Y-%m-%d') AS statDate,
                    ${@cn.iocoder.yudao.module.wms.enums.order.WmsOrderTypeEnum@RECEIPT.type} AS orderType,
                    COUNT(*) AS count
             FROM wms_receipt_order
@@ -66,7 +66,7 @@
               </if>
             GROUP BY DATE_FORMAT(order_time, '%Y-%m-%d')
             UNION ALL
-            SELECT DATE_FORMAT(order_time, '%Y-%m-%d') AS date,
+            SELECT DATE_FORMAT(order_time, '%Y-%m-%d') AS statDate,
                    ${@cn.iocoder.yudao.module.wms.enums.order.WmsOrderTypeEnum@SHIPMENT.type} AS orderType,
                    COUNT(*) AS count
             FROM wms_shipment_order
@@ -78,7 +78,7 @@
               </if>
             GROUP BY DATE_FORMAT(order_time, '%Y-%m-%d')
             UNION ALL
-            SELECT DATE_FORMAT(order_time, '%Y-%m-%d') AS date,
+            SELECT DATE_FORMAT(order_time, '%Y-%m-%d') AS statDate,
                    ${@cn.iocoder.yudao.module.wms.enums.order.WmsOrderTypeEnum@MOVEMENT.type} AS orderType,
                    COUNT(*) AS count
             FROM wms_movement_order
@@ -90,7 +90,7 @@
               </if>
             GROUP BY DATE_FORMAT(order_time, '%Y-%m-%d')
             UNION ALL
-            SELECT DATE_FORMAT(order_time, '%Y-%m-%d') AS date,
+            SELECT DATE_FORMAT(order_time, '%Y-%m-%d') AS statDate,
                    ${@cn.iocoder.yudao.module.wms.enums.order.WmsOrderTypeEnum@CHECK.type} AS orderType,
                    COUNT(*) AS count
             FROM wms_check_order
@@ -102,13 +102,13 @@
               </if>
             GROUP BY DATE_FORMAT(order_time, '%Y-%m-%d')
         ) t
-        GROUP BY date, orderType
-        ORDER BY date, orderType
+        GROUP BY statDate, orderType
+        ORDER BY statDate, orderType
     </select>
     <!-- 统计库存总数量 -->
     <select id="selectInventoryTotalQuantity" resultType="java.math.BigDecimal">
-        SELECT IFNULL(SUM(quantity), 0)
+        SELECT COALESCE(SUM(quantity), 0)
         FROM wms_inventory
         WHERE deleted = 0
           <if test="warehouseId != null">
@@ -120,7 +120,7 @@
     <select id="selectInventoryItemRank" resultType="cn.iocoder.yudao.framework.mybatis.core.util.CaseInsensitiveResultMap">
         SELECT item.id AS id,
                item.name AS name,
-               IFNULL(SUM(inventory.quantity), 0) AS quantity
+               COALESCE(SUM(inventory.quantity), 0) AS quantity
         FROM wms_inventory inventory
                  INNER JOIN wms_item_sku sku ON sku.id = inventory.sku_id AND sku.deleted = 0
                  INNER JOIN wms_item item ON item.id = sku.item_id AND item.deleted = 0
@@ -138,7 +138,7 @@
     <select id="selectInventoryWarehouseRank" resultType="cn.iocoder.yudao.framework.mybatis.core.util.CaseInsensitiveResultMap">
         SELECT warehouse.id AS id,
                warehouse.name AS name,
-               IFNULL(SUM(inventory.quantity), 0) AS quantity
+               COALESCE(SUM(inventory.quantity), 0) AS quantity
         FROM wms_inventory inventory
                  INNER JOIN wms_warehouse warehouse ON warehouse.id = inventory.warehouse_id AND warehouse.deleted = 0
         WHERE inventory.deleted = 0