Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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

@@ -412,7 +412,12 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "是否授课", name: "IsHasLesson", width: 100, align: "left", formatter: function (cellvalue) { return cellvalue == true ? "是" : "否" } },
-                    { label: "出生日期", name: "Birthday", width: 100, align: "left" },
+                    {
+                        label: "出生日期", name: "Birthday", width: 100, align: "left" ,
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
                     {
                         label: "民族", name: "NationalityNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -232,7 +232,12 @@ var bootstrap = function ($, learun) {
                             return cellvalue == true ? "男" : "女";
                         }
                     },
-                    { label: "出生日期", name: "Birthday", width: 100, align: "left" },
+                    {
+                        label: "出生日期", name: "Birthday", width: 100, align: "left",
+                        formatter: function (value) {
+                            return learun.formatDate(value, 'yyyy-MM-dd');
+                        }
+                    },
                     { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" },
                     {
                         label: "民族", name: "NationalityNo", width: 100, align: "left",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteer/IndexAccount.js

@@ -114,6 +114,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.SqlParameter = " and IsEnroll=1 "
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LessonInfo/LessonInfoService.cs

@@ -276,7 +276,28 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);
+                    var strSql = "";
+                    if (entity.WeekPracticeHour.ToString() == "")
+                    {
+                        strSql += " update LessonInfo set WeekPracticeHour = null where LessonId ='" + keyValue + "' ;";
+                    }
+                    if (entity.TotalStudyHour.ToString() == "")
+                    {
+                        strSql += " update LessonInfo set TotalStudyHour = null where LessonId ='" + keyValue + "' ;";
+                    }
+                    if (entity.StudyScore.ToString() == "")
+                    {
+                        strSql += " update LessonInfo set StudyScore = null where LessonId ='" + keyValue + "' ;";
+                    }
+                    if (entity.WeekStudyHour.ToString() == "")
+                    {
+                        strSql += " update LessonInfo set WeekStudyHour = null where LessonId ='" + keyValue + "' ;";
+                    }
                     this.BaseRepository("CollegeMIS").Update(entity);
+                    if (!string.IsNullOrEmpty(strSql))
+                    {
+                        BaseRepository("CollegeMIS").ExecuteBySql(strSql);
+                    }
                 }
                 else
                 {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs

@@ -64,11 +64,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("CARDNO")]
         public string CardNo { get; set; }
-        ///// <summary>
-        ///// 系所号
-        ///// </summary>
-        //[Column("DEPTNO")]
-        //public string DeptNo { get; set; }
+        /// <summary>
+        /// 系所号
+        /// </summary>
+        [Column("DEPTNO")]
+        public string DeptNo { get; set; }
         /// <summary>
         /// 专业
         /// </summary>
@@ -233,18 +233,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// 是否服从安排
         /// </summary>
+        [Column("ISPLAN")]
         public bool? IsPlan { get; set; }
         /// <summary>
         /// 准考证号
         /// </summary>
+        [Column("EXAMNO")]
         public string ExamNo { get; set; }
         /// <summary>
         /// 联系人
         /// </summary>
+        [Column("LINKMAN")]
         public string LinkMan { get; set; }
         /// <summary>
         /// 联系电话
         /// </summary>
+        [Column("LINKPHONE")]
+
         public string LinkPhone { get; set; }
 
         #endregion