Commit 1ff9f0e7 by ruyun.zhang@suvalue.com

Merge branch 'feature/deptdetail' into v2020morge

parents 92803e8d ac7614ad
...@@ -172,6 +172,11 @@ public ApiResponse DeptDetail([FromBody] DeptDetailRequest request) ...@@ -172,6 +172,11 @@ public ApiResponse DeptDetail([FromBody] DeptDetailRequest request)
var response = _computeService.SpecialDeptDetail(second); var response = _computeService.SpecialDeptDetail(second);
return new ApiResponse(ResponseType.OK, response); return new ApiResponse(ResponseType.OK, response);
} }
else if (second != null && second.UnitType == UnitType.行政后勤.ToString())
{
var response = _computeService.DeptOfficeDetail(request.AccountID);
return new ApiResponse(ResponseType.OK, response);
}
else else
{ {
var response = _computeService.DeptDetail(request.AccountID); var response = _computeService.DeptDetail(request.AccountID);
......
...@@ -2706,6 +2706,9 @@ ...@@ -2706,6 +2706,9 @@
<member name="P:Performance.DtoModels.DetailDtos`1.GroupBasis"> <member name="P:Performance.DtoModels.DetailDtos`1.GroupBasis">
<summary> 分组依据 </summary> <summary> 分组依据 </summary>
</member> </member>
<member name="P:Performance.DtoModels.DetailModule.JobNumber">
<summary> 工号 </summary>
</member>
<member name="P:Performance.DtoModels.DetailModule.ItemName"> <member name="P:Performance.DtoModels.DetailModule.ItemName">
<summary> 明细项 </summary> <summary> 明细项 </summary>
</member> </member>
......
...@@ -67,6 +67,8 @@ public class DetailDtos : DetailDtos<DetailModule> ...@@ -67,6 +67,8 @@ public class DetailDtos : DetailDtos<DetailModule>
public class DetailModule public class DetailModule
{ {
/// <summary> 工号 </summary>
public string JobNumber { get; set; }
/// <summary> 明细项 </summary> /// <summary> 明细项 </summary>
public string ItemName { get; set; } public string ItemName { 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