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

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingManagementApi.cs

@@ -2,6 +2,8 @@
 using Learun.Util;
 using System.Collections.Generic;
 using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System;
+
 namespace Learun.Application.WebApi
 {
     /// <summary>
@@ -66,8 +68,9 @@ namespace Learun.Application.WebApi
         public Response GetForm(dynamic _)
         {
             string keyValue = this.GetReqData();
-            var MeetingManagementData = meetingManagementIBLL.GetMeetingManagementEntity( keyValue );
-            var jsonData = new {
+            var MeetingManagementData = meetingManagementIBLL.GetMeetingManagementEntity(keyValue);
+            var jsonData = new
+            {
                 MeetingManagement = MeetingManagementData,
             };
             return Success(jsonData);
@@ -96,7 +99,10 @@ namespace Learun.Application.WebApi
         {
             ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
             MeetingManagementEntity entity = parameter.strEntity.ToObject<MeetingManagementEntity>();
-            meetingManagementIBLL.SaveEntity(this.userInfo,parameter.keyValue,entity);
+            entity.CreateUser = userInfo.userId;
+            entity.CreateTime = DateTime.Now;
+            entity.CheckStatus = "0";
+            meetingManagementIBLL.SaveEntity(this.userInfo, parameter.keyValue, entity);
             return Success("保存成功！");
         }
         #endregion
@@ -106,9 +112,10 @@ namespace Learun.Application.WebApi
         /// <summary>
         /// 表单实体类
         /// <summary>
-        private class ReqFormEntity {
+        private class ReqFormEntity
+        {
             public string keyValue { get; set; }
-            public string strEntity{ get; set; }
+            public string strEntity { get; set; }
         }
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingManagement/MeetingManagementService.cs

@@ -232,7 +232,6 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 else
                 {
                     entity.Create(userInfo);
-                    entity.CreateTime = DateTime.Now;
                     db.Insert(entity);
                 }