册别接口调整

TEAMModelOS.SDK/Module/AzureCosmosDB/Implements/AzureCosmosDBRepository.cs

@@ -669,13 +669,13 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDB.Implements
             TypeCode typeCode = Type.GetTypeCode(s);
             return typeCode switch
             {
-                TypeCode.String => "and c." + key + "=" + "'" + obj.ToString() + "'",
-                TypeCode.Int32 => "and c." + key + "=" + int.Parse(obj.ToString()),
-                TypeCode.Double => "and c." + key + "=" + double.Parse(obj.ToString()),
+                TypeCode.String => " and c." + key + "=" + "'" + obj.ToString() + "'",
+                TypeCode.Int32 => " and c." + key + "=" + int.Parse(obj.ToString()),
+                TypeCode.Double => " and c." + key + "=" + double.Parse(obj.ToString()),
                 //case TypeCode.Byte: return "and c." + key + "=" + (Byte)obj ;   
-                TypeCode.Boolean => "and c." + key + "=" + bool.Parse(obj.ToString()),
-                TypeCode.DateTime => "and c." + key + "=" + (DateTime)obj,
-                TypeCode.Int64 => "and c." + key + "=" + long.Parse(obj.ToString()),
+                TypeCode.Boolean => " and c." + key + "=" + bool.Parse(obj.ToString()),
+                TypeCode.DateTime => " and c." + key + "=" + (DateTime)obj,
+                TypeCode.Int64 => " and c." + key + "=" + long.Parse(obj.ToString()),
                 _ => null,
             };
         }

TEAMModelOS/Controllers/Syllabus/SyllabusController.cs

@@ -30,15 +30,13 @@ namespace TEAMModelOS.Controllers.Syllabus
         public async Task<BaseJosnRPCResponse> SaveOrUpdateAll(JosnRPCRequest<List<SyllabusNode>> request)
         {
             JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            List<SyllabusNode> data = new List<SyllabusNode>();
             if (request.@params.IsNotEmpty())
             {
-                string key = IdWorker.getInstance().NextId() + "";
-                List<SyllabusNode> data = await azureCosmosDBRepository.SaveAll(request.@params);
+                 //string key = IdWorker.getInstance().NextId() + "";
+                 data = await azureCosmosDBRepository.SaveAll(request.@params);
             }
-          
-          
-         
-            return builder.Data(request.@params).build();
+            return builder.Data(data).build();
         }
         /// <summary>
         /// 删除课纲

TEAMModelOS/Controllers/Syllabus/VolumeController.cs

@@ -47,11 +47,11 @@ namespace TEAMModelOS.Controllers.Syllabus
                     List<Volume> volumesFind = await azureCosmosDBRepository.FindByDict<Volume>(new Dictionary<string, object>() {
                         { "schoolCode",request.@params.schoolCode},{ "periodCode", request.@params.periodCode},
                         { "subjectCode", request.@params.subjectCode},{ "gradeCode", request.@params.gradeCode},
-                        { "semesterCode",request.@params.gradeCode},{ "volumeName",request.@params.volumeName}  ,
+                        { "semesterCode",request.@params.semesterCode},{ "volumeName",request.@params.volumeName}  ,
                         { "status",1} ,{ "type",0} }, true);
                     if (volumesFind.IsNotEmpty())
                     {
-                        throw new BizException("已存在！", 500);
+                        throw new BizException("已存在！", 200);
                     }
                     ///校本课纲
                     string key = request.@params.schoolCode + IdWorker.getInstance().NextId();
@@ -63,11 +63,11 @@ namespace TEAMModelOS.Controllers.Syllabus
                     List<Volume> volumesFind = await azureCosmosDBRepository.FindByDict<Volume>(new Dictionary<string, object>() {
                         { "schoolCode",request.@params.schoolCode},{ "periodCode", request.@params.periodCode},
                         { "subjectCode", request.@params.subjectCode},{ "gradeCode", request.@params.gradeCode},
-                        { "semesterCode",request.@params.gradeCode},{ "volumeName",request.@params.volumeName},
+                        { "semesterCode",request.@params.semesterCode},{ "volumeName",request.@params.volumeName},
                         { "TEAMModelId",request.@params.TEAMModelId}, { "status",1} ,{ "type",1} }, true);
                     if (volumesFind.IsNotEmpty())
                     {
-                        throw new BizException("已存在！", 500);
+                        throw new BizException("已存在！", 200);
                     }
                     ///个人课纲
                     string key = "dynamic" + request.@params.TEAMModelId.Replace("#", "") + IdWorker.getInstance().NextId();
@@ -94,7 +94,7 @@ namespace TEAMModelOS.Controllers.Syllabus
                     if (volumesFind.IsNotEmpty())
                     {
                         if (!volumesFind[0].id.Equals(request.@params.id)) {
-                            throw new BizException("已存在！", 500);
+                            throw new BizException("已存在！", 200);
                         }
                     }
                 }
@@ -109,7 +109,7 @@ namespace TEAMModelOS.Controllers.Syllabus
                     {
                         if (!volumesFind[0].id.Equals(request.@params.id))
                         {
-                            throw new BizException("已存在！", 500);
+                            throw new BizException("已存在！", 200);
                         }
                     }