1. 創校前詢問BB邏輯修正：只檢驗學校簡碼和ID是否存在，名字及其他資料不檢驗

2. 學校单独增加模块的邏輯先註解掉，商業邏輯部分需由BB訂單系統控管；若仍需要由BI追加商業模塊，需討論後再行修正。

TEAMModelBI/ClientApp/src/view/created/created.vue

@@ -1338,7 +1338,6 @@ export default {
       console.log(data, '提交的数据')
       proxy.$api.verifyContent(data).then((res) => {
         console.log(res, '数据验证的结果')
-        res.state === 200 ? (batchDatas.forEach((item) => { item.dataState = true }), batchVerify(presentData, loadingverify), codeShow.value = true) : ''
         if (res.state === 200) {
           //处理简码
           res.createScInfo.forEach((items) => {
@@ -1349,6 +1348,7 @@ export default {
             }
           })
         }
+        res.state === 200 ? (batchDatas.forEach((item) => { item.dataState = true }), batchVerify(presentData, loadingverify), codeShow.value = true) : ''
         if (res.state === 201) {
           codeShow.value = false
           batchTablesArr.value = true; verifyState.value = false
@@ -1732,10 +1732,10 @@ export default {
         })
       }
 
-      let datas = { regionId: regionCodeNow, name: verifyData[0].name, nameFuzzy: false, shortCode: verifyData[0].code, shortCodeFuzzy: false }
+      let datas = { regionId: '', name: '', nameFuzzy: false, shortCode: '', shortCodeFuzzy: false, codeOrShortCode: verifyData[0].code }
       proxy.$api.verifyDatainbb(datas).then((res) => {
         console.log(res.length, '核验数据')
-        res.length == 0 ? (verifyForstate.value.state = true, verifyForstate.value.pass = true, ElMessage.success('数据已通过核验，可执行创校')) : (verifyForstate.value.state = false, verifyForstate.value.pass = false, ElMessage.error('数据未通过核验，请检查表单内容'))
+        res.length == 0 ? (verifyForstate.value.state = true, verifyForstate.value.pass = true, ElMessage.success('数据已通过核验，可执行创校')) : (verifyForstate.value.state = false, verifyForstate.value.pass = false, ElMessage.error('数据未通过核验，BB学校资料库已存在此学校代码或简码。'))
       }).catch((error) => {
         ElMessage.error('API异常，数据核验失败')
       })
@@ -1747,25 +1747,25 @@ export default {
       let scArr = value
       let snameList = []; let scodeList = []; let shortArr = []; let regionList = []; let regionInfoRowNow = [];
       let regionCodeTmp = ''
-      scArr.forEach((item) => {
-        snameList.push(item.name);
-        scodeList.push(item.id);
+        scArr.forEach((item) => {
+        // snameList.push(item.name);
+        // scodeList.push(item.id);
         shortArr.push(item.id);
-        regionInfoRowNow = regionInfoList.filter(function (rgitem) { return rgitem.name.includes(item.region) })
-        regionCodeTmp = (regionInfoRowNow.length > 0 && regionInfoRowNow[0].hasOwnProperty('code')) ? regionInfoRowNow[0]['code'] : ''
-        if (regionCodeTmp != '' && !regionList.includes(regionCodeTmp)) {
-          regionList.push(regionCodeTmp)
-        }
+        // regionInfoRowNow = regionInfoList.filter(function (rgitem) { return rgitem.name.includes(item.region) })
+        // regionCodeTmp = (regionInfoRowNow.length > 0 && regionInfoRowNow[0].hasOwnProperty('code')) ? regionInfoRowNow[0]['code'] : ''
+        // if (regionCodeTmp != '' && !regionList.includes(regionCodeTmp)) {
+        //   regionList.push(regionCodeTmp)
+        // }
       })
-      let data = { nameList: snameList, codeList: scodeList, shortCodeList: shortArr }
-      if (siteValue === 'cn') {
-        data['regionId'] = 'CN'
-      } else {
-        data['regionId'] = (regionList.length == 1) ? regionList[0] : ''
-        data['regionIdList'] = (regionList.length > 1) ? regionList : []
-      }
+      let data = { nameList: snameList, codeList: scodeList, codeOrShortCodeList: shortArr }
+      // if (siteValue === 'cn') {
+      //   data['regionId'] = 'CN'
+      // } else {
+      //   data['regionId'] = (regionList.length == 1) ? regionList[0] : ''
+      //   data['regionIdList'] = (regionList.length > 1) ? regionList : []
+      // }
       proxy.$api.verifyDatainbb(data).then((res) => {
-        res.length == 0 ? (ElMessage.success('数据已通过核验，可执行创校'), batchTablesArr.value = true) : (ElMessage.error('数据未通过核验，请检查表单内容'), batchTablesArr.value = true, verifyState.value = false)
+        res.length == 0 ? (ElMessage.success('数据已通过核验，可执行创校'), batchTablesArr.value = true) : (ElMessage.error('数据未通过核验，BB学校资料库已存在此学校代码或简码，请检查表单内容。'), batchTablesArr.value = true, verifyState.value = false)
       }).catch((error) => {
         ElMessage.error('API异常，批量数据核验失败')
       })

TEAMModelBI/Controllers/BISchool/BatchSchoolController.cs

@@ -216,7 +216,7 @@ namespace TEAMModelBI.Controllers.BISchool
                                 period = PresetSchoolPeriod(bischool.period, foundSchools.lang, campusId),
                                 scale = bischool.size >= 300 ? 500 : 0,
                                 isinit = true,
-                                modules=bischool.modules,
+                                //modules=bischool.modules,
                                 openLessonRecord = (_option.Location.Contains("Global")) ? false : true,
                                 createTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
 
@@ -1046,14 +1046,15 @@ namespace TEAMModelBI.Controllers.BISchool
                 jsonElement.TryGetProperty("address", out JsonElement address);
                 string code = (jsonElement.TryGetProperty("code", out JsonElement _code))? _code.GetString() : string.Empty;
                 jsonElement.TryGetProperty("assist", out JsonElement assist);
-                List<string> modules = null ;
-                if (!jsonElement.TryGetProperty("modules ", out JsonElement _modules))
-                {
-                    return BadRequest();
-                }
-                else {
-                    modules= _modules.ToObject<List<string>>();
-                }
+                //手動追加商業模組的部分先封印，商業模組需要經過訂單系統下單控管。
+                //List<string> modules = null ;
+                //if (!jsonElement.TryGetProperty("modules ", out JsonElement _modules))
+                //{
+                //    return BadRequest();
+                //}
+                //else {
+                //    modules= _modules.ToObject<List<string>>();
+                //}
               
                 List<IdInfo> idInfos = assist.ToObject<List<IdInfo>>();
                 //jsonElement.TryGetProperty("site", out JsonElement site);//分开部署，就不需要，一站多用时，取消注释
@@ -1085,9 +1086,9 @@ namespace TEAMModelBI.Controllers.BISchool
                         //});
 
                         //tempShool.period = periods;
-                        if (modules!=null) {
-                            tempShool.modules=modules;
-                        }
+                        //if (modules!=null) {
+                        //    tempShool.modules=modules;
+                        //}
                         tempShool.size = !string.IsNullOrEmpty($"{size}") ? int.Parse($"{size}") : tempShool.size;
                         tempShool.scale = !string.IsNullOrEmpty($"{scale}") ? int.Parse($"{scale}") : tempShool.scale;
                         tempShool.picture = $"{picture}";
@@ -1973,7 +1974,7 @@ namespace TEAMModelBI.Controllers.BISchool
             /// <summary>
             /// 手动增加的模块 ["art"]
             /// </summary>
-            public List<string> modules { get; set; } = new List<string>();
+            //public List<string> modules { get; set; } = new List<string>();
         }
 
         /// <summary>

TEAMModelOS.SDK/Models/Cosmos/School/School.cs

@@ -109,7 +109,7 @@ namespace TEAMModelOS.SDK.Models
         /// <summary>
         /// 单独增加的模块
         /// </summary>
-        public List<string> modules { get; set; } = new List<string>();
+        //public List<string> modules { get; set; } = new List<string>();
     }
     /// <summary>
     /// 课表计划