diff --git a/DOAN.Admin.WebApi/Controllers/MES/group/GroupPersonSkillMatrixController.cs b/DOAN.Admin.WebApi/Controllers/MES/group/GroupPersonSkillMatrixController.cs index 10fbe7f..2ff8d92 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/group/GroupPersonSkillMatrixController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/group/GroupPersonSkillMatrixController.cs @@ -11,7 +11,7 @@ namespace DOAN.Admin.WebApi.Controllers /// 人员技能矩阵图 /// [Verify] - [Route("mes/groupManagement/GroupPersonSkillMatrix")] + [Route("mes/groupManagement/GroupPersonSkill")] public class GroupPersonSkillMatrixController : BaseController { /// @@ -30,7 +30,7 @@ namespace DOAN.Admin.WebApi.Controllers /// /// [HttpGet("list")] - [ActionPermissionFilter(Permission = "groupManagement:grouppersonskillmatrix:list")] + [ActionPermissionFilter(Permission = "groupManagement:GroupPersonSkill:list")] public IActionResult QueryGroupPersonSkillMatrix([FromQuery] GroupPersonSkillMatrixQueryDto parm) { var response = _GroupPersonSkillMatrixService.GetList(parm); @@ -44,12 +44,12 @@ namespace DOAN.Admin.WebApi.Controllers /// /// [HttpGet("{Id}")] - [ActionPermissionFilter(Permission = "groupManagement:grouppersonskillmatrix:query")] + [ActionPermissionFilter(Permission = "groupManagement:GroupPersonSkill:query")] public IActionResult GetGroupPersonSkillMatrix(string Id) { var response = _GroupPersonSkillMatrixService.GetInfo(Id); - var info = response.Adapt(); + var info = response.Adapt(); return SUCCESS(info); } @@ -58,11 +58,11 @@ namespace DOAN.Admin.WebApi.Controllers /// /// [HttpPost] - [ActionPermissionFilter(Permission = "groupManagement:grouppersonskillmatrix:add")] + [ActionPermissionFilter(Permission = "groupManagement:GroupPersonSkill:add")] [Log(Title = "人员技能矩阵图", BusinessType = BusinessType.INSERT)] public IActionResult AddGroupPersonSkillMatrix([FromBody] GroupPersonSkillMatrixDto parm) { - var modal = parm.Adapt().ToCreate(HttpContext); + var modal = parm.Adapt().ToCreate(HttpContext); var response = _GroupPersonSkillMatrixService.AddGroupPersonSkillMatrix(modal); @@ -74,11 +74,11 @@ namespace DOAN.Admin.WebApi.Controllers /// /// [HttpPut] - [ActionPermissionFilter(Permission = "groupManagement:grouppersonskillmatrix:edit")] + [ActionPermissionFilter(Permission = "groupManagement:GroupPersonSkill:edit")] [Log(Title = "人员技能矩阵图", BusinessType = BusinessType.UPDATE)] public IActionResult UpdateGroupPersonSkillMatrix([FromBody] GroupPersonSkillMatrixDto parm) { - var modal = parm.Adapt().ToUpdate(HttpContext); + var modal = parm.Adapt().ToUpdate(HttpContext); var response = _GroupPersonSkillMatrixService.UpdateGroupPersonSkillMatrix(modal); return ToResponse(response); @@ -89,7 +89,7 @@ namespace DOAN.Admin.WebApi.Controllers /// /// [HttpDelete("{ids}")] - [ActionPermissionFilter(Permission = "groupManagement:grouppersonskillmatrix:delete")] + [ActionPermissionFilter(Permission = "groupManagement:GroupPersonSkill:delete")] [Log(Title = "人员技能矩阵图", BusinessType = BusinessType.DELETE)] public IActionResult DeleteGroupPersonSkillMatrix(string ids) { diff --git a/DOAN.Model/MES/group/GroupPersonSkillMatrix.cs b/DOAN.Model/MES/group/GroupPersonSkill.cs similarity index 94% rename from DOAN.Model/MES/group/GroupPersonSkillMatrix.cs rename to DOAN.Model/MES/group/GroupPersonSkill.cs index 14bba43..f2629ac 100644 --- a/DOAN.Model/MES/group/GroupPersonSkillMatrix.cs +++ b/DOAN.Model/MES/group/GroupPersonSkill.cs @@ -3,8 +3,8 @@ namespace DOAN.Model.MES.group /// /// 人员技能矩阵图 /// - [SugarTable("group_person_skill_matrix")] - public class GroupPersonSkillMatrix + [SugarTable("group_person_skill")] + public class GroupPersonSkill { /// /// 雪花 diff --git a/DOAN.Service/MES/group/GroupPersonSkillMatrixService.cs b/DOAN.Service/MES/group/GroupPersonSkillMatrixService.cs index c0385de..e1d53d4 100644 --- a/DOAN.Service/MES/group/GroupPersonSkillMatrixService.cs +++ b/DOAN.Service/MES/group/GroupPersonSkillMatrixService.cs @@ -16,7 +16,7 @@ namespace DOAN.Service.group /// 人员技能矩阵图Service业务层处理 /// [AppService(ServiceType = typeof(IGroupPersonSkillMatrixService), ServiceLifetime = LifeTime.Transient)] - public class GroupPersonSkillMatrixService : BaseService, IGroupPersonSkillMatrixService + public class GroupPersonSkillMatrixService : BaseService, IGroupPersonSkillMatrixService { /// /// 查询人员技能矩阵图列表 @@ -25,7 +25,7 @@ namespace DOAN.Service.group /// public PagedInfo GetList(GroupPersonSkillMatrixQueryDto parm) { - var predicate = Expressionable.Create() + var predicate = Expressionable.Create() .AndIF(!string.IsNullOrEmpty(parm.SkillName),it=>it.SkillName.Contains(parm.SkillName)) .AndIF(parm.Status>0,it=>it.Status==parm.Status) @@ -33,7 +33,7 @@ namespace DOAN.Service.group var response = Queryable() .Where(predicate.ToExpression()) - .ToPage(parm); + .ToPage(parm); return response; } @@ -44,7 +44,7 @@ namespace DOAN.Service.group /// /// /// - public GroupPersonSkillMatrix GetInfo(string Id) + public GroupPersonSkill GetInfo(string Id) { var response = Queryable() .Where(x => x.Id == Id) @@ -58,7 +58,7 @@ namespace DOAN.Service.group /// /// /// - public GroupPersonSkillMatrix AddGroupPersonSkillMatrix(GroupPersonSkillMatrix model) + public GroupPersonSkill AddGroupPersonSkillMatrix(GroupPersonSkill model) { if(string.IsNullOrEmpty(model.Id)) { @@ -72,9 +72,9 @@ namespace DOAN.Service.group /// /// /// - public int UpdateGroupPersonSkillMatrix(GroupPersonSkillMatrix model) + public int UpdateGroupPersonSkillMatrix(GroupPersonSkill model) { - //var response = Update(w => w.Id == model.Id, it => new GroupPersonSkillMatrix() + //var response = Update(w => w.Id == model.Id, it => new GroupPersonSkill() //{ // SkillName = model.SkillName, // Image = model.Image, diff --git a/DOAN.Service/MES/group/IService/IGroupPersonSkillMatrixService.cs b/DOAN.Service/MES/group/IService/IGroupPersonSkillMatrixService.cs index e708f2e..e4bdc8b 100644 --- a/DOAN.Service/MES/group/IService/IGroupPersonSkillMatrixService.cs +++ b/DOAN.Service/MES/group/IService/IGroupPersonSkillMatrixService.cs @@ -10,15 +10,15 @@ namespace DOAN.Service.group.IService /// /// 人员技能矩阵图service接口 /// - public interface IGroupPersonSkillMatrixService : IBaseService + public interface IGroupPersonSkillMatrixService : IBaseService { PagedInfo GetList(GroupPersonSkillMatrixQueryDto parm); - GroupPersonSkillMatrix GetInfo(string Id); + GroupPersonSkill GetInfo(string Id); - GroupPersonSkillMatrix AddGroupPersonSkillMatrix(GroupPersonSkillMatrix parm); + GroupPersonSkill AddGroupPersonSkillMatrix(GroupPersonSkill parm); - int UpdateGroupPersonSkillMatrix(GroupPersonSkillMatrix parm); + int UpdateGroupPersonSkillMatrix(GroupPersonSkill parm); } }