Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

班组管理重大更新：组变为基本数据

Browse Source
This commit is contained in:
qianhao.xu
2025-03-19 13:44:59 +08:00
parent afd800732e
commit a0ec3319b2
9 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
DOAN.Admin.WebApi/Controllers/MES/Group/GroupPersonOfSkillMatrixController.cs
View File

@@ -24,10 +24,17 @@ namespace DOAN.Admin.WebApi.Controllers
//TODO 1 获取班组
//[HttpGet("get_all_group")]
//public IActionResult GetAllGroups(DateTime date)
//{
// var response = _SkillMatrixService.GetAllGroups(date.Date);
// return SUCCESS(response);
//}
[HttpGet("get_all_group")]
public IActionResult GetAllGroups(DateTime date)
public IActionResult GetAllGroups()
{
var response = _SkillMatrixService.GetAllGroups(date.Date);
var response = _SkillMatrixService.GetAllGroups();
return SUCCESS(response);
}
@@ -44,11 +51,11 @@ namespace DOAN.Admin.WebApi.Controllers
//TODO 3 根据班组获取人员
[HttpGet("get_persons")]
public IActionResult GetPersonsList(string group_schedule_id) {
public IActionResult GetPersonsList(string group_code) {
if (string.IsNullOrWhiteSpace(group_schedule_id)) { return SUCCESS(null); }
if (string.IsNullOrWhiteSpace(group_code)) { return SUCCESS(null); }
var response = _SkillMatrixService.GetPersonsList(group_schedule_id);
var response = _SkillMatrixService.GetPersonsList(group_code);
return SUCCESS(response);
}

16
DOAN.Admin.WebApi/Controllers/MES/Group/GroupScheduleController.cs
View File

@@ -34,7 +34,7 @@ namespace DOAN.Admin.WebApi.Controllers
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
// [ActionPermissionFilter(Permission = "business:groupschedule:list")]
//[ActionPermissionFilter(Permission = "business:groupschedule:list")]
public IActionResult QueryGroupSchedule([FromQuery] GroupScheduleQueryDto parm)
{
var response = _GroupScheduleService.GetList(parm);
@@ -187,21 +187,19 @@ namespace DOAN.Admin.WebApi.Controllers
{
return SUCCESS(null);
}
var response = _GroupScheduleService.SearchPerson_group_bind_No(parm);
return SUCCESS(response);
}
//TODO 班组添加人员
[HttpGet("add_person")]
public IActionResult GroupAddPerson(string group_schedule_id, string person_id)
public IActionResult GroupAddPerson(string group_code, string person_id)
{
if (string.IsNullOrEmpty(group_schedule_id)) { return SUCCESS(null); }
if (string.IsNullOrEmpty(group_code)) { return SUCCESS(null); }
if (string.IsNullOrEmpty(person_id)) { return SUCCESS(null); }
var response = _GroupScheduleService
.GroupAddPerson(group_schedule_id, person_id, HttpContext.GetName());
.GroupAddPerson(group_code, person_id, HttpContext.GetName());
return SUCCESS(response);
}
@@ -209,14 +207,14 @@ namespace DOAN.Admin.WebApi.Controllers
//TODO 班组删除人员
[HttpGet("delete_person")]
public IActionResult GroupRemovePerson(string group_schedule_id, string person_id)
public IActionResult GroupRemovePerson(string group_code, string person_id)
{
if (string.IsNullOrEmpty(group_schedule_id)) { return SUCCESS(null); }
if (string.IsNullOrEmpty(group_code)) { return SUCCESS(null); }
if (string.IsNullOrEmpty(person_id)) { return SUCCESS(null); }
var response = _GroupScheduleService
.GroupRemovePerson(group_schedule_id, person_id);
.GroupRemovePerson(group_code, person_id);
return SUCCESS(response);
}