页面修改

Edu.Common/Plugin/ConvertHelper.cs

@@ -7,6 +7,7 @@ using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using System.Xml.Serialization;
 
 namespace Edu.Common
 {
@@ -669,5 +670,25 @@ namespace Edu.Common
             TimeSpan toNow = new TimeSpan(lTime);
             return dtStart.Add(toNow);
         }
+
+        /// <summary>
+        /// 克隆对象
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static T Clone<T>(T obj)
+        {
+            T ret = default(T);
+            if (obj != null)
+            {
+                XmlSerializer cloner = new XmlSerializer(typeof(T));
+                MemoryStream stream = new MemoryStream();
+                cloner.Serialize(stream, obj);
+                stream.Seek(0, SeekOrigin.Begin);
+                ret = (T)cloner.Deserialize(stream);
+            }
+            return ret;
+        }
     }
 }
\ No newline at end of file

Edu.Module.User/TeacherAssessmentModule.cs

@@ -519,7 +519,42 @@ namespace Edu.Module.User
         }
 
 
+        /// <summary>
+        /// 新增修改考核表现
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetTeacherAssessmentInfoModule(RB_Teacher_Assessment_Extend model)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Teacher_Assessment_Extend.Behavior),model.Behavior },
+                {nameof(RB_Teacher_Assessment_Extend.Advantage),model.Advantage },
+                {nameof(RB_Teacher_Assessment_Extend.ShortComing),model.ShortComing },
+                {nameof(RB_Teacher_Assessment_Extend.Potential),model.Potential },
+                {nameof(RB_Teacher_Assessment_Extend.PotentialOther),model.PotentialOther },
+            };
+            bool flag = teacher_AssessmentRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_Assessment_Extend.Id), model.Id));
+            return flag;
+        }
 
+        /// <summary>
+        /// 员工提交建议和意见等
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool TeacherSetHelpModule(RB_Teacher_Assessment_Extend model)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Teacher_Assessment_Extend.Help),model.Help },
+                {nameof(RB_Teacher_Assessment_Extend.Suggest),model.Suggest },
+                {nameof(RB_Teacher_Assessment_Extend.Other),model.Other },
+                {nameof(RB_Teacher_Assessment_Extend.TeacherSignDate),model.TeacherSignDate },
+            };
+            bool flag = teacher_AssessmentRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_Assessment_Extend.Id), model.Id));
+            return flag;
+        }
         #endregion
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/DataService/TeacherAssessmentController.cs

@@ -184,7 +184,16 @@ namespace Edu.WebApi.Controllers.DataService
                     item.TeacherScore,
                     item.JiaoWuScore,
                     item.TotalScore,
-                    CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime)
+                    CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
+                    item.Behavior,
+                    item.Advantage,
+                    item.ShortComing,
+                    item.Potential,
+                    item.PotentialOther,
+                    item.Help,
+                    item.Suggest,
+                    item.Other,
+                    TeacherSignDate= Common.ConvertHelper.FormatTime(item.TeacherSignDate)
                 });
             }
             pageModel.Count = rowsCount;
@@ -299,6 +308,46 @@ namespace Edu.WebApi.Controllers.DataService
             var flag = teacherAssessmentModule.SaveTeacherAssessmentModule(model);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
+
+        /// <summary>
+        /// 新增修改考核表现
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetTeacherAssessmentInfo()
+        {
+            var model = new RB_Teacher_Assessment_Extend()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+                Behavior = base.ParmJObj.GetStringValue("Behavior"),
+                Advantage = base.ParmJObj.GetStringValue("Advantage"),
+                ShortComing = base.ParmJObj.GetStringValue("ShortComing"),
+                Potential = base.ParmJObj.GetStringValue("Potential"),
+                PotentialOther = base.ParmJObj.GetStringValue("PotentialOther"),
+            };
+            bool flag = teacherAssessmentModule.SetTeacherAssessmentInfoModule(model);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 员工提交建议和意见等
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult TeacherSetHelp()
+        {
+            var model = new RB_Teacher_Assessment_Extend()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+                Help = base.ParmJObj.GetStringValue("Help"),
+                Suggest = base.ParmJObj.GetStringValue("Suggest"),
+                Other = base.ParmJObj.GetStringValue("Other"),
+            };
+            model.TeacherSignDate = DateTime.Now;
+            bool flag = teacherAssessmentModule.TeacherSetHelpModule(model);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
         #endregion
     }
 }