Browse Source

优化语句条件拼接

Li 2 years ago
parent
commit
b6bd5adabf

+ 4 - 4
TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -1656,11 +1656,11 @@ namespace TEAMModelBI.Controllers.BISchool
             List<string> schoolIds = await CommonFind.FindSchoolIds(cosmosClient, $"{tmdId}");
             if (schoolIds.Count > 0)
             {
-                string scIdSql = BICommonWay.ManyScSql("schoolId", schoolIds);
+                string scIdSql = BICommonWay.ManyScSql("c.schoolId", schoolIds);
                 string stuSql = $"select value(count(c.id)) from c where {scIdSql}";
                 stuAllCnt = await CommonFind.GetSqlValueCount(cosmosClient, "Student", stuSql);
 
-                string scSql = BICommonWay.ManyScSql("school", schoolIds);
+                string scSql = BICommonWay.ManyScSql("c.school", schoolIds);
                 string lessMoSql = $"select value(count(c.id)) from c where c.pk='LessonRecord' and {scSql} and c.startTime >= {start} and c.startTime <= {end}";
                 lessMthCnt = await CommonFind.GetSqlValueCount(cosmosClient, "School", lessMoSql);
 
@@ -1727,7 +1727,7 @@ namespace TEAMModelBI.Controllers.BISchool
             {
                 List<string> schoolIds = await CommonFind.FindSchoolIds(cosmosClient, $"{tmdId}");
                 if (schoolIds.Count == 0) return Ok(new { state = RespondCode.Ok, yearCnts, });
-                scSql = BICommonWay.ManyScSql("school", schoolIds);
+                scSql = BICommonWay.ManyScSql("c.school", schoolIds);
             }
 
             if (!string.IsNullOrEmpty($"{schooId}") && string.IsNullOrEmpty($"{tmdId}"))
@@ -1800,7 +1800,7 @@ namespace TEAMModelBI.Controllers.BISchool
             if (schoolIds.Count > 0)
             {
 
-                string scSql = BICommonWay.ManyScSql("school", schoolIds);
+                string scSql = BICommonWay.ManyScSql("c.school", schoolIds);
 
                 string strSql = "SELECT value(count(c.id)) FROM c where c.pk='LessonRecord'";
 

+ 9 - 3
TEAMModelOS.SDK/Models/Service/BI/BICommonWay.cs

@@ -32,13 +32,18 @@ namespace TEAMModelOS.SDK.Models.Service.BI
                 return source;
         }
 
-
-        public static string ManyScSql(string name, List<string> scIds) 
+        /// <summary>
+        /// 多个拼接in条件
+        /// </summary>
+        /// <param name="condName"></param>
+        /// <param name="scIds"></param>
+        /// <returns></returns>
+        public static string ManyScSql(string condName, List<string> scIds) 
         {
             StringBuilder scSql = new();
             if (scIds.Count > 0)
             {
-                scSql.Append($"c.{name} in (");
+                scSql.Append($" {condName} in (");
                 for (int i = 0; i < scIds.Count; i++)
                 {
                     if (i == scIds.Count - 1)
@@ -51,5 +56,6 @@ namespace TEAMModelOS.SDK.Models.Service.BI
 
             return scSql.ToString();
         }
+
     }
 }