教师简历信息调整

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs

@@ -148,6 +148,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                 foreach (var item in empInfo.PM_FamilySituationList)
                 {
                     item.Application = dataItemIBLL.GetDetailList("FamilyRelation").FirstOrDefault(x => x.F_ItemValue == item.Application)?.F_ItemName;
+                    item.PoliticalAffiliation = dataItemIBLL.GetDetailList("PolityStatus").FirstOrDefault(x => x.F_ItemValue == item.PoliticalAffiliation)?.F_ItemName;
                 }
                 //培训进修
                 empInfo.TeacherTrainList = teacherTrainIBLL.GetListByEmpId(empInfo.EmpId).OrderByDescending(x => x.TTStartTime).ToList();

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

@@ -53,7 +53,7 @@
                     <td colspan="6">
                         @foreach (var item in Model.PM_ResumeList)
                         {
-                            <div class="tableTxt">@(Model.PM_ResumeList.IndexOf(item) + 1)、@item.RTime @item.UnitName @item.DepartmentID @item.PostID</div>
+                        <div class="tableTxt">@(Model.PM_ResumeList.IndexOf(item) + 1)、@item.RTime 至 @item.RSTime  @item.UnitName @item.DepartmentID @item.PostID</div>
                         }
                     </td>
                 </tr>
@@ -62,7 +62,7 @@
                     <td colspan="6">
                         @foreach (var item in Model.PM_EducationExperienceList)
                         {
-                            <div class="tableTxt">@(Model.PM_EducationExperienceList.IndexOf(item) + 1)、@item.ETime @item.School @item.Major</div>
+                        <div class="tableTxt">@(Model.PM_EducationExperienceList.IndexOf(item) + 1)、@item.ETime 至 @item.ESTime  @item.School @item.Major</div>
                         }
                     </td>
                 </tr>
@@ -76,7 +76,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td>奖罚情况</td>
+                    <td>奖惩情况</td>
                     <td colspan="6">
                         @foreach (var item in Model.TeacherEncourgementList)
                         {
@@ -93,7 +93,7 @@
                     <td colspan="6" style="padding: 0;">
                         @foreach (var item in Model.PM_FamilySituationList)
                         {
-                            <div class="tableTxt">@(Model.PM_FamilySituationList.IndexOf(item) + 1)、@item.Application @item.Name @item.UnitAndPost</div>
+                        <div class="tableTxt">@(Model.PM_FamilySituationList.IndexOf(item) + 1)、@item.Application @item.Name @item.Birthday   @item.PoliticalAffiliation @item.UnitAndPost</div>
                         }
                     </td>
                 </tr>