gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎1、修改实体字典和打印模板字段 2、调整头像上传页面布局 3、钉钉插件更新

Browse Source
This commit is contained in:
zuohuaijun 2024-06-29 01:02:34 +08:00
parent c4e40e4077
commit 280d94fd86
8 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Admin.NET/Admin.NET.Core/Entity/SysDictData.cs
View File

@ -38,15 +38,15 @@ public partial class SysDictData : EntityBase
/// <summary>
/// 编码
/// </summary>
[SugarColumn(ColumnDescription = "编码", Length = 128)]
[Required, MaxLength(128)]
[SugarColumn(ColumnDescription = "编码", Length = 256)]
[Required, MaxLength(256)]
public virtual string Code { get; set; }
/// <summary>
/// 名称
/// </summary>
[SugarColumn(ColumnDescription = "名称", Length = 128)]
[MaxLength(128)]
[SugarColumn(ColumnDescription = "名称", Length = 256)]
[MaxLength(256)]
public virtual string? Name { get; set; }
/// <summary>

2
Admin.NET/Admin.NET.Core/Entity/SysPrint.cs
View File

@ -45,7 +45,7 @@ public partial class SysPrint : EntityTenant
/// <summary>
/// 打印参数
/// </summary>
[SugarColumn(ColumnDescription = "打印参数", ColumnDataType = "text")]
[SugarColumn(ColumnDescription = "打印参数", ColumnDataType = StaticConfig.CodeFirst_BigString)]
public virtual string? PrintParam { get; set; }
/// <summary>

2
Admin.NET/Admin.NET.Core/Logging/ElasticSearchLoggingWriter.cs
View File

@ -88,6 +88,8 @@ public class ElasticSearchLoggingWriter : IDatabaseLoggingWriter, IDisposable
CreateUserId = string.IsNullOrWhiteSpace(userId) ? 0 : long.Parse(userId),
TenantId = string.IsNullOrWhiteSpace(tenantId) ? 0 : long.Parse(tenantId)
};
// IndexName indexName = "my_index"; // 自定义 index
await _esClient.IndexAsync(sysLogOp);
}

13
Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Const/DingTalkConst.cs
View File

@ -31,4 +31,17 @@ public class DingTalkConst
/// 工号
/// </summary>
public const string JobNumberField = "sys00-jobNumber";
/// <summary>
/// 主部门Id
/// </summary>
public const string DeptId = "sys00-mainDeptId";
/// <summary>
/// 主部门
/// </summary>
public const string Dept = "sys00-mainDept";
/// <summary>
/// 职位
/// </summary>
public const string Position = "sys00-position";
}

19
Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Entity/DingTalkUser.cs
View File

@ -73,4 +73,23 @@ public class DingTalkUser : EntityBase
[SugarColumn(ColumnDescription = "工号", Length = 16)]
[MaxLength(16)]
public string? JobNumber { get; set; }
/// <summary>
/// 主部门Id
/// </summary>
[SugarColumn(ColumnDescription = "主部门Id", Length = 16)]
[MaxLength(16)]
public string? DeptId { get; set; }
/// <summary>
/// 主部门
/// </summary>
[SugarColumn(ColumnDescription = "主部门", Length = 16)]
[MaxLength(16)]
public string? Dept { get; set; }
/// <summary>
/// 职位
/// </summary>
[SugarColumn(ColumnDescription = "职位", Length = 16)]
[MaxLength(16)]
public string? Position { get; set; }
}

14
Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Job/SyncDingTalkUserJob.cs
View File

