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 @@
学期*
+
@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;
}
-
+
///
/// 按条件同步排课数据
///
@@ -686,7 +686,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
{
var oldArrangeLessonTermList = (await BaseRepository("CollegeMIS").FindListAsync()).ToList();
var insertDataList = new List();
-
+
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();
-
+
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(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(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;
}