|
|
|
@ -39,6 +39,11 @@ public class CommonService : ICommonService
|
|
|
|
|
private readonly IWebHostEnvironment _environment;
|
|
|
|
|
private readonly ILogger<CommonService> _logger;
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 任务台基础表自定义列对应的Code
|
|
|
|
|
/// </summary>
|
|
|
|
|
private const string TASK_PLAT_BASIC_CODE = "BASIC";
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
///
|
|
|
|
|
/// </summary>
|
|
|
|
@ -1438,12 +1443,23 @@ public class CommonService : ICommonService
|
|
|
|
|
|
|
|
|
|
foreach (var item in taskTypeCodeArray)
|
|
|
|
|
{
|
|
|
|
|
if (Enum.TryParse(typeof(TaskBaseTypeEnum), item, out object? typeEnum))
|
|
|
|
|
if (item.ToUpper() == TASK_PLAT_BASIC_CODE)
|
|
|
|
|
{
|
|
|
|
|
var typeInt = (int)typeEnum;
|
|
|
|
|
var typeInt = -1;
|
|
|
|
|
if (!tagNoDic.ContainsKey(typeInt))
|
|
|
|
|
{
|
|
|
|
|
tagNoDic.Add(typeInt, item);
|
|
|
|
|
tagNoDic.Add(typeInt, TASK_PLAT_BASIC_CODE);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (Enum.TryParse(typeof(TaskBaseTypeEnum), item, out object? typeEnum))
|
|
|
|
|
{
|
|
|
|
|
var typeInt = (int)typeEnum;
|
|
|
|
|
if (!tagNoDic.ContainsKey(typeInt))
|
|
|
|
|
{
|
|
|
|
|
tagNoDic.Add(typeInt, item);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -1517,7 +1533,11 @@ public class CommonService : ICommonService
|
|
|
|
|
public async Task<DataResult> UpdateUserTaskPlatFieldSet(UserFieldSetUpdateReq req)
|
|
|
|
|
{
|
|
|
|
|
int tagNo;
|
|
|
|
|
if (Enum.TryParse(typeof(TaskBaseTypeEnum), req.TaskTypeCode, out object? type))
|
|
|
|
|
if (req.TaskTypeCode.ToUpper() == TASK_PLAT_BASIC_CODE)
|
|
|
|
|
{
|
|
|
|
|
tagNo = -1;
|
|
|
|
|
}
|
|
|
|
|
else if (Enum.TryParse(typeof(TaskBaseTypeEnum), req.TaskTypeCode, out object? type))
|
|
|
|
|
{
|
|
|
|
|
tagNo = (int)type;
|
|
|
|
|
}
|
|
|
|
|