From 78765963a5fb74b9df46b7fbfbca51338c42ae54 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Tue, 13 Jul 2021 15:57:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=AE=80=E5=8E=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/EmpInfoController.cs                      | 1 +
 .../EducationalAdministration/Views/EmpInfo/Print.cshtml  | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs
index b0b2b1079..5472caf07 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EmpInfoController.cs	
+++ b/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();
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml
index 57ad6fbd4..0d6556b68 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Print.cshtml	
+++ b/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>