From 39b6a686ab59135e63a44ab206fd8ca361878f91 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 17 十二月 2024 16:59:36 +0800
Subject: [PATCH] 统一资产图标
---
BLL/HStation.BLL.Organize.Core/03-localclient/EmployeeMain.cs | 78 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/BLL/HStation.BLL.Organize.Core/03-localclient/EmployeeMain.cs b/BLL/HStation.BLL.Organize.Core/03-localclient/EmployeeMain.cs
index d7f0047..64c234e 100644
--- a/BLL/HStation.BLL.Organize.Core/03-localclient/EmployeeMain.cs
+++ b/BLL/HStation.BLL.Organize.Core/03-localclient/EmployeeMain.cs
@@ -1,5 +1,4 @@
锘縰sing HStation.Dto;
-using Mapster;
using Yw.Dto;
namespace HStation.CAL.LocalClient
@@ -37,6 +36,7 @@
return model == null ? null : new EmployeeMainDto(model);
});
}
+
/// <summary>
/// 閫氳繃缂栧彿鑾峰彇
/// </summary>
@@ -71,56 +71,56 @@
/// <summary>
/// 鎻掑叆涓�鏉�
/// </summary>
- public async Task<long> Insert(Dto.UpdateEmployeeMainDto input)
+ public async Task<long> Insert(Dto.AddEmployeeMainInput input)
{
return await Task.Factory.StartNew(() =>
{
- var model = input.Adapt<Dto.UpdateEmployeeMainDto, Model.EmployeeMain>();
+ var model = input.Adapt<Dto.AddEmployeeMainInput, Model.EmployeeMain>();
model.SortCode = _service.GetMaxSortCode() + 1;
var id = _service.Insert(model);
return id;
});
}
- /// <summary>
- /// 鎻掑叆鍛樺伐鎷撳睍(鍖呭惈鐧诲綍鐢ㄦ埛)
- /// </summary>
- public async Task<long> InsertLoginUserEx(Dto.UpdateEmployeeMainDto employeeMainDto, AddUserLoginMapDto loginmapdto, AddLoginUserMainDto loginuserdto)
- {
- return await Task.Factory.StartNew(() =>
- {
- var employeemodel = employeeMainDto.Adapt<Dto.UpdateEmployeeMainDto, Model.EmployeeMain>();
- employeemodel.SortCode = _service.GetMaxSortCode() + 1;
- var loginmapmodel = loginmapdto.Adapt<AddUserLoginMapDto, Model.UserLoginMap>();
- var loginusermodel = loginuserdto.Adapt<AddLoginUserMainDto, Model.LoginUserMain>();
- var id = _service.InsertLoginEx(employeemodel, loginmapmodel, loginusermodel);
- return id;
- });
- }
+ /* /// <summary>
+ /// 鎻掑叆鍛樺伐鎷撳睍
+ /// </summary>
+ public async Task<EmployeeAndLoginID> InsertEx(Dto.AddEmployeeMainInput employeeMainDto)
+ {
+ return await await Task.Factory.StartNew(async () =>
+ {
+ var employeemodel = employeeMainDto.Adapt<Dto.AddEmployeeMainInput, Model.EmployeeMain>();
+ if (employeemodel.SortCode < 0)
+ employeemodel.SortCode = _service.GetMaxSortCode() + 1;
- /// <summary>
- /// 鎻掑叆鍛樺伐鎷撳睍(涓嶅寘鍚櫥褰曠敤鎴�)
- /// </summary>
- public async Task<long> InsertEx(Dto.UpdateEmployeeMainDto employeeMainDto, AddUserLoginMapDto loginmapdto)
- {
- return await Task.Factory.StartNew(() =>
- {
- var employeemodel = employeeMainDto.Adapt<Dto.UpdateEmployeeMainDto, Model.EmployeeMain>();
- employeemodel.SortCode = _service.GetMaxSortCode() + 1;
- var loginmapmodel = loginmapdto.Adapt<AddUserLoginMapDto, Model.UserLoginMap>();
- var id = _service.InsertEx(employeemodel, loginmapmodel);
- return id;
- });
- }
+ var loginmapmodel = employeeMainDto.User.Adapt<AddUserLoginAccount, Model.UserLoginAccount>();
+ var id = _service.InsertEx(employeemodel, loginmapmodel);
+ if (id > 0)
+ {
+ EmployeeAndLoginID iDList = new EmployeeAndLoginID();
+ iDList.EmployeeID = id;
+ var loginmodel = await new UserLoginAccount().GetLoginUserByEmployeeID(id);
+ if (loginmodel != null)
+ {
+ iDList.LoginID = loginmodel.ID;
+ }
+ return iDList;
+ }
+ else
+ {
+ return null;
+ }
+ });
+ }*/
/// <summary>
/// 鎵归噺鎻掑叆
/// </summary>
- public async Task<bool> Inserts(List<Dto.UpdateEmployeeMainDto> inputList)
+ public async Task<bool> Inserts(List<Dto.AddEmployeeMainInput> inputList)
{
return await Task.Factory.StartNew(() =>
{
- var list = inputList.Select(x => x.Adapt<Dto.UpdateEmployeeMainDto, Model.EmployeeMain>()).ToList();
+ var list = inputList.Select(x => x.Adapt<Dto.AddEmployeeMainInput, Model.EmployeeMain>()).ToList();
list.ForEach(x =>
{
x.SortCode = _service.GetMaxSortCode() + 1 + list.IndexOf(x);
@@ -133,7 +133,7 @@
/// <summary>
/// 澶ф壒閲忔彃鍏�
/// </summary>
- public async Task<bool> BulkInserts(List<Dto.UpdateEmployeeMainDto> list)
+ public async Task<bool> BulkInserts(List<Dto.AddEmployeeMainInput> list)
{
return await Task.Factory.StartNew(() =>
{
@@ -148,7 +148,7 @@
/// <summary>
/// 鏇存柊涓�鏉�
/// </summary>
- public async Task<bool> Update(Dto.Assets.UpdateEmployeeMainDto input)
+ public async Task<bool> Update(Dto.UpdateEmployeeMainDto input)
{
return await Task.Factory.StartNew(() =>
{
@@ -168,7 +168,7 @@
/// <summary>
/// 鎵归噺鏇存柊
/// </summary>
- public async Task<bool> Updates(List<Dto.Assets.UpdateEmployeeMainDto> inputList)
+ public async Task<bool> Updates(List<Dto.UpdateEmployeeMainDto> inputList)
{
return await Task.Factory.StartNew(() =>
{
@@ -176,7 +176,7 @@
{
return false;
}
- var list = inputList.Select(x => x.Adapt<Dto.Assets.UpdateEmployeeMainDto, Model.EmployeeMain>()).ToList();
+ var list = inputList.Select(x => x.Adapt<Dto.UpdateEmployeeMainDto, Model.EmployeeMain>()).ToList();
var bol = _service.Updates(list);
return bol;
});
@@ -185,7 +185,7 @@
/// <summary>
/// 澶ф壒閲忔洿鏂�
/// </summary>
- public async Task<bool> BulkUpdates(List<Dto.Assets.UpdateEmployeeMainDto> list)
+ public async Task<bool> BulkUpdates(List<Dto.UpdateEmployeeMainDto> list)
{
return await Task.Factory.StartNew(() =>
{
--
Gitblit v1.9.3