From 71f298001be74511a64b89bbd50dad0736392a7e Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Wed, 27 Jul 2022 10:38:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E8=82=B2=E7=BB=8F=E5=8E=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/PM_EducationExperience/Form.cshtml  | 32 +++++++++++--------
 .../Views/PM_EducationExperience/Index.js     |  3 +-
 .../Views/PM_Resume/Form.cshtml               |  4 +--
 .../PM_EducationExperienceEntity.cs           |  5 +++
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.cshtml
index 34a570a19..f0b1610ab 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.cshtml	
@@ -3,37 +3,41 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
-        <div class="lr-form-item-title">时间<font face="宋体">*</font></div>
-        <input id="ETime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#ETime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    <div class="col-xs-6 lr-form-item" data-table="PM_EducationExperience">
+        <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
+        <input id="STime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#ETime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-6 lr-form-item" data-table="PM_EducationExperience">
+        <div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
+        <input id="ETime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd HH:mm', onpicked: function() { $('#ETime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <div class="lr-form-item-title">学校<font face="宋体">*</font></div>
         <input id="School" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <input id="Major" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <div class="lr-form-item-title">学历<font face="宋体">*</font></div>
-        <div id="Education" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="Education" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <div class="lr-form-item-title">学位</div>
         <div id="AcademicDegree"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <div class="lr-form-item-title">学制</div>
-        <div id="EducationalSystem"  ></div>
+        <div id="EducationalSystem"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <div class="lr-form-item-title">专业描述</div>
-        <textarea id="Describe" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Describe" class="form-control" style="height: 100px;"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="PM_EducationExperience" >
+    <div class="col-xs-12 lr-form-item" data-table="PM_EducationExperience">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/PM_EducationExperience/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js
index fb46810cb..baea3c994 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_EducationExperience/Index.js	
@@ -114,7 +114,8 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/PM_EducationExperience/GetPageList',
                 headData: [
-                    { label: "时间", name: "ETime", width: 130, align: "left" },
+                    { label: "开始时间", name: "STime", width: 130, align: "left" },
+                    { label: "结束时间", name: "ETime", width: 130, align: "left" },
                     { label: "学校", name: "School", width: 100, align: "left" },
                     { label: "专业", name: "Major", width: 100, align: "left" },
                     {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml
index 98e4ab6f1..53e88f8fe 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/PM_Resume/Form.cshtml	
@@ -4,11 +4,11 @@
 }
 <div class="lr-form-wrap">
     <div class="col-xs-6 lr-form-item" data-table="PM_Resume">
-        <div class="lr-form-item-title">时间<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">开始时间<font face="宋体">*</font></div>
         <input id="RTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#RTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="PM_Resume">
-        <div class="lr-form-item-title">时间<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">结束时间<font face="宋体">*</font></div>
         <input id="ETime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#RTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="PM_Resume">
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_EducationExperience/PM_EducationExperienceEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_EducationExperience/PM_EducationExperienceEntity.cs
index 2bcb33872..b879f7f8e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_EducationExperience/PM_EducationExperienceEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/PM_EducationExperience/PM_EducationExperienceEntity.cs	
@@ -27,6 +27,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// 时间
         /// </summary>
+        [Column("STIME")]
+        public DateTime? STime { get; set; }
+        /// <summary>
+        /// 时间
+        /// </summary>
         [Column("ETIME")]
         public DateTime? ETime { get; set; }
         /// <summary>