Merge branch '黑龙江艺术高中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs

@@ -2272,6 +2272,7 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
         /// <returns></returns>
         public string ArrangeLessonTermImport(DataTable dt, string fileId)
         {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
             {
                 int snum = 0;
@@ -2286,7 +2287,6 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
                     {
                         failDt.Columns.Add(dc.ColumnName, dc.DataType);
                     }
-                    var db = this.BaseRepository("CollegeMIS").BeginTrans();
 
                     IEnumerable<ArrangeLessonTermEntity> ArrangeLessonTermHistory = db.FindList<ArrangeLessonTermEntity>("select * from ArrangeLessonTerm");
                     var ArrangeLessonTerminsert = new List<ArrangeLessonTermEntity>();
@@ -2448,6 +2448,7 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
             }
             catch (Exception ex)
             {
+                db.Rollback();
                 if (ex is ExceptionEx)
                 {
                     throw;
@@ -2466,9 +2467,11 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
         public bool InsertTeachClassDataInImport(DateTime insertdate)
         {
             bool result = false;
+            var date = insertdate.AddSeconds(1);
             try
             {
-                var ArrangeLessonTermData = this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(x => x.IsImport == true && x.InsertDate == insertdate);
+                IEnumerable<ArrangeLessonTermEntity> ArrangeLessonTermData = BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>("SELECT t.* from ArrangeLessonTerm t WHERE t.InsertDate >= '" + insertdate + "' and t.InsertDate < '" + date + "' and t.IsImport=1 ");
+
                 if (ArrangeLessonTermData.Any())
                 {
                     //表已有数据
@@ -2481,6 +2484,7 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
                             AcademicYearNo = x.Key.AcademicYearNo,
                             Semester = x.Key.Semester,
                             LessonNo = x.Key.LessonNo,
+                            LessonName = x.Key.LessonName,
                             LessonSortNo = x.Key.LessonSortNo,
                             TeachClassNo = x.Key.TeachClassNo.Replace(x.Key.LessonName, ""),
                             EmpNo = x.Key.EmpNo,
@@ -2527,7 +2531,60 @@ group by  AcademicYearNo,Semester,DeptNo,MajorNo,LessonNo,TeachClassNo,EmpNo,Les
 
                     #region 写入专业开课计划数据
                     //todo:wx
+                    //历史数据
+                    var openLessonPlanData = BaseRepository("CollegeMIS").FindList<OpenLessonPlanEntity>();
+                    var Teachdatetime = DateTime.Now;
+                    var insertDataList = new List<OpenLessonPlanEntity>();
+                    var majorData = BaseRepository("CollegeMIS").FindList<CdMajorEntity>().ToList();
+                    var lessonData = BaseRepository("CollegeMIS").FindList<LessonInfoEntity>().ToList();
+                    foreach (var item in teachclasslist)
+                    {
+
+                        var insertData = new OpenLessonPlanEntity()
+                        {
 
+                            MakeDate = Teachdatetime,
+                            AcademicYearNo = item.AcademicYearNo,
+                            Semester = item.Semester,
+                            DeptNo = majorData.FirstOrDefault(m => m.MajorNo == item.MajorNo)?.DeptNo,
+                            MajorNo = item.MajorNo,
+                            LessonNo = item.LessonNo,
+                            LessonName = item.LessonName,
+                            PartCode = "",
+                            Grade = item.Grade,
+                            LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == item.LessonNo)
+                                ?.LessonSortNo,
+                            LessonSortDetailNo = lessonData
+                                .FirstOrDefault(m => m.LessonNo == item.LessonSortDetailNo)?.LessonSortDetailNo,
+                            StartWeek = item.StartWeek,
+                            EndWeek = item.EndWeek,
+                            CheckStyleNo = "1",
+                            ScoreRecordStyleNo = "1",
+                            TeachDeptNo = majorData.FirstOrDefault(m => m.MajorNo == item.MajorNo)?.DeptNo,
+                            StudyScore = 0,
+                            AmendDate = Teachdatetime,
+                            ClassroomType = 1,
+                            ClassroomPracticeType = 99,
+                            CheckMarkDept = "1",
+                            CheckMark = "1",
+                            TestMark = 0,
+                            F_SchoolId = item.F_SchoolId,
+                            State = 1,
+                            ExamType = "1"
+                        };
+                        if (openLessonPlanData.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester &&
+                                                          m.MajorNo == insertData.MajorNo && m.LessonNo == insertData.LessonNo &&
+                                                          m.Grade == insertData.Grade && m.LessonSortNo == insertData.LessonSortNo &&
+                                                          m.LessonName == insertData.LessonName && m.F_SchoolId == insertData.F_SchoolId) == 0 &&
+                            insertDataList.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester &&
+                                                      m.MajorNo == insertData.MajorNo && m.LessonNo == insertData.LessonNo &&
+                                                      m.Grade == insertData.Grade && m.LessonSortNo == insertData.LessonSortNo &&
+                                                      m.LessonName == insertData.LessonName && m.F_SchoolId == insertData.F_SchoolId) == 0)
+                        {
+                            insertDataList.Add(insertData);
+                        }
+                    }
+                    this.BaseRepository("CollegeMIS").Insert(insertDataList);
 
                     #endregion