StaffGroup update FieldValue_Object Attr

master
孤兰 2 months ago
parent 6df47339ca
commit af6b40a2f6
  1. 2
      Tiobon.Core.Model/Base/Ghra/Ghra_StaffGroupDetail.Dto.Base.cs
  2. 2
      Tiobon.Core.Model/Models/Ghra/Ghra_StaffGroupDetail.cs
  3. 38
      Tiobon.Core.Services/Ghra/Ghra_StaffGroupServices.cs

@ -47,7 +47,7 @@ namespace Tiobon.Core.Model.Models
/// 字段所选值
/// </summary>
[Display(Name = "FieldValue"), Description("字段所选值"), MaxLength(-1, ErrorMessage = "字段所选值 不能超过 -1 个字符")]
public string FieldValue { get; set; }
public object FieldValue { get; set; }
/// <summary>
/// 备注

@ -49,7 +49,7 @@ namespace Tiobon.Core.Model.Models
/// 字段所选值
/// </summary>
[Display(Name = "FieldValue"), Description("字段所选值"), MaxLength(-1, ErrorMessage = "字段所选值 不能超过 -1 个字符")]
public string FieldValue { get; set; }
public object FieldValue { get; set; }
/// <summary>
/// 备注

@ -60,7 +60,23 @@ namespace Tiobon.Core.Services
var StaffGroupDetail = await _StaffGroupDetailServices.Query(x => x.StaffGroupID == body.id);
result.result.DT_TableDataT1[0].StaffGroupDetail = StaffGroupDetail.OrderBy(x => x.SortNo).ToList();
result.result.DT_TableDataT1[0].StaffGroupDetail.ForEach((x) =>
{
if (x.FieldValue != null)
{
if (JsonHelper.IsJson(x.FieldValue.ToString()))
{
try
{
x.FieldValue = JsonHelper.JsonToObj<List<int>>(x.FieldValue.ToString());
}
catch (Exception)
{
x.FieldValue = JsonHelper.JsonToObj<List<string>>(x.FieldValue.ToString());
}
}
}
});
if (body.doType == "Copy")
{
result.result.DT_TableDataT1[0].StaffGroupNo = null;
@ -82,8 +98,8 @@ namespace Tiobon.Core.Services
return result;
}
public async Task<ServiceResult<object>> GetStaffInfoColumnData()
{
public async Task<ServiceResult<object>> GetStaffInfoColumnData()
{
string sql = @$"select StaffInfoColumnNo,
dbo.FLangKeyToValue(MKey,1,StaffInfoColumnName) StaffInfoColumnName,
ColumnType elementType,
@ -115,34 +131,34 @@ namespace Tiobon.Core.Services
and StaffInfoGroupId = 1
and IsRelease = 1
and StaffInfoColumnNo != 'AttachmentIDs' ";
var result = Db.Ado.SqlQuery<StaffInfoColumn>(sql);
result.ForEach( x =>
result.ForEach(x =>
{
x.operatorData = JsonConvert.DeserializeObject<List<OperatorData>>(x.OperatorDataStr);
x.operatorData = JsonConvert.DeserializeObject<List<OperatorData>>(x.OperatorDataStr);
});
return ServiceResult<object>.OprateSuccess("查询成功!", result);
}
public class StaffInfoColumn()
public class StaffInfoColumn()
{
public string StaffInfoColumnNo { get; set; }
public string StaffInfoColumnNo { get; set; }
public string StaffInfoColumnName { get; set; }
public string elementType { get; set; }
public string dataType { get; set; }
public string dataSourceType { get; set; }
public string dataSource { get; set; }
public int multipleSelectInt { get; set; }
public bool multipleSelect => multipleSelectInt==1?true :false;
public bool multipleSelect => multipleSelectInt == 1 ? true : false;
public string OperatorDataStr { get; set; }
public List<OperatorData> operatorData { get; set; }
public List<OperatorData> operatorData { get; set; }
}
public class OperatorData()
{
public string operatorNo { get; set; }
public string ParaDetailName { get; set; }
public string operatorIcon { get; set; }
public string SortNo { get; set; }
public string SortNo { get; set; }
}
}

Loading…
Cancel
Save