Commit 791e75c6 by lcx

接口内容调整

parent c9a93855
diff a/performance/Performance.Api/Controllers/EmployeeController.cs b/performance/Performance.Api/Controllers/EmployeeController.cs (rejected hunks)
@@ -824,6 +824,7 @@
if (allotId <= 0)
return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效");
+ var result = employeeService.GetGatherTotal(allotId, request);
return new ApiResponse(ResponseType.OK, result);
}
...@@ -257,7 +257,7 @@ public AutoMapperConfigs() ...@@ -257,7 +257,7 @@ public AutoMapperConfigs()
.ForMember(dest => dest.TypeId, opt => opt.MapFrom(src => src.Id)) .ForMember(dest => dest.TypeId, opt => opt.MapFrom(src => src.Id))
.ReverseMap(); .ReverseMap();
CreateMap<ex_script, ExtractScriptConfig>() CreateMap<ex_script, ExtractConfigResponse>()
.ForMember(dest => dest.ExScriptId, opt => opt.MapFrom(src => src.Id)) .ForMember(dest => dest.ExScriptId, opt => opt.MapFrom(src => src.Id))
.ReverseMap(); .ReverseMap();
} }
......
...@@ -8,19 +8,16 @@ public class ExtractConfigResponse ...@@ -8,19 +8,16 @@ public class ExtractConfigResponse
public string EName { get; set; } public string EName { get; set; }
public string Description { get; set; }
public int Source { get; set; } public int Source { get; set; }
public string SheetType { get; set; } public string SheetType { get; set; }
public decimal TotalTime { get; set; } public string Description { get; set; }
public List<ExtractScriptConfig> Children { get; set; } = new List<ExtractScriptConfig>(); public decimal TimeConsuming { get; set; }
}
#region Children
public class ExtractScriptConfig
{
public int ExScriptId { get; set; } public int ExScriptId { get; set; }
public string ExecScript { get; set; } public string ExecScript { get; set; }
...@@ -29,12 +26,12 @@ public class ExtractScriptConfig ...@@ -29,12 +26,12 @@ public class ExtractScriptConfig
public string ConfigName { get; set; } public string ConfigName { get; set; }
public int IsEnable { get; set; }
public int IsExecSuccess { get; set; } public int IsExecSuccess { get; set; }
public string ErrorMessage { get; set; } public int IsEnable { get; set; }
public decimal TimeConsuming { get; set; } #endregion
public List<ExtractConfigResponse> Children { get; set; } = new List<ExtractConfigResponse>();
} }
} }
namespace Performance.DtoModels
{
public class HospitalConfigResponse
{
public int Id { get; set; }
public string ConfigName { get; set; }
public string DbSource { get; set; }
public string DbName { get; set; }
public string DbUser { get; set; }
public string DbPassword { get; set; }
public string DataBaseType { get; set; }
public string IsConnectioned { get; set; }
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment