Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Index.js

@@ -258,7 +258,6 @@ var bootstrap = function ($, learun) {
                                 key: value,
                                 code: 'ExamType',
                                 callback: function (_data) {
-                                    console.log(_data.text,"_data")
                                     callback(_data.text);
                                 }
                             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js

@@ -237,6 +237,18 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "考试类型", name: "ExamType", width: 80, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ExamType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "合上班", name: "RelatedClassNo", width: 80, align: "left" },
                     { label: "拟开教学班数", name: "LessonSortNo", width: 100, align: "left" },
                     { label: "备注", name: "Remark", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/TeachForm.js

@@ -25,6 +25,7 @@ var bootstrap = function ($, learun) {
         var postData = $('#form').lrGetFormData();
         var EmpNo = postData.EmpNo;
         learun.postForm(top.$.rootUrl + '/EducationalAdministration/ClassPlanTeach/SetTeach', { keyValue: keyValue, EmpNo: EmpNo }, function () {
+            learun.frameTab.currentIframe().refreshGirdData()
         });
     };
     page.init();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/TeachFormQZ.js

@@ -25,8 +25,9 @@ var bootstrap = function ($, learun) {
         var postData = $('#form').lrGetFormData();
         var EmpNo = postData.EmpNo;
         learun.postForm(top.$.rootUrl + '/EducationalAdministration/ClassPlanTeach/QZSetTeach', { keyValue: keyValue, EmpNo: EmpNo }, function () {
+            learun.frameTab.currentIframe().refreshGirdData()
         });
     };
     page.init();
-    
+
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js

@@ -125,8 +125,8 @@ var bootstrap = function ($, learun) {
             $('#OverseasChineseNo').lrDataItemSelect({ code: 'BCdOverseasChinese', allowSearch: true });
             $('#HealthStatusNo').lrDataItemSelect({ code: 'BCdHealthStatus', allowSearch: true });
             //初始学历
-            $('#CultureDegreeNo').lrDataItemSelect({ code: 'CollegeType', allowSearch: true });
-            $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree', allowSearch: true });
+            $('#CultureDegreeNo').lrDataItemSelect({ code: 'RecordInSchool', allowSearch: true });
+            $('#DegreeNo').lrDataItemSelect({ code: 'DegreeInSchool', allowSearch: true });
             $('#FamilyOriginNo').lrDataItemSelect({ code: 'BCdFamilyOrigin', allowSearch: true });
             $('#SubjectSpeciesNo').lrDataItemSelect({ code: 'BCdSubjectSpecies', allowSearch: true });
             $('#ForeignLanguageNo').lrDataItemSelect({ code: 'BCdForeignLanguage', allowSearch: true });
@@ -137,11 +137,11 @@ var bootstrap = function ($, learun) {
             $('#PostRank').lrDataItemSelect({ code: 'BCdTitleOfTechPost', allowSearch: true });
             $('#Photo').lrUploader();
             //$('#HighestRecord').lrDataSourceSelect({ code: 'BCdCultureDegree', value: 'culturedegreeno', text: 'culturedegree' });
-            $('#HighestRecord').lrDataItemSelect({ code: 'HighestEducation'});
+            $('#HighestRecord').lrDataItemSelect({ code: 'RecordInSchool'});
 
             //$('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'ObtainWay' });
-            $('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'HighestEducationAcquisitionMode' });
-            $('#InitialDegree').lrDataSourceSelect({ code: 'BCdDegree', value: 'degreeno', text: 'degreename' });
+            $('#ObtainWayOfHighestRecord').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
+            $('#InitialDegree').lrDataItemSelect({ code: 'DegreeInSchool'});
             $('#ObtainWayOfInitialDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
             $('#ObtainWayOfHighestDegree').lrDataItemSelect({ code: 'ObtainWayOfDegree' });
             //$('#PositionLevel').lrDataItemSelect({ code: 'PositionLevel' });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.cshtml

@@ -54,10 +54,6 @@
                                     <div class="lr-form-item-title">政治面貌</div>
                                     <div id="PartyFaceNo"></div>
                                 </div>
-                                <div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">文化程度</div>
-                                    <div id="HighestRecord"></div>
-                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">人员身份</div>
                                     <div id="CompilationCategory"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Index.js

@@ -50,7 +50,7 @@ var bootstrap = function ($, learun) {
             //政治面貌
             $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus', allowSearch: true });
             //最高学历
-            $('#HighestRecord').lrDataItemSelect({ code: 'HighestEducation'});
+            //$('#HighestRecord').lrDataItemSelect({ code: 'HighestEducation'});
 
 
             //民族
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
             //是否审核
             $('#CheckMark').lrDataItemSelect({ code: 'YesOrNoInt' });
             //学位
-            $('#DegreeNo').lrDataItemSelect({ code: 'BCdDegree' });
+            $('#DegreeNo').lrDataItemSelect({ code: 'DegreeInSchool' });
             //职称
             $('#ProfessionalTitle').lrDataItemSelect({ code: 'jszc' });
 
@@ -496,7 +496,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'HighestEducation',
+                                code: 'RecordInSchool',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
@@ -508,7 +508,7 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'BCdDegree',
+                                code: 'DegreeInSchool',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.cshtml

@@ -21,7 +21,7 @@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
         <div class="lr-form-item-title">学位</div>
-        <input id="AcademicDegree" type="text" class="form-control"  />
+        <div id="AcademicDegree"></div>
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
         <div class="lr-form-item-title">学制</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.js

@@ -16,7 +16,8 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#Education').lrDataItemSelect({ code: 'CollegeType' });
+            $('#Education').lrDataItemSelect({ code: 'RecordInSchool' });
+            $('#AcademicDegree').lrDataItemSelect({ code: 'DegreeInSchool' });
             $('#EducationalSystem').lrDataItemSelect({ code: 'EductionalSystme' });
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js

@@ -122,14 +122,25 @@ var bootstrap = function ($, learun) {
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
-                                code: 'CollegeType',
+                                code: 'RecordInSchool',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "学位", name: "AcademicDegree", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DegreeInSchool',
                                 callback: function (_data) {
                                     callback(_data.text);
                                 }
                             });
                         }
                     },
-                    { label: "学位", name: "AcademicDegree", width: 100, align: "left" },
                     {
                         label: "学制", name: "EducationalSystem", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -110,7 +110,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["TeachClassNo"].IsEmpty())
                 {
-                    dp.Add("TeachClassNo", "%"+queryParam["TeachClassNo"].ToString(), DbType.String);
+                    dp.Add("TeachClassNo", "%" + queryParam["TeachClassNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.TeachClassNo like @TeachClassNo ");
                 }
                 if (!queryParam["EmpNo"].IsEmpty())
@@ -124,7 +124,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     strSql.Append(" AND t.ClassroomNo = @ClassroomNo ");
                 }
 
-                return this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(strSql.ToString(),dp);
+                return this.BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(strSql.ToString(), dp);
             }
             catch (Exception ex)
             {
@@ -871,7 +871,7 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                     @"select  m.name AS 'MajorName', m.number AS 'MajorNo', tt.EmpNo AS 'EmpNo', 
                                 tt.EmpName AS 'EmpName', sc.name AS 'F_SchoolName', sc.sid AS 'F_SchoolId', 
                                 p.grade AS 'Grade', p.classhour AS 'classhour', curr.name AS 'LessonName', curr.number AS 'LessonNo',
-                                s.year AS 'AcademicYearNo', s.number AS 'Semester' FROM  tb_major_plan p
+                                s.year AS 'AcademicYearNo', s.number AS 'Semester' ,cour.`assessmentmethod` AS 'ExamType' FROM  tb_major_plan p
                                 LEFT JOIN (
 						                                SELECT
 						                                t.teacher,
@@ -933,7 +933,8 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                                 CheckMark = "1",
                                 TestMark = 0,
                                 F_SchoolId = item.F_SchoolId,
-                                State = 1
+                                State = 1,
+                                ExamType = item.ExamType
                             };
                             if (openLessonPlanData.Count(m => m.AcademicYearNo == insertData.AcademicYearNo &&
                                                               m.Semester == insertData.Semester &&

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs

@@ -121,6 +121,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public int? StartWeek { get; set; }
         [NotMapped]
         public int? EndWeek { get; set; }
+        [NotMapped]
+        public string ExamType { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs

@@ -31,8 +31,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@" * ");
+                strSql.Append(@" t.*,op.ExamType  ");
                 strSql.Append("  FROM TeachClass t ");
+                strSql.Append("  left join openlessonplan  op on op.academicyearno=t.academicyearno and op.semester=t.semester and  op.DeptNo=t.DeptNo and op.majorno =t.majorno ");
+                strSql.Append("  and op.grade =t.grade and op.lessonno =t.lessonno and op.F_SchoolId =t.F_SchoolId ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数