From c3fc8fa90dc4a70f69605b210ffb9ed055567f04 Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Thu, 16 Dec 2021 17:18:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E6=9D=A1=E4=BB=B6=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E6=8E=92=E8=AF=BE=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E5=86=85=E5=AE=B9=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EmptyByConditionForm.cshtml               |  4 ++
 .../ArrangeLessonTerm/EmptyByConditionForm.js |  6 +++
 .../ArrangeLessonTermService.cs               | 44 ++++++++++---------
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.cshtml
index 7b7a69828..d67de2992 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.cshtml	
@@ -15,5 +15,9 @@
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
         <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">同步内容<font face="宋体">*</font></div>
+        <div id="SyncType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.js
index 68e543073..0986a9145 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/EmptyByConditionForm.js	
@@ -30,6 +30,12 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+            $('#SyncType').lrselect({
+                placeholder: "请选择同步内容",
+                data: [{ text: "课表", value: "1" }, { text: "开课计划", value: "2" }],
+                value: 'value',
+                text: 'text'
+            });
         },
         initData: function () {
             //if (!!selectedRow) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs
index 8cefc6d44..15010c9bc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs	
@@ -659,7 +659,7 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
             }
             return result;
         }
-        
+
         /// <summary>
         /// 按条件同步排课数据
         /// </summary>
@@ -686,7 +686,7 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                         {
                             var oldArrangeLessonTermList = (await BaseRepository("CollegeMIS").FindListAsync<ArrangeLessonTermEntity>()).ToList();
                             var insertDataList = new List<ArrangeLessonTermEntity>();
-                           
+
                             foreach (var item in dataList)
                             {
                                 var classinfo = classData.FirstOrDefault(m => m.ClassId == item.clazzSid);
@@ -941,7 +941,7 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                     if (dataList.Any())
                     {
                         var insertDataList = new List<OpenLessonPlanEntity>();
-                       
+
                         var now = DateTime.Now;
                         foreach (var item in dataList)
                         {
@@ -1095,29 +1095,31 @@ WHERE   (AcademicYearNo = '" + entity.AcademicYearNo + "') and semester='" + ent
             bool result = false;
             try
             {
-                HttpContent httpContent = new StringContent("{\"school\":\"" + entity.F_SchoolId + "\",\"year\":\"" + entity.AcademicYearNo + "\",\"number\":\"" + entity.Semester + "\"}");
-                httpContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
-                string apiData = await Client.PostAsync(Config.GetValue("ModifyArrangeLessonAPI"), httpContent).Result.Content.ReadAsStringAsync();
-
-                if (!string.IsNullOrEmpty(apiData))
+                if (entity.SyncType == "1")
                 {
-                    var data = JsonConvert.DeserializeObject<Root>(apiData);
-                    if (data.success)
+                    HttpContent httpContent = new StringContent("{\"school\":\"" + entity.F_SchoolId + "\",\"year\":\"" + entity.AcademicYearNo + "\",\"number\":\"" + entity.Semester + "\"}");
+                    httpContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
+                    string apiData = await Client.PostAsync(Config.GetValue("ModifyArrangeLessonAPI"), httpContent).Result.Content.ReadAsStringAsync();
+
+                    if (!string.IsNullOrEmpty(apiData))
                     {
-                        var executeResult = await BaseRepository("CollegeMIS").ExecuteAsyncBySql(
-                            $"delete from ArrangeLessonTerm where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' ");
-                        await BaseRepository("CollegeMIS").ExecuteAsyncBySql(
-                              $"delete from TeachClass where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' ");
-                        await BaseRepository("CollegeMIS").ExecuteAsyncBySql(
-                              $"delete from OpenLessonPlan where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' ");
-                        await BaseRepository("CollegeMIS").ExecuteAsyncBySql(
-                            $"delete from StuSelectLessonList where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' ");
-                        if (executeResult > 0)
+                        var data = JsonConvert.DeserializeObject<Root>(apiData);
+                        if (data.success)
                         {
-                            result = true;
+                            await BaseRepository("CollegeMIS").ExecuteAsyncBySql(
+                                $"delete from ArrangeLessonTerm where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' ");
                         }
                     }
                 }
+                else
+                {
+                    await BaseRepository("CollegeMIS").ExecuteAsyncBySql(
+                        $"delete from TeachClass where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' ");
+                    await BaseRepository("CollegeMIS").ExecuteAsyncBySql(
+                        $"delete from OpenLessonPlan where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' ");
+                    await BaseRepository("CollegeMIS").ExecuteAsyncBySql(
+                        $"delete from StuSelectLessonList where F_SchoolId='{entity.F_SchoolId}' and AcademicYearNo='{entity.AcademicYearNo}' and Semester='{entity.Semester}' ");
+                }
             }
             catch (Exception ex)
             {
@@ -1130,7 +1132,7 @@ WHERE   (AcademicYearNo = '" + entity.AcademicYearNo + "') and semester='" + ent
                     throw ExceptionEx.ThrowServiceException(ex);
                 }
             }
-            return result;
+            return true;
         }