@ -95,6 +95,9 @@ public class SyncDingTalkUserJob : IJob
Name = res.FieldDataList.Where(u => u.FieldCode == DingTalkConst.NameField).Select(u => u.FieldValueList.Select(m => m.Value).FirstOrDefault()).FirstOrDefault(),
Mobile = res.FieldDataList.Where(u => u.FieldCode == DingTalkConst.MobileField).Select(u => u.FieldValueList.Select(m => m.Value).FirstOrDefault()).FirstOrDefault(),
JobNumber = res.FieldDataList.Where(u => u.FieldCode == DingTalkConst.JobNumberField).Select(u => u.FieldValueList.Select(m => m.Value).FirstOrDefault()).FirstOrDefault(),
DeptId = res.FieldDataList.Where(u => u.FieldCode == DingTalkConst.DeptId).Select(u => u.FieldValueList.Select(m => m.Value).FirstOrDefault()).FirstOrDefault(),
Dept = res.FieldDataList.Where(u => u.FieldCode == DingTalkConst.Dept).Select(u => u.FieldValueList.Select(m => m.Value).FirstOrDefault()).FirstOrDefault(),
Position = res.FieldDataList.Where(u => u.FieldCode == DingTalkConst.Position).Select(u => u.FieldValueList.Select(m => m.Value).FirstOrDefault()).FirstOrDefault(),
}).ToList();
if (iUser.Count > 0)
{
@ -109,6 +112,9 @@ public class SyncDingTalkUserJob : IJob
Name = res.FieldDataList.Where(u => u.FieldCode == DingTalkConst.NameField).Select(u => u.FieldValueList.Select(m => m.Value).FirstOrDefault()).FirstOrDefault(),
Mobile = res.FieldDataList.Where(u => u.FieldCode == DingTalkConst.MobileField).Select(u => u.FieldValueList.Select(m => m.Value).FirstOrDefault()).FirstOrDefault(),
JobNumber = res.FieldDataList.Where(u => u.FieldCode == DingTalkConst.JobNumberField).Select(u => u.FieldValueList.Select(m => m.Value).FirstOrDefault()).FirstOrDefault(),
DeptId = res.FieldDataList.Where(u => u.FieldCode == DingTalkConst.DeptId).Select(u => u.FieldValueList.Select(m => m.Value).FirstOrDefault()).FirstOrDefault(),
Dept = res.FieldDataList.Where(u => u.FieldCode == DingTalkConst.Dept).Select(u => u.FieldValueList.Select(m => m.Value).FirstOrDefault()).FirstOrDefault(),
Position = res.FieldDataList.Where(u => u.FieldCode == DingTalkConst.Position).Select(u => u.FieldValueList.Select(m => m.Value).FirstOrDefault()).FirstOrDefault(),
}).ToList();
if (uUser.Count > 0)
{
@ -118,6 +124,9 @@ public class SyncDingTalkUserJob : IJob
u.Name,
u.Mobile,
u.JobNumber,
u.DeptId,
u.Dept,
u.Position,
u.UpdateTime,
u.UpdateUserName,
u.UpdateUserId,
@ -137,7 +146,10 @@ public class SyncDingTalkUserJob : IJob
{
u.Id,
u.JobNumber,
u.Mobile
u.Mobile,
u.DeptId,
u.Dept,
u.Position
}).ToListAsync();
var uSysDingTalkUser = sysDingTalkUser.Select(u => new DingTalkUser
{

2
Admin.NET/Plugins/Admin.NET.Plugin.DingTalk/Service/Dto/GetDingTalkCurrentEmployeesRosterListInput.cs
View File

@ -25,5 +25,7 @@ public class GetDingTalkCurrentEmployeesRosterListInput
/// <summary>
/// 应用的AgentId
/// </summary>
[Newtonsoft.Json.JsonProperty("agentid")]
[System.Text.Json.Serialization.JsonPropertyName("agentid")]
public string AgentId { get; set; }
}

2
Web/src/components/cropper/index.vue
View File

@ -37,7 +37,7 @@
:auto-upload="false"
:on-change="selectPicture"
:on-exceed="selectPictureExceed"
style="display: inline-block; position: absolute; right: 172px"
style="display: inline-block; position: absolute; right: 182px"
>
<el-button icon="ele-Picture">选择图片</el-button>
</el-upload>