lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
李鹏飞
2022-09-23 00:02:42 +08:00
parent 337cbbebe6 87582b0fa5
commit 08c2646ef1
34 changed files with 473 additions and 1635 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BLL.csproj
+1 -15
View File
@@ -64,9 +64,7 @@
<HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
@@ -113,25 +111,13 @@
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encodings.Web, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.5.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.5.0.0\lib\net461\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
SGGL/BLL/BaseInfo/PositionService.cs
+11
View File
@@ -20,6 +20,17 @@ namespace BLL
return Funs.DB.Base_Position.FirstOrDefault(e => e.PositionId == positionId);
}
public static string GetPositionNameById(string positionId)
{
string name =string.Empty;
var getData= Funs.DB.Base_Position.FirstOrDefault(e => e.PositionId == positionId);
if (getData != null)
{
name = getData.PositionName;
}
return name;
}
/// <summary>
/// 添加职务
/// </summary>
SGGL/BLL/Person/Person_PersonsService.cs
+15 -3
View File
@@ -107,6 +107,7 @@ namespace BLL
WorkPostName = WorkPostService.getWorkPostNamesWorkPostIds(x.WorkPostId),
x.PostTitleId,
PostTitleName = PostTitleService.getPostTitleNameById(x.PostTitleId),
x.PostTitleDate,
x.IsOffice,
x.RoleIds,
RoleName = RoleService.getRoleNamesRoleIds(x.RoleIds),
@@ -124,10 +125,21 @@ namespace BLL
x.PersonType,
PersonTypeName = DropListService.getPersonTypeNameByValue(x.PersonType),
x.ValidityDate,
x.IntoDate,
x.WorkDate,
x.RetirementDate,
PositionName = PositionService.GetPositionNameById(x.PositionId),
x.Graduate,
x.ForeignLanguage,
NationName = BasicDataService.GetDictNameByDictCode(x.Nation),
PoliticsStatusName = BasicDataService.GetDictNameByDictCode(x.PoliticsStatus),
MaritalStatusName = BasicDataService.GetDictNameByDictCode(x.MaritalStatus),
x.RelativeName,
x.RelativeTel,
};
}
#endregion
#region 根据主键获取人员信息
/// <summary>
/// 根据主键获取人员信息
@@ -584,7 +596,7 @@ namespace BLL
ForeignLanguage = person.ForeignLanguage,
CountryCode = person.CountryCode,
ProvinceCode = person.ProvinceCode,
IsPost = person.IsPost,
IsPost = person.IsPost ?? true,
Graduate = person.Graduate,
Major = person.Major,
IntoDate = person.IntoDate,
@@ -677,7 +689,7 @@ namespace BLL
newPerson.ForeignLanguage = person.ForeignLanguage;
newPerson.CountryCode = person.CountryCode;
newPerson.ProvinceCode = person.ProvinceCode;
newPerson.IsPost = person.IsPost;
newPerson.IsPost = person.IsPost ?? true;
newPerson.Graduate = person.Graduate;
newPerson.Major = person.Major;
newPerson.IntoDate = person.IntoDate;