Li преди 2 години
родител
ревизия
050ff414a4
променени са 2 файла, в които са добавени 19 реда и са изтрити 8 реда
  1. 9 3
      TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs
  2. 10 5
      TEAMModelOS.SDK/Context/Constant/RespondCode.cs

+ 9 - 3
TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs

@@ -29,6 +29,7 @@ using TEAMModelBI.Models;
 using TEAMModelBI.DI.BIAzureStorage;
 using TEAMModelOS.SDK;
 using TEAMModelOS.SDK.Context.BI;
+using TEAMModelOS.SDK.Context.Constant;
 
 namespace TEAMModelBI.Controllers.BISchool
 {
@@ -326,10 +327,15 @@ namespace TEAMModelBI.Controllers.BISchool
                 //保存操作记录
                 //await _azureStorage.SaveBILog("school-batchAdd", stringBuilder?.ToString(), _dingDing, httpContext: HttpContext);
                 await AzureStorageBlobExtensions.SaveBILog(blobClient, tableClient, "school-batchAdd", stringBuilder?.ToString(), _dingDing, httpContext: HttpContext);
-                if (schools.Count > 0 || userScs.Count > 0 || cutArea.Count >0)
-                    return Ok(new { state = 201, message = "已有部分学校批量创建成功;学校已经重复/或者学校信息有误!请检查学校信息!", schools, userScs });
+                if (schools.Count == foundSchools.biSchools.Count || userScs.Count == foundSchools.biSchools.Count)
+                    return Ok(new { state = RespondCode.CreateFailed, message = "已有部分学校批量创建成功;学校已经重复/或者学校信息有误!请检查学校信息!", schools, userScs });
                 else
-                    return Ok(new { state = 200, message = "批量创校已全部完成" });
+                {
+                    if (schools.Count > 0 || userScs.Count > 0 || cutArea.Count > 0)
+                        return Ok(new { state = RespondCode.Created, message = "已有部分学校批量创建成功;学校已经重复/或者学校信息有误!请检查学校信息!", schools, userScs });
+                    else
+                        return Ok(new { state = RespondCode.Ok, message = "批量创校已全部完成" });
+                }
             }
             catch (Exception ex)
             {

+ 10 - 5
TEAMModelOS.SDK/Context/Constant/RespondCode.cs

@@ -84,26 +84,31 @@ namespace TEAMModelOS.SDK.Context.Constant
         /// <summary>
         /// 不支持的媒体类型  415
         /// </summary>
-        public static readonly int NoMediaType = 415;
+        public readonly static int NoMediaType = 415;
+
+        /// <summary>
+        /// 创建失败
+        /// </summary>
+        public readonly static int CreateFailed = 407;
 
         /// <summary>
         /// 服务器错误  500
         /// </summary>
-        public static readonly int Error = 500;
+        public readonly static  int Error = 500;
 
         /// <summary>
         /// 网关错误 502
         /// </summary>
-        public static readonly int GatewayError = 502;
+        public readonly static  int GatewayError = 502;
 
         /// <summary>
         /// 网关超时  504
         /// </summary>
-        public static readonly int GatewayTimeOut = 504;
+        public readonly static int GatewayTimeOut = 504;
 
         /// <summary>
         /// 存储不足   507
         /// </summary>
-        public static readonly int InsufficientStorage = 507;
+        public readonly static int InsufficientStorage = 507;
     }
 }