RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改名称

Browse Source
This commit is contained in:
qianhao.xu 2024-08-12 15:13:24 +08:00
parent 7e05c52546
commit 1f61944c7e
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DOAN.Admin.WebApi/Controllers/MES/group/GroupPersonSkillMatrixController.cs
View File

@ -11,7 +11,7 @@ namespace DOAN.Admin.WebApi.Controllers
/// 人员技能矩阵图
/// </summary>
[Verify]
[Route("mes/groupManagement/GroupPersonSkillMatrix")]
[Route("mes/groupManagement/GroupPersonSkill")]
public class GroupPersonSkillMatrixController : BaseController
{
/// <summary>
@ -30,7 +30,7 @@ namespace DOAN.Admin.WebApi.Controllers
/// <param name="parm"></param>
/// <returns></returns>
[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
/// <param name="Id"></param>
/// <returns></returns>
[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<GroupPersonSkillMatrix>();
var info = response.Adapt<GroupPersonSkill>();
return SUCCESS(info);
}
@ -58,11 +58,11 @@ namespace DOAN.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[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<GroupPersonSkillMatrix>().ToCreate(HttpContext);
var modal = parm.Adapt<GroupPersonSkill>().ToCreate(HttpContext);
var response = _GroupPersonSkillMatrixService.AddGroupPersonSkillMatrix(modal);
@ -74,11 +74,11 @@ namespace DOAN.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[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<GroupPersonSkillMatrix>().ToUpdate(HttpContext);
var modal = parm.Adapt<GroupPersonSkill>().ToUpdate(HttpContext);
var response = _GroupPersonSkillMatrixService.UpdateGroupPersonSkillMatrix(modal);
return ToResponse(response);
@ -89,7 +89,7 @@ namespace DOAN.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "groupManagement:grouppersonskillmatrix:delete")]
[ActionPermissionFilter(Permission = "groupManagement:GroupPersonSkill:delete")]
[Log(Title = "人员技能矩阵图", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteGroupPersonSkillMatrix(string ids)
{

4
DOAN.Model/MES/group/GroupPersonSkillMatrix.cs → DOAN.Model/MES/group/GroupPersonSkill.cs
View File

@ -3,8 +3,8 @@ namespace DOAN.Model.MES.group
/// <summary>
/// 人员技能矩阵图
/// </summary>
[SugarTable("group_person_skill_matrix")]
public class GroupPersonSkillMatrix
[SugarTable("group_person_skill")]
public class GroupPersonSkill
{
/// <summary>
/// 雪花

14
DOAN.Service/MES/group/GroupPersonSkillMatrixService.cs
View File

@ -16,7 +16,7 @@ namespace DOAN.Service.group
/// 人员技能矩阵图Service业务层处理
/// </summary>
[AppService(ServiceType = typeof(IGroupPersonSkillMatrixService), ServiceLifetime = LifeTime.Transient)]
public class GroupPersonSkillMatrixService : BaseService<GroupPersonSkillMatrix>, IGroupPersonSkillMatrixService
public class GroupPersonSkillMatrixService : BaseService<GroupPersonSkill>, IGroupPersonSkillMatrixService
{
/// <summary>
/// 查询人员技能矩阵图列表
@ -25,7 +25,7 @@ namespace DOAN.Service.group
/// <returns></returns>
public PagedInfo<GroupPersonSkillMatrixDto> GetList(GroupPersonSkillMatrixQueryDto parm)
{
var predicate = Expressionable.Create<GroupPersonSkillMatrix>()
var predicate = Expressionable.Create<GroupPersonSkill>()
.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<GroupPersonSkillMatrix, GroupPersonSkillMatrixDto>(parm);
.ToPage<GroupPersonSkill, GroupPersonSkillMatrixDto>(parm);
return response;
}
@ -44,7 +44,7 @@ namespace DOAN.Service.group
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
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
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public GroupPersonSkillMatrix AddGroupPersonSkillMatrix(GroupPersonSkillMatrix model)
public GroupPersonSkill AddGroupPersonSkillMatrix(GroupPersonSkill model)
{
if(string.IsNullOrEmpty(model.Id))
{
@ -72,9 +72,9 @@ namespace DOAN.Service.group
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
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,

8
DOAN.Service/MES/group/IService/IGroupPersonSkillMatrixService.cs
View File

@ -10,15 +10,15 @@ namespace DOAN.Service.group.IService
/// <summary>
/// 人员技能矩阵图service接口
/// </summary>
public interface IGroupPersonSkillMatrixService : IBaseService<GroupPersonSkillMatrix>
public interface IGroupPersonSkillMatrixService : IBaseService<GroupPersonSkill>
{
PagedInfo<GroupPersonSkillMatrixDto> 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);
}
}