修复数据库排序规则冲突问题

- 修复LqZjlMdsmxszService.GetPageList接口的排序规则冲突 - 修复LqStatisticsService中工资统计相关的排序规则冲突 - 在涉及lq_kd_kdjlb表的JOIN操作中添加COLLATE子句 - 更新UpdateSalaryStatisticsFromOtherTables方法中的COLLATE子句 - 创建修复排序规则冲突的精简版SQL脚本

修复数据库排序规则冲突问题
- 修复LqZjlMdsmxszService.GetPageList接口的排序规则冲突 - 修复LqStatisticsService中工资统计相关的排序规则冲突 - 在涉及lq_kd_kdjlb表的JOIN操作中添加COLLATE子句 - 更新UpdateSalaryStatisticsFromOtherTables方法中的COLLATE子句 - 创建修复排序规则冲突的精简版SQL脚本
“wangming”
1 parent 278810cb
Showing 3 changed files with 57 additions and 7 deletions
netcore/src/Application/NCC.API/appsettings.json
netcore/src/Modularity/Extend/NCC.Extend/LqStatisticsService.cs
修复排序规则冲突_精简版.sql
@@ -29,7 +29,7 @@
   "AllowedHosts": "*",
   "ConnectionStrings": {
     "ConfigId": "db",
-    "DBName": "lqerp",
+    "DBName": "lqerp_test",
     "DBType": "MySql", //MySql;SqlServer;Oracle;PostgreSQL;Dm;Kdbndp;
     //SqlServer
     // "DefaultConnection": "Data Source=localhost;Initial Catalog={0};User ID=sqladmin;Password=P@ssw0rd;MultipleActiveResultSets=true"
@@ -1464,7 +1464,7 @@ namespace NCC.Extend.LqStatistics
                                 SUM(CAST(jksyj.jksyj AS DECIMAL(18,2))) as order_performance
                             FROM lq_kd_jksyj jksyj
                             INNER JOIN lq_kd_pxmx pxmx ON jksyj.F_kdpxid = pxmx.F_Id AND pxmx.F_IsEffective = 1
-                            INNER JOIN lq_kd_kdjlb kd ON jksyj.glkdbh = kd.F_Id
+                            INNER JOIN lq_kd_kdjlb kd ON jksyj.glkdbh COLLATE utf8mb4_general_ci = kd.F_Id COLLATE utf8mb4_general_ci
                             WHERE jksyj.yjsj IS NOT NULL
                                 AND jksyj.jksyj IS NOT NULL
                                 AND jksyj.jksyj != ''
@@ -2529,7 +2529,7 @@ namespace NCC.Extend.LqStatistics
                             SUM(CASE WHEN kd.sfskdd = '是' THEN COALESCE(kd.zdyj, 0) ELSE 0 END) as F_FirstOrderPerformance,
                             SUM(CASE WHEN kd.sfskdd = '否' THEN COALESCE(kd.zdyj, 0) ELSE 0 END) as F_UpgradeOrderPerformance
                         FROM lq_kd_kdjlb kd
-                        LEFT JOIN lq_mdxx md ON kd.djmd = md.F_Id
+                        LEFT JOIN lq_mdxx md ON kd.djmd COLLATE utf8mb4_general_ci = md.F_Id COLLATE utf8mb4_general_ci
                         WHERE kd.F_IsEffective = 1
                             AND DATE_FORMAT(kd.kdrq, '%Y%m') = @statisticsMonth
                         GROUP BY kd.djmd, md.dm
@@ -2539,7 +2539,7 @@ namespace NCC.Extend.LqStatistics
                             kd.djmd as F_StoreId,
                             COUNT(pxmx.F_ProjectNumber) as F_ItemQuantity
                         FROM lq_kd_kdjlb kd
-                        LEFT JOIN lq_kd_pxmx pxmx ON kd.F_Id = pxmx.glkdbh AND pxmx.F_IsEffective = 1
+                        LEFT JOIN lq_kd_pxmx pxmx ON kd.F_Id COLLATE utf8mb4_general_ci = pxmx.glkdbh COLLATE utf8mb4_general_ci AND pxmx.F_IsEffective = 1
                         WHERE kd.F_IsEffective = 1
                             AND DATE_FORMAT(kd.kdrq, '%Y%m') = @statisticsMonth
                         GROUP BY kd.djmd
@@ -2924,7 +2924,7 @@ namespace NCC.Extend.LqStatistics
             var personalPerformanceSql = @"
                 UPDATE lq_salary_statistics s
                 INNER JOIN lq_statistics_personal_performance p 
-                    ON s.F_EmployeeId COLLATE utf8mb4_unicode_ci = p.F_EmployeeId COLLATE utf8mb4_unicode_ci 
+                    ON s.F_EmployeeId COLLATE utf8mb4_general_ci = p.F_EmployeeId COLLATE utf8mb4_general_ci 
                     AND s.F_StatisticsMonth = p.F_StatisticsMonth
                 SET 
                     s.F_TotalPerformance = p.F_TotalPerformance,
@@ -2944,7 +2944,7 @@ namespace NCC.Extend.LqStatistics
             var storePerformanceSql = @"
                 UPDATE lq_salary_statistics s
                 INNER JOIN lq_statistics_store_total_performance st 
-                    ON s.F_StoreId COLLATE utf8mb4_unicode_ci = st.F_StoreId COLLATE utf8mb4_unicode_ci 
+                    ON s.F_StoreId COLLATE utf8mb4_general_ci = st.F_StoreId COLLATE utf8mb4_general_ci 
                     AND s.F_StatisticsMonth = st.F_StatisticsMonth
                 SET 
                     s.F_StoreTotalPerformance = st.F_TotalOrderPerformance
@@ -2960,7 +2960,7 @@ namespace NCC.Extend.LqStatistics
             var teamPerformanceSql = @"
                 UPDATE lq_salary_statistics s
                 INNER JOIN lq_statistics_gold_triangle gt 
-                    ON s.F_GoldTriangleId COLLATE utf8mb4_unicode_ci = gt.F_GoldTriangleId COLLATE utf8mb4_unicode_ci 
+                    ON s.F_GoldTriangleId COLLATE utf8mb4_general_ci = gt.F_GoldTriangleId COLLATE utf8mb4_general_ci 
                     AND s.F_StatisticsMonth = gt.F_StatisticsMonth
                 SET 
                     s.F_TeamPerformance = gt.F_TotalPerformance
+-- 修复排序规则冲突 - 精简版
+-- 只更新报错的相关表
+
+-- 1. 统一 BASE_USER 表的所有字段排序规则
+ALTER TABLE BASE_USER CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+-- 2. 统一 lq_mdxx 表的所有字段排序规则  
+ALTER TABLE lq_mdxx CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+-- 3. 统一 lq_zjl_mdsmxsz 表的所有字段排序规则
+ALTER TABLE lq_zjl_mdsmxsz CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+-- 4. 统一 lq_ycsd_jsj 表的所有字段排序规则
+ALTER TABLE lq_ycsd_jsj CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+-- 5. 统一 lq_kd_jksyj 表的所有字段排序规则
+ALTER TABLE lq_kd_jksyj CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+-- 6. 统一 lq_statistics_gold_triangle 表的所有字段排序规则
+ALTER TABLE lq_statistics_gold_triangle CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+-- 7. 统一 lq_jinsanjiao_user 表的所有字段排序规则
+ALTER TABLE lq_jinsanjiao_user CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+-- 8. 统一 lq_salary_statistics 表的所有字段排序规则
+ALTER TABLE lq_salary_statistics CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+-- 9. 统一 lq_kd_pxmx 表的所有字段排序规则
+ALTER TABLE lq_kd_pxmx CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+-- 10. 跳过 lq_kd_kdjlb 表（表太大，无法转换）
+-- ALTER TABLE lq_kd_kdjlb CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+-- 11. 统一 lq_xmzl 表的所有字段排序规则
+ALTER TABLE lq_xmzl CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+-- 12. 统一 lq_statistics_personal_performance 表的所有字段排序规则
+ALTER TABLE lq_statistics_personal_performance CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+-- 13. 统一 lq_statistics_store_total_performance 表的所有字段排序规则
+ALTER TABLE lq_statistics_store_total_performance CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+-- 验证排序规则是否统一
+SELECT 
+    TABLE_NAME,
+    TABLE_COLLATION
+FROM INFORMATION_SCHEMA.TABLES 
+WHERE TABLE_SCHEMA = DATABASE() 
+    AND TABLE_NAME IN ('BASE_USER', 'lq_mdxx', 'lq_zjl_mdsmxsz', 'lq_ycsd_jsj', 'lq_kd_jksyj', 'lq_statistics_gold_triangle', 'lq_jinsanjiao_user', 'lq_salary_statistics', 'lq_kd_pxmx', 'lq_xmzl', 'lq_statistics_personal_performance', 'lq_statistics_store_total_performance')
+ORDER BY TABLE_NAME;